[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 33c7935146d156d8ec8d0a0326d2aacc56431c06
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 10:43:04 2011 +0000

    2011-01-04  Sheriff Bot  <webkit.review.bot at 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 at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74963 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6f516da..0e3a597 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-04  Sheriff Bot  <webkit.review.bot at 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 at torchmobile.com.cn>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/svg/custom/recursive-use-expected.txt b/LayoutTests/svg/custom/recursive-use-expected.txt
deleted file mode 100644
index f381830..0000000
--- a/LayoutTests/svg/custom/recursive-use-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-PASS without crash.
diff --git a/LayoutTests/svg/custom/recursive-use.svg b/LayoutTests/svg/custom/recursive-use.svg
deleted file mode 100644
index e6120a4..0000000
--- a/LayoutTests/svg/custom/recursive-use.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-    <polygon id="pt" points="-1,0 0,-0.5 1,0"/>
-    <g id="u">
-        <use xlink:href="#pt">
-        <use xlink:href="#u"/>
-        </use>
-    </g>
-</defs>
-<text>PASS without crash.</text>
-<script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
-</script>
-</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3ca13dc..300a53f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-04  Sheriff Bot  <webkit.review.bot at 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 at gmail.com>
+
         Unreviewed, rolling out r74961.
         http://trac.webkit.org/changeset/74961
         https://bugs.webkit.org/show_bug.cgi?id=51867
diff --git a/WebCore/svg/SVGUseElement.cpp b/WebCore/svg/SVGUseElement.cpp
index bf1c085..4f23f46 100644
--- a/WebCore/svg/SVGUseElement.cpp
+++ b/WebCore/svg/SVGUseElement.cpp
@@ -682,11 +682,6 @@ void SVGUseElement::buildInstanceTree(SVGElement* target, SVGElementInstance* ta
     ASSERT(target);
     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.
     //
     // Spec: If the 'use' element references a 'g' which contains two 'rect' elements, then the instance tree
@@ -711,6 +706,11 @@ void SVGUseElement::buildInstanceTree(SVGElement* target, SVGElementInstance* ta
         // Enter recursion, appending new instance tree nodes to the "instance" object.
         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);
 }
 
 void SVGUseElement::handleDeepUseReferencing(SVGUseElement* use, SVGElementInstance* targetInstance, bool& foundProblem)

-- 
WebKit Debian packaging