diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp index 00468252012b..0fb3f762812b 100644 --- a/dom/canvas/CanvasRenderingContext2D.cpp +++ b/dom/canvas/CanvasRenderingContext2D.cpp @@ -2602,8 +2602,14 @@ static already_AddRefed CreateDeclarationForServo( return nullptr; } + // From canvas spec, force to set line-height property to 'normal' font + // property. if (aProperty == eCSSProperty_font) { - Servo_DeclarationBlock_SanitizeForCanvas(servoDeclarations); + const nsCString normalString = "normal"_ns; + Servo_DeclarationBlock_SetPropertyById( + servoDeclarations, eCSSProperty_line_height, &normalString, false, + env.mUrlExtraData, StyleParsingMode::DEFAULT, env.mCompatMode, + env.mLoader, env.mRuleType, {}); } return servoDeclarations.forget(); diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs index 7140c8e8f7ce..fc20cc84cf29 100644 --- a/servo/ports/geckolib/glue.rs +++ b/servo/ports/geckolib/glue.rs @@ -5053,21 +5053,6 @@ fn set_property( ) } -#[no_mangle] -pub unsafe extern "C" fn Servo_DeclarationBlock_SanitizeForCanvas( - declarations: &LockedDeclarationBlock, -) { - use style::properties::PropertyDeclaration; - use style::values::specified::{LineHeight, XTextScale, Zoom}; - // From canvas spec, force to set line-height property to 'normal' font property. - // Also, for compat, disable text scaling and CSS zoom. - write_locked_arc(declarations, |decls: &mut PropertyDeclarationBlock| { - decls.push(PropertyDeclaration::LineHeight(LineHeight::Normal), Importance::Normal); - decls.push(PropertyDeclaration::Zoom(Zoom::Document), Importance::Normal); - decls.push(PropertyDeclaration::XTextScale(XTextScale::None), Importance::Normal); - }); -} - #[no_mangle] pub unsafe extern "C" fn Servo_DeclarationBlock_SetProperty( declarations: &LockedDeclarationBlock, diff --git a/testing/web-platform/tests/css/css-viewport/zoom/canvas-ref.html b/testing/web-platform/tests/css/css-viewport/zoom/canvas-ref.html deleted file mode 100644 index d1b9a0d68dd5..000000000000 --- a/testing/web-platform/tests/css/css-viewport/zoom/canvas-ref.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/testing/web-platform/tests/css/css-viewport/zoom/canvas.html b/testing/web-platform/tests/css/css-viewport/zoom/canvas.html deleted file mode 100644 index dbde2eda26a0..000000000000 --- a/testing/web-platform/tests/css/css-viewport/zoom/canvas.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - -zoom is ignored for canvas - - -