Changeset 67252 in webkit

Timestamp:

Sep 10, 2010 5:47:30 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Nikolas Zimmermann.

getBoundingClientRect Broken for SVG Elements
​https://bugs.webkit.org/show_bug.cgi?id=42815

Added tests for getBoundingClientRect applied to SVG elements.

• svg/custom/getBoundingClientRect.xhtml: Added
• svg/custom/getBoundingClientRect-expected.txt: Added

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

Reviewed by Nikolas Zimmermann.

getBoundingClientRect Broken for SVG Elements
​https://bugs.webkit.org/show_bug.cgi?id=42815

Use getBBox to retrieve the bounding rectangle for SVG elements.

Test: svg/dom/getBoundingClientRect.xhtml

• dom/Element.cpp: (Element::getBoundingClientRect):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/getBoundingClientRect-expected.txt (added)
• LayoutTests/svg/custom/getBoundingClientRect.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-10  Cosmin Truta  <ctruta@chromium.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        getBoundingClientRect Broken for SVG Elements
+        https://bugs.webkit.org/show_bug.cgi?id=42815
+
+        Added tests for getBoundingClientRect applied to SVG elements.
+
+        * svg/custom/getBoundingClientRect.xhtml: Added
+        * svg/custom/getBoundingClientRect-expected.txt: Added
+
 2010-09-10  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-10  Cosmin Truta  <ctruta@chromium.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        getBoundingClientRect Broken for SVG Elements
+        https://bugs.webkit.org/show_bug.cgi?id=42815
+
+        Use getBBox to retrieve the bounding rectangle for SVG elements.
+
+        Test: svg/dom/getBoundingClientRect.xhtml
+
+        * dom/Element.cpp:
+        (Element::getBoundingClientRect):
+
 2010-09-09  Jer Noble  <jer.noble@apple.com>
 

trunk/WebCore/dom/Element.cpp

@@ -51 +51 @@
 #include "RenderView.h"
 #include "RenderWidget.h"
+#include "SVGStyledLocatableElement.h"
 #include "Settings.h"
 #include "TextIterator.h"
@@ -477 +478 @@
 {
     document()->updateLayoutIgnorePendingStylesheets();
-    RenderBoxModelObject* renderBoxModelObject = this->renderBoxModelObject();
-    if (!renderBoxModelObject)
-        return ClientRect::create();
 
     Vector<FloatQuad> quads;
-    renderBoxModelObject->absoluteQuads(quads);
+    if (isSVGElement()) {
+        // 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));
+            }
+        }
+    } else {
+        // Get the bounding rectangle from the box model.
+        if (renderBoxModelObject())
+            renderBoxModelObject()->absoluteQuads(quads);
+    }
 
     if (quads.isEmpty())
@@ -496 +507 @@
     }
 
-    adjustIntRectForAbsoluteZoom(result, renderBoxModelObject);
+    if (renderBoxModelObject())
+        adjustIntRectForAbsoluteZoom(result, renderBoxModelObject());
 
     return ClientRect::create(result);