Use an open shadow root in <use>

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 56 matching lines @@
     ThreadState::current()->registerPreFinalizer(this);
 
     addToPropertyMap(m_x);
     addToPropertyMap(m_y);
     addToPropertyMap(m_width);
     addToPropertyMap(m_height);
 }
 
 SVGUseElement* SVGUseElement::create(Document& document)
 {
-    // Always build a user agent #shadow-root for SVGUseElement.
+    // Always build a closed #shadow-root for SVGUseElement.
     SVGUseElement* use = new SVGUseElement(document);
-    use->ensureUserAgentShadowRoot();
+    use->ensureShadow().addShadowRoot(*use, ShadowRootType::Open);
     return use;
 }
 
 SVGUseElement::~SVGUseElement()
 {
 }
 
 void SVGUseElement::dispose()
 {
     setDocumentResource(nullptr);
@@ skipping 205 matching lines @@
 {
     if (m_targetElementInstance)
         m_targetElementInstance = nullptr;
 }
 
 void SVGUseElement::clearShadowTree()
 {
     clearInstanceRoot();
 
     // FIXME: We should try to optimize this, to at least allow partial reclones.
-    if (ShadowRoot* shadowTreeRootElement = userAgentShadowRoot())
+    if (ShadowRoot* shadowTreeRootElement = openShadowRoot())
         shadowTreeRootElement->removeChildren(OmitSubtreeModifiedEvent);
 
     removeAllOutgoingReferences();
 }
 
 Element* SVGUseElement::resolveTargetElement()
 {
     if (m_elementIdentifier.isEmpty())
         return nullptr;
     const TreeScope* lookupScope = nullptr;
@@ skipping 114 matching lines @@
         return;
 
     // Do not allow self-referencing.
     if (&target == this || isDisallowedElement(target))
         return;
 
     // Set up root SVG element in shadow tree.
     // Clone the target subtree into the shadow tree, not handling <use> and <symbol> yet.
     Element* instanceRoot = createInstanceTree(target);
     m_targetElementInstance = toSVGElement(instanceRoot);
-    ShadowRoot* shadowTreeRootElement = userAgentShadowRoot();
+    ShadowRoot* shadowTreeRootElement = openShadowRoot();
     shadowTreeRootElement->appendChild(instanceRoot);
 
     addReferencesToFirstDegreeNestedUseElements(target);
 
     if (instanceTreeIsLoading()) {
         cloneNonMarkupEventListeners();
         return;
     }
 
     // Assure shadow tree building was successful.
@@ skipping 48 matching lines @@
         toSVGGeometryElement(*element).toClipPath(path);
         // FIXME: Avoid manual resolution of x/y here. Its potentially harmful.
         SVGLengthContext lengthContext(this);
         path.translate(FloatSize(m_x->currentValue()->value(lengthContext), m_y->currentValue()->value(lengthContext)));
         path.transform(calculateAnimatedLocalTransform());
     }
 }
 
 SVGGraphicsElement* SVGUseElement::visibleTargetGraphicsElementForClipping() const
 {
-    Node* n = userAgentShadowRoot()->firstChild();
+    Node* n = openShadowRoot()->firstChild();
     if (!n || !n->isSVGElement())
         return nullptr;
 
     SVGElement& element = toSVGElement(*n);
 
     if (!element.isSVGGraphicsElement())
         return nullptr;
 
     if (!element.layoutObject())
         return nullptr;
@@ skipping 23 matching lines @@
     // references are handled as the invalidation bubbles up the dependency
     // chain.
     SVGUseElement* useElement =
         isSVGUseElement(target) ? toSVGUseElement(&target) : Traversal<SVGUseElement>::firstWithin(target);
     for (; useElement; useElement = Traversal<SVGUseElement>::nextSkippingChildren(*useElement, &target))
         addReferenceTo(useElement);
 }
 
 void SVGUseElement::cloneNonMarkupEventListeners()
 {
-    for (SVGElement& element : Traversal<SVGElement>::descendantsOf(*userAgentShadowRoot())) {
+    for (SVGElement& element : Traversal<SVGElement>::descendantsOf(*openShadowRoot())) {
         if (EventTargetData* data = element.correspondingElement()->eventTargetData())
             data->eventListenerMap.copyEventListenersNotCreatedFromMarkupToTarget(&element);
     }
 }
 
 bool SVGUseElement::hasCycleUseReferencing(const SVGUseElement& use, const ContainerNode& targetInstance, SVGElement*& newTarget) const
 {
     Element* targetElement = targetElementFromIRIString(use.hrefString(), use.treeScope());
     newTarget = 0;
     if (targetElement && targetElement->isSVGElement())
@@ skipping 33 matching lines @@
 
 bool SVGUseElement::expandUseElementsInShadowTree()
 {
     // Why expand the <use> elements in the shadow tree here, and not just
     // 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();
+    ShadowRoot* shadowRoot = openShadowRoot();
     for (SVGUseElement* use = Traversal<SVGUseElement>::firstWithin(*shadowRoot); use; ) {
         ASSERT(!use->resourceIsStillLoading());
 
         SVGUseElement& originalUse = toSVGUseElement(*use->correspondingElement());
         SVGElement* target = nullptr;
         if (hasCycleUseReferencing(originalUse, *use, target))
             return false;
 
         if (target && isDisallowedElement(*target))
             return false;
@@ skipping 117 matching lines @@
 bool SVGUseElement::resourceIsValid() const
 {
     return m_resource
         && m_resource->isLoaded()
         && !m_resource->errorOccurred()
         && m_resource->document();
 }
 
 bool SVGUseElement::instanceTreeIsLoading() const
 {
-    for (const SVGUseElement& useElement : Traversal<SVGUseElement>::descendantsOf(*userAgentShadowRoot())) {
+    for (const SVGUseElement& useElement : Traversal<SVGUseElement>::descendantsOf(*openShadowRoot())) {
         if (useElement.resourceIsStillLoading())
             return true;
     }
     return false;
 }
 
 void SVGUseElement::setDocumentResource(DocumentResource* resource)
 {
     if (m_resource == resource)
         return;
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 } // namespace blink