Changeset 70317 in webkit

Timestamp:

Oct 22, 2010 10:43:31 AM (14 years ago)

Author:

krit@webkit.org

Message:

2010-10-22 Cosmin Truta <​ctruta@chromium.org>

Reviewed by Nikolas Zimmermann.

getBoundingClientRect does not work with SVG <text>
​https://bugs.webkit.org/show_bug.cgi?id=46775

Dispatched the calls from Element::getBoundingClientRect to getBBox
through SVGElement::boundingBox.
Recognized SVGTextElement in addition to SVGStyledLocatableElement
as a class that provides getBBox.
Fixed the result of zooming: adjusted the getBoundingClientRect rectangle
for absolute zoom, even for SVG elements.

Additional cleanup task:
Removed redundant overloads of SVGStyledTransformableElement
methods: nearestViewportElement, farthestViewportElement, getBBox.
These methods are already inherited from SVGStyledLocatableElement.

Test: css3/zoom-coords.xhtml

• WebCore.xcodeproj/project.pbxproj: Set role of SVGLocatable.h to private.
• dom/Element.cpp: (Element::getBoundingClientRect): Used SVGElement::boundingBox. Adjusted coordinates for absolute zoom, for all kinds of elements.
• svg/SVGElement.cpp:
• svg/SVGElement.h: (SVGElement::boundingBox): Added.
• svg/SVGStyledTransformableElement.cpp:
• svg/SVGStyledTransformableElement.h: (SVGStyledTransformableElement::nearestViewportElement): Removed. (SVGStyledTransformableElement::farthestViewportElement): Removed. (SVGStyledTransformableElement::getBBox): Removed.

2010-10-22 Cosmin Truta <​ctruta@chromium.org>

Reviewed by Nikolas Zimmermann.

getBoundingClientRect does not work with SVG <text>
​https://bugs.webkit.org/show_bug.cgi?id=46775

Added coordinate checks on various zoomed-in and zoomed-out
XHTML and SVG elements, using getBoundingClientRect.

• css3/zoom-coords.xhtml: Added.
• css3/zoom-coords-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/zoom-coords-expected.txt (added)
• LayoutTests/css3/zoom-coords.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (4 diffs)
• WebCore/svg/SVGElement.cpp (modified) (2 diffs)
• WebCore/svg/SVGElement.h (modified) (2 diffs)
• WebCore/svg/SVGStyledTransformableElement.cpp (modified) (1 diff)
• WebCore/svg/SVGStyledTransformableElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-22  Cosmin Truta  <ctruta@chromium.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        getBoundingClientRect does not work with SVG <text>
+        https://bugs.webkit.org/show_bug.cgi?id=46775
+
+        Added coordinate checks on various zoomed-in and zoomed-out
+        XHTML and SVG elements, using getBoundingClientRect.
+
+        * css3/zoom-coords.xhtml: Added.
+        * css3/zoom-coords-expected.txt: Added.
+
 2010-10-22  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-22  Cosmin Truta  <ctruta@chromium.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        getBoundingClientRect does not work with SVG <text>
+        https://bugs.webkit.org/show_bug.cgi?id=46775
+
+        Dispatched the calls from Element::getBoundingClientRect to getBBox
+        through SVGElement::boundingBox.
+        Recognized SVGTextElement in addition to SVGStyledLocatableElement
+        as a class that provides getBBox.
+        Fixed the result of zooming: adjusted the getBoundingClientRect rectangle
+        for absolute zoom, even for SVG elements.
+
+        Additional cleanup task:
+        Removed redundant overloads of SVGStyledTransformableElement
+        methods: nearestViewportElement, farthestViewportElement, getBBox.
+        These methods are already inherited from SVGStyledLocatableElement.
+
+        Test: css3/zoom-coords.xhtml
+
+        * WebCore.xcodeproj/project.pbxproj: Set role of SVGLocatable.h to private.
+        * dom/Element.cpp:
+        (Element::getBoundingClientRect): Used SVGElement::boundingBox.
+        Adjusted coordinates for absolute zoom, for all kinds of elements.
+        * svg/SVGElement.cpp:
+        * svg/SVGElement.h:
+        (SVGElement::boundingBox): Added.
+        * svg/SVGStyledTransformableElement.cpp:
+        * svg/SVGStyledTransformableElement.h:
+        (SVGStyledTransformableElement::nearestViewportElement): Removed.
+        (SVGStyledTransformableElement::farthestViewportElement): Removed.
+        (SVGStyledTransformableElement::getBBox): Removed.
+
 2010-10-22  Patrick Gansterer  <paroga@webkit.org>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4049 +4049 @@
                 B2227A3F0D00BF220071B782 /* SVGListTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A90D00BF200071B782 /* SVGListTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 B2227A400D00BF220071B782 /* SVGLocatable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278AA0D00BF200071B782 /* SVGLocatable.cpp */; };
