Changeset 106464 in webkit

Timestamp:

Feb 1, 2012 5:31:11 AM (12 years ago)

Author:

peter@chromium.org

Message:

getIntersectionList causes transforms to be recalculated in SVG
​https://bugs.webkit.org/show_bug.cgi?id=77179

Reviewed by Nikolas Zimmermann.

Introduce a local variable to store the element's local-to-parent
transformation matrix in, removing the need for the const_cast and
stopping us from modifying any matrices elsewhere.

Source/WebCore:

Test: svg/custom/intersection-list-transforms.svg

• rendering/svg/RenderSVGModelObject.cpp:

(WebCore::getElementCTM):

LayoutTests:

• svg/custom/intersection-list-transforms-expected.png: Added.
• svg/custom/intersection-list-transforms-expected.txt: Added.
• svg/custom/intersection-list-transforms.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/intersection-list-transforms-expected.png (added)
• LayoutTests/svg/custom/intersection-list-transforms-expected.txt (added)
• LayoutTests/svg/custom/intersection-list-transforms.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-01  Peter Beverloo  <peter@chromium.org>
+
+        getIntersectionList causes transforms to be recalculated in SVG
+        https://bugs.webkit.org/show_bug.cgi?id=77179
+
+        Reviewed by Nikolas Zimmermann.
+
+        Introduce a local variable to store the element's local-to-parent
+        transformation matrix in, removing the need for the const_cast and
+        stopping us from modifying any matrices elsewhere.
+
+        * svg/custom/intersection-list-transforms-expected.png: Added.
+        * svg/custom/intersection-list-transforms-expected.txt: Added.
+        * svg/custom/intersection-list-transforms.svg: Added.
+
 2012-02-01  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-01  Peter Beverloo  <peter@chromium.org>
+
+        getIntersectionList causes transforms to be recalculated in SVG
+        https://bugs.webkit.org/show_bug.cgi?id=77179
+
+        Reviewed by Nikolas Zimmermann.
+
+        Introduce a local variable to store the element's local-to-parent
+        transformation matrix in, removing the need for the const_cast and
+        stopping us from modifying any matrices elsewhere.
+
+        Test: svg/custom/intersection-list-transforms.svg
+
+        * rendering/svg/RenderSVGModelObject.cpp:
+        (WebCore::getElementCTM):
+
 2012-02-01  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -126 +126 @@
     ASSERT(stopAtElement);
 
+    AffineTransform localTransform;
     Node* current = element;
+
     while (current && current->isSVGElement()) {
         SVGElement* currentElement = static_cast<SVGElement*>(current);
-        if (currentElement->isStyled())
-            transform = const_cast<AffineTransform&>(currentElement->renderer()->localToParentTransform()).multiply(transform);
-
+        if (currentElement->isStyled()) {
+            localTransform = currentElement->renderer()->localToParentTransform();
+            transform = localTransform.multiply(transform);
+        }
         // For getCTM() computation, stop at the nearest viewport element
         if (currentElement == stopAtElement)