Eliminate SVGUseElement::referencedScope()

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 121 matching lines @@
 
 void SVGUseElement::removedFrom(ContainerNode* rootParent)
 {
     SVGGraphicsElement::removedFrom(rootParent);
     if (rootParent->inDocument()) {
         clearShadowTree();
         cancelShadowTreeRecreation();
     }
 }
 
-TreeScope* SVGUseElement::referencedScope() const
-{
-    if (isStructurallyExternal())
-        return externalDocument();
-    return &treeScope();
-}
-
 Document* SVGUseElement::externalDocument() const
 {
     // Gracefully handle error condition.
     if (!resourceIsValid())
         return nullptr;
     ASSERT(m_resource->document());
     return m_resource->document();
 }
 
 static void transferUseWidthAndHeightIfNeeded(const SVGUseElement& use, SVGElement& shadowElement, const SVGElement& originalElement)
@@ skipping 164 matching lines @@
 
     removeAllOutgoingReferences();
 }
 
 void SVGUseElement::buildPendingResource()
 {
     if (inUseShadowTree())
         return;
     clearShadowTree();
     cancelShadowTreeRecreation();
-    if (!referencedScope() || !inDocument())
+    if (!inDocument())
+        return;
+    Document* externalDocument = this->externalDocument();
+    if (isStructurallyExternal() && !externalDocument)
         return;
 
     AtomicString id;
-    Element* target = SVGURIReference::targetElementFromIRIString(hrefString(), treeScope(), &id, externalDocument());
+    Element* target = targetElementFromIRIString(hrefString(), treeScope(), &id, externalDocument);
     if (!target || !target->inDocument()) {
         // If we can't find the target of an external element, just give up.
         // We can't observe if the target somewhen enters the external document, nor should we do it.
-        if (externalDocument())
+        if (externalDocument)
             return;
         if (id.isEmpty())
             return;
 
-        referencedScope()->document().accessSVGExtensions().addPendingResource(id, this);
+        document().accessSVGExtensions().addPendingResource(id, this);
         ASSERT(hasPendingResources());
         return;
     }
 
     if (target->isSVGElement()) {
         buildShadowAndInstanceTree(toSVGElement(*target));
         invalidateDependentShadowTrees();
     }
 
     ASSERT(!m_needsShadowTreeRecreation);
@@ skipping 161 matching lines @@
 void SVGUseElement::cloneNonMarkupEventListeners()
 {
     for (SVGElement& element : Traversal<SVGElement>::descendantsOf(*userAgentShadowRoot())) {
         if (EventTargetData* data = element.correspondingElement()->eventTargetData())
             data->eventListenerMap.copyEventListenersNotCreatedFromMarkupToTarget(&element);
     }
 }
 
 bool SVGUseElement::hasCycleUseReferencing(const SVGUseElement& use, const ContainerNode& targetInstance, SVGElement*& newTarget) const
 {
-    ASSERT(referencedScope());
-    Element* targetElement = SVGURIReference::targetElementFromIRIString(use.hrefString(), *referencedScope());
+    Element* targetElement = targetElementFromIRIString(use.hrefString(), use.treeScope());
     newTarget = 0;
     if (targetElement && targetElement->isSVGElement())
         newTarget = toSVGElement(targetElement);
 
     if (!newTarget)
         return false;
 
     // Shortcut for self-references
     if (newTarget == this)
         return true;
@@ skipping 60 matching lines @@
     // do this directly in buildShadowTree, if we encounter a <use> element?
     //
     // Short answer: Because we may miss to expand some elements. For example, if a <symbol>
     // contains <use> tags, we'd miss them. So once we're done with setting up the
     // actual shadow tree (after the special case modification for svg/symbol) we have
     // to walk it completely and expand all <use> elements.
     ShadowRoot* shadowRoot = userAgentShadowRoot();
     for (RefPtrWillBeRawPtr<SVGUseElement> use = Traversal<SVGUseElement>::firstWithin(*shadowRoot); use; ) {
         ASSERT(!use->resourceIsStillLoading());
 
-        SVGElement* target = 0;
-        if (hasCycleUseReferencing(toSVGUseElement(*use->correspondingElement()), *use, target))
+        SVGUseElement& originalUse = toSVGUseElement(*use->correspondingElement());
+        SVGElement* target = nullptr;
+        if (hasCycleUseReferencing(originalUse, *use, target))
             return false;
 
         if (target && isDisallowedElement(*target))
             return false;
         // Don't ASSERT(target) here, it may be "pending", too.
         // Setup sub-shadow tree root node
-        RefPtrWillBeRawPtr<SVGGElement> cloneParent = SVGGElement::create(referencedScope()->document());
+        RefPtrWillBeRawPtr<SVGGElement> cloneParent = SVGGElement::create(originalUse.document());
         // Transfer all data (attributes, etc.) from <use> to the new <g> element.
         cloneParent->cloneDataFromElement(*use);
-        cloneParent->setCorrespondingElement(use->correspondingElement());
+        cloneParent->setCorrespondingElement(&originalUse);
 
         removeAttributesFromReplacementElement(*cloneParent);
 
         // Move already cloned elements to the new <g> element.
         moveChildrenToReplacementElement(*use, *cloneParent);
 
         if (target) {
             RefPtrWillBeRawPtr<Element> instanceRoot = target->cloneElementWithChildren();
             ASSERT(instanceRoot->isSVGElement());
             associateCorrespondingElements(*target, toSVGElement(*instanceRoot));
@@ skipping 15 matching lines @@
 void SVGUseElement::expandSymbolElementsInShadowTree()
 {
     ShadowRoot* shadowRoot = userAgentShadowRoot();
     for (RefPtrWillBeRawPtr<SVGSymbolElement> symbol = Traversal<SVGSymbolElement>::firstWithin(*shadowRoot); symbol; ) {
         // Spec: The referenced 'symbol' and its contents are deep-cloned into the generated tree,
         // with the exception that the 'symbol' is replaced by an 'svg'. This generated 'svg' will
         // always have explicit values for attributes width and height. If attributes width and/or
         // height are provided on the 'use' element, then these attributes will be transferred to
         // the generated 'svg'. If attributes width and/or height are not specified, the generated
         // 'svg' element will use values of 100% for these attributes.
-        ASSERT(referencedScope());
-        RefPtrWillBeRawPtr<SVGSVGElement> svgElement = SVGSVGElement::create(referencedScope()->document());
+        SVGElement& originalSymbol = *symbol->correspondingElement();
+        RefPtrWillBeRawPtr<SVGSVGElement> svgElement = SVGSVGElement::create(originalSymbol.document());
         // Transfer all data (attributes, etc.) from <symbol> to the new <svg> element.
         svgElement->cloneDataFromElement(*symbol);
-        svgElement->setCorrespondingElement(symbol->correspondingElement());
+        svgElement->setCorrespondingElement(&originalSymbol);
 
         // Move already cloned elements to the new <svg> element.
         moveChildrenToReplacementElement(*symbol, *svgElement);
 
         removeDisallowedElementsFromSubtree(*svgElement);
 
         RefPtrWillBeRawPtr<SVGElement> replacingElement(svgElement.get());
 
         // Replace <symbol> with <svg>.
         symbol->parentNode()->replaceChild(svgElement.release(), symbol);
@@ skipping 118 matching lines @@
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 } // namespace blink