Changeset 21636 in webkit

Timestamp:

May 21, 2007 8:10:06 PM (17 years ago)

Author:

oliver

Message:

2007-05-21 Oliver Hunt <​oliver@apple.com>

LayoutTests:

Reviewed by Sam.

Layout test for ​http://bugs.webkit.org/show_bug.cgi?id=13789

• svg/custom/getscreenctm-in-mixed-content-expected.checksum: Added.
• svg/custom/getscreenctm-in-mixed-content-expected.png: Added.
• svg/custom/getscreenctm-in-mixed-content-expected.txt: Added.
• svg/custom/getscreenctm-in-mixed-content.xhtml: Added.

WebCore:

Reviewed by Sam.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13789
-- SVGLocatable::getScreenCTM() faulty

Needed to update SVGLength to handle the case where the SVGElement is
not the root document element -- we do this by falling back on the
renderer for the context.

For <svg> elements embedded as mixed content in xhtml we consider the
absolutePosition of the parent to be the origin for the <svg> element.

• ksvg2/svg/SVGLength.cpp: (WebCore::SVGLength::PercentageOfViewport):
• ksvg2/svg/SVGSVGElement.cpp: (WebCore::SVGSVGElement::getScreenCTM):

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-21  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam.
+        
+        Layout test for http://bugs.webkit.org/show_bug.cgi?id=13789
+
+        * svg/custom/getscreenctm-in-mixed-content-expected.checksum: Added.
+        * svg/custom/getscreenctm-in-mixed-content-expected.png: Added.
+        * svg/custom/getscreenctm-in-mixed-content-expected.txt: Added.
+        * svg/custom/getscreenctm-in-mixed-content.xhtml: Added.
+
 2007-05-21  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-21  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam.
+        
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=13789 
+        -- SVGLocatable::getScreenCTM() faulty
+        
+        Needed to update SVGLength to handle the case where the SVGElement is
+        not the root document element -- we do this by falling back on the 
+        renderer for the context.
+        
+        For <svg> elements embedded as mixed content in xhtml we consider the
+        absolutePosition of the parent to be the origin for the <svg> element.
+
+        * ksvg2/svg/SVGLength.cpp:
+        (WebCore::SVGLength::PercentageOfViewport):
+        * ksvg2/svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::getScreenCTM):
+
 2007-05-21  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/ksvg2/svg/SVGLength.cpp

@@ -2 +2 @@
     Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005, 2006 Rob Buis <buis@kde.org>
+                  2007 Apple Inc.  All rights reserved.
 
     This file is part of the KDE project
@@ -294 +295 @@
             height = svg->height().value();
         }
+    } else if (context->parent() && !context->parent()->isSVGElement()) {
+        if (RenderObject* renderer = context->renderer()) {
+            width = renderer->width();
+            height = renderer->height();
+        }
     }
 

trunk/WebCore/ksvg2/svg/SVGSVGElement.cpp

@@ -2 +2 @@
     Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
+                  2007 Apple Inc.  All rights reserved.
 
     This file is part of the KDE project
@@ -336 +337 @@
 AffineTransform SVGSVGElement::getScreenCTM() const
 {
+    // FIXME: This assumes that any <svg> element not immediately descending from another SVGElement 
+    // has *no* svg ancestors
+    document()->updateLayoutIgnorePendingStylesheets();
+    float rootX = x().value();
+    float rootY = y().value();
+    
+    if (RenderObject* renderer = this->renderer()) {
+        renderer = renderer->parent();
+        if (renderer && !(renderer->element() && renderer->element()->isSVGElement())) {
+            int tx = 0;
+            int ty = 0;
+            renderer->absolutePosition(tx, ty, true);
+            rootX += tx;
+            rootY += ty;
+        }
+    }
+    
     AffineTransform mat = SVGStyledLocatableElement::getScreenCTM();
-    mat.translate(x().value(), y().value());
+    mat.translate(rootX, rootY);
 
     if (attributes()->getNamedItem(SVGNames::viewBoxAttr)) {