Remove redundant check in SVGUseElement::buildShadowTree

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 393 matching lines @@
     // Set up root SVG element in shadow tree.
     RefPtrWillBeRawPtr<Element> newChild = target->cloneElementWithoutChildren();
     m_targetElementInstance = toSVGElement(newChild.get());
     ShadowRoot* shadowTreeRootElement = userAgentShadowRoot();
     shadowTreeRootElement->appendChild(newChild.release());
 
     // Clone the target subtree into the shadow tree, not handling <use> and <symbol> yet.
 
     // SVG specification does not say a word about <use> & cycles. My view on this is: just ignore it!
     // Non-appearing <use> content is easier to debug, then half-appearing content.
-    if (!buildShadowTree(target, m_targetElementInstance.get(), false)) {
-        clearShadowTree();
-        return;
-    }
+    buildShadowTree(target, m_targetElementInstance.get(), false);
 
     if (instanceTreeIsLoading(m_targetElementInstance.get()))
         return;
 
-    // Assure shadow tree building was successfull
+    // Assure shadow tree building was successful.
     ASSERT(m_targetElementInstance);
     ASSERT(m_targetElementInstance->correspondingUseElement() == this);
     ASSERT(m_targetElementInstance->correspondingElement() == target);
 
     // Expand all <use> elements in the shadow tree.
     // Expand means: replace the actual <use> element by what it references.
     if (!expandUseElementsInShadowTree(m_targetElementInstance.get())) {
         clearShadowTree();
         return;
     }
@@ skipping 62 matching lines @@
     // http://dev.w3.org/fxtf/css-masking-1/#the-clip-path
     if (!isDirectReference(element)) {
         // Spec: Indirect references are an error (14.3.5)
         document().accessSVGExtensions().reportError("Not allowed to use indirect reference in <clip-path>");
         return nullptr;
     }
 
     return &toSVGGraphicsElement(element);
 }
 
-bool SVGUseElement::buildShadowTree(SVGElement* target, SVGElement* targetInstance, bool foundUse)
+void SVGUseElement::buildShadowTree(SVGElement* target, SVGElement* targetInstance, bool foundUse)
 {
     ASSERT(target);
     ASSERT(targetInstance);
+    ASSERT(!isDisallowedElement(target));
 
     // 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 (isSVGUseElement(*target)) {
         // We only need to track first degree <use> dependencies. Indirect references are handled
         // as the invalidation bubbles up the dependency chain.
         if (!foundUse && !isStructurallyExternal()) {
             addReferenceTo(target);
             foundUse = true;
         }
-    } else if (isDisallowedElement(target)) {
-        return false;
     }
 
     targetInstance->setCorrespondingElement(target);
     if (EventTargetData* data = target->eventTargetData())
         data->eventListenerMap.copyEventListenersNotCreatedFromMarkupToTarget(targetInstance);
 
     for (RefPtrWillBeRawPtr<Node> child = target->firstChild(); child; child = child->nextSibling()) {
         // Skip any disallowed element.
         if (isDisallowedElement(child.get()))
             continue;
 
         RefPtrWillBeRawPtr<Node> newChild = child->cloneNode(false);
         targetInstance->appendChild(newChild.get());
         if (newChild->isSVGElement()) {
             // Enter recursion, appending new instance tree nodes to the "instance" object.
-            if (!buildShadowTree(toSVGElement(child), toSVGElement(newChild), foundUse))
-                return false;
+            buildShadowTree(toSVGElement(child), toSVGElement(newChild), foundUse);
         }
     }
-    return true;
 }
 
 bool SVGUseElement::hasCycleUseReferencing(SVGUseElement* use, ContainerNode* targetInstance, SVGElement*& newTarget)
 {
     ASSERT(referencedScope());
     Element* targetElement = SVGURIReference::targetElementFromIRIString(use->hrefString(), *referencedScope());
     newTarget = 0;
     if (targetElement && targetElement->isSVGElement())
         newTarget = toSVGElement(targetElement);
 
@@ skipping 284 matching lines @@
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 } // namespace blink