| Index: Source/core/svg/SVGUseElement.cpp
|
| diff --git a/Source/core/svg/SVGUseElement.cpp b/Source/core/svg/SVGUseElement.cpp
|
| index 36d700dad26e542180852e2c197659ff1e44ccdd..c9a693aef15d151febfc2704c3c2cba8777b54d5 100644
|
| --- a/Source/core/svg/SVGUseElement.cpp
|
| +++ b/Source/core/svg/SVGUseElement.cpp
|
| @@ -667,18 +667,18 @@ bool SVGUseElement::hasCycleUseReferencing(SVGUseElement* use, SVGElementInstanc
|
| return false;
|
| }
|
|
|
| -static inline void removeDisallowedElementsFromSubtree(Element* subtree)
|
| +static inline void removeDisallowedElementsFromSubtree(Element& subtree)
|
| {
|
| - ASSERT(!subtree->inDocument());
|
| + ASSERT(!subtree.inDocument());
|
| Element* element = ElementTraversal::firstWithin(subtree);
|
| while (element) {
|
| if (isDisallowedElement(element)) {
|
| - Element* next = ElementTraversal::nextSkippingChildren(element, subtree);
|
| + Element* next = ElementTraversal::nextSkippingChildren(element, &subtree);
|
| // The subtree is not in document so this won't generate events that could mutate the tree.
|
| element->parentNode()->removeChild(element);
|
| element = next;
|
| } else {
|
| - element = ElementTraversal::next(*element, subtree);
|
| + element = ElementTraversal::next(*element, &subtree);
|
| }
|
| }
|
| }
|
| @@ -697,7 +697,7 @@ void SVGUseElement::buildShadowTree(SVGElement* target, SVGElementInstance* targ
|
| // Though if there are disallowed elements in the subtree, we have to remove them.
|
| // For instance: <use> on <g> containing <foreignObject> (indirect case).
|
| if (subtreeContainsDisallowedElement(newChild.get()))
|
| - removeDisallowedElementsFromSubtree(newChild.get());
|
| + removeDisallowedElementsFromSubtree(*newChild);
|
|
|
| userAgentShadowRoot()->appendChild(newChild.release());
|
| }
|
| @@ -742,7 +742,7 @@ void SVGUseElement::expandUseElementsInShadowTree(Node* element)
|
| // Though if there are disallowed elements in the subtree, we have to remove them.
|
| // For instance: <use> on <g> containing <foreignObject> (indirect case).
|
| if (subtreeContainsDisallowedElement(cloneParent.get()))
|
| - removeDisallowedElementsFromSubtree(cloneParent.get());
|
| + removeDisallowedElementsFromSubtree(*cloneParent);
|
|
|
| RefPtr<Node> replacingElement(cloneParent.get());
|
|
|
| @@ -788,7 +788,7 @@ void SVGUseElement::expandSymbolElementsInShadowTree(Node* element)
|
| // Though if there are disallowed elements in the subtree, we have to remove them.
|
| // For instance: <use> on <g> containing <foreignObject> (indirect case).
|
| if (subtreeContainsDisallowedElement(svgElement.get()))
|
| - removeDisallowedElementsFromSubtree(svgElement.get());
|
| + removeDisallowedElementsFromSubtree(*svgElement);
|
|
|
| RefPtr<Node> replacingElement(svgElement.get());
|
|
|
|
|