Changeset 166967 in webkit

Timestamp:

Apr 8, 2014, 3:27:37 PM (12 years ago)

Author:

cavalcantii@gmail.com

Message:

[SVG] Fix CSS transform handling when zoomed
​https://bugs.webkit.org/show_bug.cgi?id=125836

Reviewed by Tim Horton.

Source/WebCore:

Tests: svg/zoom/page/zoom-css-transforms-expected.svg

svg/zoom/page/zoom-css-transforms.svg

Adjusts CSS transforms when used in SVG to account for unexpected
translation scale. Backport from Chromium #174910.

• svg/SVGGraphicsElement.cpp:

(WebCore::SVGGraphicsElement::animatedLocalTransform):

LayoutTests:

Adjusts CSS transforms when used in SVG to account for unexpected
translation scale. Backport from Chromium #174910.

• svg/zoom/page/zoom-css-transforms-expected.svg: Added.
• svg/zoom/page/zoom-css-transforms.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/zoom/page/zoom-css-transforms-expected.svg (added)
• LayoutTests/svg/zoom/page/zoom-css-transforms.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGGraphicsElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-08  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        [SVG] Fix CSS transform handling when zoomed
+        https://bugs.webkit.org/show_bug.cgi?id=125836
+
+        Reviewed by Tim Horton.
+
+        Adjusts CSS transforms when used in SVG to account for unexpected
+        translation scale. Backport from Chromium #174910.
+
+        * svg/zoom/page/zoom-css-transforms-expected.svg: Added.
+        * svg/zoom/page/zoom-css-transforms.svg: Added.
+
 2014-04-08  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-08  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        [SVG] Fix CSS transform handling when zoomed
+        https://bugs.webkit.org/show_bug.cgi?id=125836
+
+        Reviewed by Tim Horton.
+
+        Tests: svg/zoom/page/zoom-css-transforms-expected.svg
+               svg/zoom/page/zoom-css-transforms.svg
+
+        Adjusts CSS transforms when used in SVG to account for unexpected
+        translation scale. Backport from Chromium #174910.
+
+        * svg/SVGGraphicsElement.cpp:
+        (WebCore::SVGGraphicsElement::animatedLocalTransform):
+
 2014-04-08  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/svg/SVGGraphicsElement.cpp

@@ -76 +76 @@
         // Flatten any 3D transform.
         matrix = transform.toAffineTransform();
+        // CSS bakes the zoom factor into lengths, including translation components.
+        // In order to align CSS & SVG transforms, we need to invert this operation.
+        float zoom = style->effectiveZoom();
+        if (zoom != 1) {
+            matrix.setE(matrix.e() / zoom);
+            matrix.setF(matrix.f() / zoom);
+        }
+
     } else
         transform().concatenate(matrix);