Changeset 74963 in webkit

Timestamp:

Jan 4, 2011 2:43:04 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-04 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r74960.
​http://trac.webkit.org/changeset/74960
​https://bugs.webkit.org/show_bug.cgi?id=51868

Rollout since we hit an assert after this patch. (Requested by
krit on #webkit).

• svg/custom/recursive-use-expected.txt: Removed.
• svg/custom/recursive-use.svg: Removed.

2011-01-04 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r74960.
​http://trac.webkit.org/changeset/74960
​https://bugs.webkit.org/show_bug.cgi?id=51868

Rollout since we hit an assert after this patch. (Requested by
krit on #webkit).

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/recursive-use-expected.txt (deleted)
• LayoutTests/svg/custom/recursive-use.svg (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGUseElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74960.
+        http://trac.webkit.org/changeset/74960
+        https://bugs.webkit.org/show_bug.cgi?id=51868
+
+        Rollout since we hit an assert after this patch. (Requested by
+        krit on #webkit).
+
+        * svg/custom/recursive-use-expected.txt: Removed.
+        * svg/custom/recursive-use.svg: Removed.
+
 2011-01-04  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74960.
+        http://trac.webkit.org/changeset/74960
+        https://bugs.webkit.org/show_bug.cgi?id=51868
+
+        Rollout since we hit an assert after this patch. (Requested by
+        krit on #webkit).
+
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::buildInstanceTree):
+
 2011-01-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/svg/SVGUseElement.cpp

@@ -683 +683 @@
     ASSERT(targetInstance);
 
-    // 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 (target->hasTagName(SVGNames::useTag))
-        handleDeepUseReferencing(static_cast<SVGUseElement*>(target), targetInstance, foundProblem);
-
     // A general description from the SVG spec, describing what buildInstanceTree() actually does.
     //
@@ -712 +707 @@
         buildInstanceTree(element, instancePtr, 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 (target->hasTagName(SVGNames::useTag))
+        handleDeepUseReferencing(static_cast<SVGUseElement*>(target), targetInstance, foundProblem);
 }