Replace cloneNodeAndAssociate with Element::cloneElementWithChildren

third_party/WebKit/Source/core/svg/SVGUseElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012 University of Szeged
  * Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 338 matching lines @@
     }
 
     if (target->isSVGElement()) {
         buildShadowAndInstanceTree(toSVGElement(*target));
         invalidateDependentShadowTrees();
     }
 
     ASSERT(!m_needsShadowTreeRecreation);
 }
 
-static PassRefPtrWillBeRawPtr<Node> cloneNodeAndAssociate(Node& toClone)
+static void associateCorrespondingElements(SVGElement& targetRoot, SVGElement& instanceRoot)
 {
-    RefPtrWillBeRawPtr<Node> clone = toClone.cloneNode(false);
-    if (!clone->isSVGElement())
-        return clone.release();
-
-    SVGElement& svgElement = toSVGElement(toClone);
-    ASSERT(!svgElement.correspondingElement());
-    toSVGElement(clone.get())->setCorrespondingElement(&svgElement);
-    TrackExceptionState exceptionState;
-    for (RefPtrWillBeRawPtr<Node> node = toClone.firstChild(); node && !exceptionState.hadException(); node = node->nextSibling())
-        clone->appendChild(cloneNodeAndAssociate(*node), exceptionState);
-    return clone.release();
+    auto targetRange = Traversal<SVGElement>::inclusiveDescendantsOf(targetRoot);
+    auto targetIterator = targetRange.begin();
+    for (SVGElement& instance : Traversal<SVGElement>::inclusiveDescendantsOf(instanceRoot)) {
+        ASSERT(!instance.correspondingElement());
+        instance.setCorrespondingElement(&*targetIterator);
+        ++targetIterator;
+    }
+    ASSERT(!(targetIterator != targetRange.end()));

[Stephen Chennney, 2016/03/03 16:42:01]

So we have a != operator but no == operator? Interesting.

[fs, 2016/03/03 16:59:07]

Yeah, I guess it's heavily tailored to the range-based for usage.

 }
 
 void SVGUseElement::buildShadowAndInstanceTree(SVGElement& target)
 {
     ASSERT(!m_targetElementInstance);
     ASSERT(!m_needsShadowTreeRecreation);
 
     // <use> creates a "user agent" shadow root. Do not build the shadow/instance tree for <use>
     // elements living in a user agent shadow tree because they will get expanded in a second
     // pass -- see expandUseElementsInShadowTree().
@@ skipping 240 matching lines @@
         // Transfer all data (attributes, etc.) from <use> to the new <g> element.
         cloneParent->cloneDataFromElement(*use);
         cloneParent->setCorrespondingElement(use->correspondingElement());
 
         removeAttributesFromReplacementElement(*cloneParent);
 
         // Move already cloned elements to the new <g> element.
         moveChildrenToReplacementElement(*use, *cloneParent);
 
         if (target) {
-            RefPtrWillBeRawPtr<Node> newChild = cloneNodeAndAssociate(*target);
-            ASSERT(newChild->isSVGElement());
-            transferUseWidthAndHeightIfNeeded(*use, toSVGElement(*newChild), *target);
-            cloneParent->appendChild(newChild.release());
+            RefPtrWillBeRawPtr<Element> instanceRoot = target->cloneElementWithChildren();
+            ASSERT(instanceRoot->isSVGElement());
+            associateCorrespondingElements(*target, toSVGElement(*instanceRoot));
+            transferUseWidthAndHeightIfNeeded(*use, toSVGElement(*instanceRoot), *target);
+            removeDisallowedElementsFromSubtree(toSVGElement(*instanceRoot));
+            cloneParent->appendChild(instanceRoot.release());
         }
 
-        removeDisallowedElementsFromSubtree(*cloneParent);
-
         RefPtrWillBeRawPtr<SVGElement> replacingElement(cloneParent.get());
 
         // Replace <use> with referenced content.
         use->parentNode()->replaceChild(cloneParent.release(), use);
 
         use = Traversal<SVGUseElement>::next(*replacingElement, shadowRoot);
     }
     return true;
 }
 
@@ skipping 143 matching lines @@
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 } // namespace blink