Changeset 36856 in webkit

Timestamp:

Sep 24, 2008 12:23:54 PM (16 years ago)

Author:

rwlbuis@webkit.org

Message:

Reviewed by Darin.

​https://bugs.webkit.org/show_bug.cgi?id=20557
getScreenCTM() returns wrong values

Use the absolute position of the svg root when
determining the screen ctm.

Test: svg/custom/getscreenctm-in-mixed-content2.xhtml

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/getscreenctm-in-mixed-content2-expected.txt (added)
• LayoutTests/svg/custom/getscreenctm-in-mixed-content2.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-09-24  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        Test for:
+        https://bugs.webkit.org/show_bug.cgi?id=20557
+        getScreenCTM() returns wrong values
+
+        * svg/custom/getscreenctm-in-mixed-content2-expected.txt: Added.
+        * svg/custom/getscreenctm-in-mixed-content2.xhtml: Added.
+
 2008-09-23  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-24  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=20557
+        getScreenCTM() returns wrong values
+
+        Use the absolute position of the svg root when
+        determining the screen ctm.
+
+        Test: svg/custom/getscreenctm-in-mixed-content2.xhtml
+
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::getScreenCTM):
+
 2008-09-24  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/svg/SVGSVGElement.cpp

@@ -1 +1 @@
 /*
     Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
-                  2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
                   2007 Apple Inc.  All rights reserved.
 
@@ -397 +397 @@
     
     if (RenderObject* renderer = this->renderer()) {
-        renderer = renderer->parent();
         if (isOutermostSVG()) {
             int tx = 0;
             int ty = 0;
-            if (renderer)
+            if (renderer->parent())
                 renderer->absolutePosition(tx, ty, true);
             rootX += tx;