Changeset 49833 in webkit

Timestamp:

Oct 19, 2009 8:19:22 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-19 Robin Qiu <​robin.qiu@torchmobile.com.cn>

Reviewed by Nikolas Zimmermann.

Add a layout test for nested SVG <use> element which has a child.
​https://bugs.webkit.org/show_bug.cgi?id=26117

• svg/custom/use-on-use-with-child-expected.txt: Added.
• svg/custom/use-on-use-with-child.svg: Added.

2009-10-19 Robin Qiu <​robin.qiu@torchmobile.com.cn>

Reviewed by Nikolas Zimmermann.

Fixed a bug on nested SVG <use> elements.
​https://bugs.webkit.org/show_bug.cgi?id=26117
When a <use> element refer to another <use> element which has
child/children, the instance tree built for this <use> element
is incorrect (more nodes than expected).

Test: svg/dom/use-on-use-with-child.svg

• svg/SVGUseElement.cpp: (WebCore::SVGUseElement::buildInstanceTree):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/use-on-use-with-child-expected.txt (added)
• LayoutTests/svg/custom/use-on-use-with-child.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGUseElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-19  Robin Qiu  <robin.qiu@torchmobile.com.cn>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Add a layout test for nested SVG <use> element which has a child.
+        https://bugs.webkit.org/show_bug.cgi?id=26117
+
+        * svg/custom/use-on-use-with-child-expected.txt: Added.
+        * svg/custom/use-on-use-with-child.svg: Added.
+
 2009-10-19  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-19  Robin Qiu  <robin.qiu@torchmobile.com.cn>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Fixed a bug on nested SVG <use> elements.
+        https://bugs.webkit.org/show_bug.cgi?id=26117
+        When a <use> element refer to another <use> element which has
+        child/children, the instance tree built for this <use> element
+        is incorrect (more nodes than expected).
+
+        Test: svg/dom/use-on-use-with-child.svg
+
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::buildInstanceTree):
+
 2009-10-19  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/svg/SVGUseElement.cpp

@@ -485 +485 @@
 
         // Enter recursion, appending new instance tree nodes to the "instance" object.
-        if (element->hasChildNodes())
-            buildInstanceTree(element, instancePtr.get(), foundProblem);
-
-        // Spec: If the referenced object is itself a 'use', or if there are 'use' subelements within the referenced
-        // object, the instance tree will contain recursive expansion of the indirect references to form a complete tree.
-        if (element->hasTagName(SVGNames::useTag))
-            handleDeepUseReferencing(static_cast<SVGUseElement*>(element), instancePtr.get(), foundProblem);
+        buildInstanceTree(element, instancePtr.get(), foundProblem);
     }