Changeset 128309 in webkit

Timestamp:

Sep 12, 2012 7:36:26 AM (12 years ago)

Author:

fmalita@chromium.org

Message:

getScreenCTM returns different values depending on zoom
​https://bugs.webkit.org/show_bug.cgi?id=96361

Reviewed by Dirk Schulze.

Source/WebCore:

SVGSVGElement::localCoordinateSpaceTransform() needs to adjust for the
zoom level (which is already factored into CSS coordinates) at the
SVG/HTML boundary.

Test: svg/zoom/page/zoom-get-screen-ctm.html

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::localCoordinateSpaceTransform):

LayoutTests:

• svg/zoom/page/zoom-get-screen-ctm-expected.txt: Added.
• svg/zoom/page/zoom-get-screen-ctm.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/zoom/page/zoom-get-screen-ctm-expected.txt (added)
• LayoutTests/svg/zoom/page/zoom-get-screen-ctm.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-12  Florin Malita  <fmalita@chromium.org>
+
+        getScreenCTM returns different values depending on zoom
+        https://bugs.webkit.org/show_bug.cgi?id=96361
+
+        Reviewed by Dirk Schulze.
+
+        * svg/zoom/page/zoom-get-screen-ctm-expected.txt: Added.
+        * svg/zoom/page/zoom-get-screen-ctm.html: Added.
+
 2012-09-12  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-12  Florin Malita  <fmalita@chromium.org>
+
+        getScreenCTM returns different values depending on zoom
+        https://bugs.webkit.org/show_bug.cgi?id=96361
+
+        Reviewed by Dirk Schulze.
+
+        SVGSVGElement::localCoordinateSpaceTransform() needs to adjust for the
+        zoom level (which is already factored into CSS coordinates) at the
+        SVG/HTML boundary.
+
+        Test: svg/zoom/page/zoom-get-screen-ctm.html
+
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::localCoordinateSpaceTransform):
+
 2012-09-12  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -439 +439 @@
         if (RenderObject* renderer = this->renderer()) {
             FloatPoint location;
-            
+            float zoomFactor = 1;
+
             // At the SVG/HTML boundary (aka RenderSVGRoot), we apply the localToBorderBoxTransform 
             // to map an element from SVG viewport coordinates to CSS box coordinates.
             // RenderSVGRoot's localToAbsolute method expects CSS box coordinates.
-            if (renderer->isSVGRoot())
+            // We also need to adjust for the zoom level factored into CSS coordinates (bug #96361).
+            if (renderer->isSVGRoot()) {
                 location = toRenderSVGRoot(renderer)->localToBorderBoxTransform().mapPoint(location);
-            
+                zoomFactor = 1 / renderer->style()->effectiveZoom();
+            }
+
             // Translate in our CSS parent coordinate space
             // FIXME: This doesn't work correctly with CSS transforms.
             location = renderer->localToAbsolute(location, false, true);
+            location.scale(zoomFactor, zoomFactor);
 
             // Be careful here! localToBorderBoxTransform() included the x/y offset coming from the viewBoxToViewTransform(),
@@ -457 +462 @@
             if (FrameView* view = document()->view()) {
                 LayoutSize scrollOffset = view->scrollOffset();
+                scrollOffset.scale(zoomFactor);
                 transform.translate(-scrollOffset.width(), -scrollOffset.height());
             }