-                B2227A410D00BF220071B782 /* SVGLocatable.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278AB0D00BF200071B782 /* SVGLocatable.h */; };
+                B2227A410D00BF220071B782 /* SVGLocatable.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278AB0D00BF200071B782 /* SVGLocatable.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 B2227A430D00BF220071B782 /* SVGMarkerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278AD0D00BF200071B782 /* SVGMarkerElement.cpp */; };
                 B2227A440D00BF220071B782 /* SVGMarkerElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278AE0D00BF200071B782 /* SVGMarkerElement.h */; };

trunk/WebCore/dom/Element.cpp

@@ -53 +53 @@
 #include "RenderView.h"
 #include "RenderWidget.h"
-#include "SVGStyledLocatableElement.h"
 #include "Settings.h"
 #include "TextIterator.h"
@@ -60 +59 @@
 
 #if ENABLE(SVG)
+#include "SVGElement.h"
 #include "SVGNames.h"
 #endif
@@ -489 +489 @@
     Vector<FloatQuad> quads;
 #if ENABLE(SVG)
-    if (isSVGElement()) {
+    if (isSVGElement() && renderer()) {
         // Get the bounding rectangle from the SVG model.
         const SVGElement* svgElement = static_cast<const SVGElement*>(this);
-        if (svgElement->isStyledLocatable()) {
-            if (renderer()) {
-                const FloatRect& localRect = static_cast<const SVGStyledLocatableElement*>(svgElement)->getBBox();
-                quads.append(renderer()->localToAbsoluteQuad(localRect));
-            }
-        }
+        FloatRect localRect;
+        if (svgElement->boundingBox(localRect))
+            quads.append(renderer()->localToAbsoluteQuad(localRect));
     } else
 #endif
@@ -518 +515 @@
     }
 
-    if (renderBoxModelObject())
-        adjustIntRectForAbsoluteZoom(result, renderBoxModelObject());
-
+    adjustIntRectForAbsoluteZoom(result, renderer());
     return ClientRect::create(result);
 }

trunk/WebCore/svg/SVGElement.cpp

@@ -43 +43 @@
 #include "SVGNames.h"
 #include "SVGSVGElement.h"
+#include "SVGStyledLocatableElement.h"
+#include "SVGTextElement.h"
 #include "SVGURIReference.h"
 #include "SVGUseElement.h"
@@ -178 +180 @@
     }
     return rareSVGData()->elementInstances();
+}
+
+bool SVGElement::boundingBox(FloatRect& rect, SVGLocatable::StyleUpdateStrategy styleUpdateStrategy) const
+{
+    if (isStyledLocatable()) {
+        rect = static_cast<const SVGStyledLocatableElement*>(this)->getBBox(styleUpdateStrategy);
+        return true;
+    }
+    if (hasTagName(SVGNames::textTag)) {
+        rect = static_cast<const SVGTextElement*>(this)->getBBox(styleUpdateStrategy);
+        return true;
+    }
+    return false;
 }
 

trunk/WebCore/svg/SVGElement.h

@@ -25 +25 @@
 #if ENABLE(SVG)
 #include "SVGDocumentExtensions.h"
+#include "SVGLocatable.h"
 #include "StyledElement.h"
 
@@ -72 +73 @@
         const HashSet<SVGElementInstance*>& instancesForElement() const;
 
+        bool boundingBox(FloatRect&, SVGLocatable::StyleUpdateStrategy = SVGLocatable::AllowStyleUpdate) const;
+
         void setCursorElement(SVGCursorElement*);
         void setCursorImageValue(CSSCursorImageValue*);

trunk/WebCore/svg/SVGStyledTransformableElement.cpp

@@ -91 +91 @@
 }
 
-SVGElement* SVGStyledTransformableElement::nearestViewportElement() const
-{
-    return SVGTransformable::nearestViewportElement(this);
-}
-
-SVGElement* SVGStyledTransformableElement::farthestViewportElement() const
-{
-    return SVGTransformable::farthestViewportElement(this);
-}
-
-FloatRect SVGStyledTransformableElement::getBBox(StyleUpdateStrategy styleUpdateStrategy) const
-{
-    return SVGTransformable::getBBox(this, styleUpdateStrategy);
-}
-
 RenderObject* SVGStyledTransformableElement::createRenderer(RenderArena* arena, RenderStyle*)
 {

trunk/WebCore/svg/SVGStyledTransformableElement.h

@@ -38 +38 @@
     virtual AffineTransform getCTM(StyleUpdateStrategy = AllowStyleUpdate) const;
     virtual AffineTransform getScreenCTM(StyleUpdateStrategy = AllowStyleUpdate) const;
-    virtual SVGElement* nearestViewportElement() const;
-    virtual SVGElement* farthestViewportElement() const;
 
     virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope mode) const { return SVGTransformable::localCoordinateSpaceTransform(mode); }
     virtual AffineTransform animatedLocalTransform() const;
     virtual AffineTransform* supplementalTransform();
-
-    virtual FloatRect getBBox(StyleUpdateStrategy = AllowStyleUpdate) const;
 
     bool isKnownAttribute(const QualifiedName&);