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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 868969b9
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>
Reviewed by Dirk Schulze.
......
<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>
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>
Unreviewed, rolling out r74961.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment