Rename Node::inShadowIncludingDocument() to Node::isConnected()

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 55 matching lines @@
 #endif
     , m_SVGRareData(nullptr)
     , m_className(SVGAnimatedString::create(this, HTMLNames::classAttr, SVGString::create()))
 {
     addToPropertyMap(m_className);
     setHasCustomStyleCallbacks();
 }
 
 SVGElement::~SVGElement()
 {
-    ASSERT(inShadowIncludingDocument() || !hasRelativeLengths());
+    ASSERT(isConnected() || !hasRelativeLengths());
 }
 
 void SVGElement::detach(const AttachContext& context)
 {
     Element::detach(context);
     if (SVGElement* element = correspondingElement())
         element->removeInstanceMapping(this);
 }
 
 void SVGElement::attach(const AttachContext& context)
@@ skipping 16 matching lines @@
         return;
     // If the style changes because of a regular property change (not induced by SMIL animations themselves)
     // reset the "computed style without SMIL style properties", so the base value change gets reflected.
     if (change > NoChange || needsStyleRecalc())
         svgRareData()->setNeedsOverrideComputedStyleUpdate();
 }
 
 void SVGElement::buildPendingResourcesIfNeeded()
 {
     Document& document = this->document();
-    if (!needsPendingResourceHandling() || !inShadowIncludingDocument() || inUseShadowTree())
+    if (!needsPendingResourceHandling() || !isConnected() || inUseShadowTree())
         return;
 
     SVGDocumentExtensions& extensions = document.accessSVGExtensions();
     AtomicString resourceId = getIdAttribute();
     if (!extensions.hasPendingResource(resourceId))
         return;
 
     // Mark pending resources as pending for removal.
     extensions.markPendingResourcesForRemoval(resourceId);
 
@@ skipping 155 matching lines @@
 Node::InsertionNotificationRequest SVGElement::insertedInto(ContainerNode* rootParent)
 {
     Element::insertedInto(rootParent);
     updateRelativeLengthsInformation();
     buildPendingResourcesIfNeeded();
     return InsertionDone;
 }
 
 void SVGElement::removedFrom(ContainerNode* rootParent)
 {
-    bool wasInDocument = rootParent->inShadowIncludingDocument();
+    bool wasInDocument = rootParent->isConnected();
 
     if (wasInDocument && hasRelativeLengths()) {
         // The root of the subtree being removed should take itself out from its parent's relative
         // length set. For the other nodes in the subtree we don't need to do anything: they will
         // get their own removedFrom() notification and just clear their sets.
         if (rootParent->isSVGElement() && !parentNode()) {
             ASSERT(toSVGElement(rootParent)->m_elementsWithRelativeLengths.contains(this));
             toSVGElement(rootParent)->updateRelativeLengthsInformation(false, this);
         }
 
@@ skipping 98 matching lines @@
     }
 
     return propertyNameToIdMap->get(attrName.localName().impl());
 }
 
 void SVGElement::updateRelativeLengthsInformation(bool clientHasRelativeLengths, SVGElement* clientElement)
 {
     ASSERT(clientElement);
 
     // If we're not yet in a document, this function will be called again from insertedInto(). Do nothing now.
-    if (!inShadowIncludingDocument())
+    if (!isConnected())
         return;
 
     // An element wants to notify us that its own relative lengths state changed.
     // Register it in the relative length map, and register us in the parent relative length map.
     // Register the parent in the grandparents map, etc. Repeat procedure until the root of the SVG tree.
     for (Node& currentNode : NodeTraversal::inclusiveAncestorsOf(*this)) {
         if (!currentNode.isSVGElement())
             break;
         SVGElement& currentElement = toSVGElement(currentNode);
         ASSERT(!currentElement.m_inRelativeLengthClientsInvalidation);
@@ skipping 17 matching lines @@
         SVGDocumentExtensions& svgExtensions = accessDocumentSVGExtensions();
         if (clientElement->hasRelativeLengths())
             svgExtensions.addSVGRootWithRelativeLengthDescendents(toSVGSVGElement(clientElement));
         else
             svgExtensions.removeSVGRootWithRelativeLengthDescendents(toSVGSVGElement(clientElement));
     }
 }
 
 void SVGElement::invalidateRelativeLengthClients(SubtreeLayoutScope* layoutScope)
 {
-    if (!inShadowIncludingDocument())
+    if (!isConnected())
         return;
 
     ASSERT(!m_inRelativeLengthClientsInvalidation);
 #if ENABLE(ASSERT)
     TemporaryChange<bool> inRelativeLengthClientsInvalidationChange(m_inRelativeLengthClientsInvalidation, true);
 #endif
 
     if (LayoutObject* layoutObject = this->layoutObject()) {
         if (hasRelativeLengths() && layoutObject->isSVGResourceContainer())
             toLayoutSVGResourceContainer(layoutObject)->invalidateCacheAndMarkForLayout(layoutScope);
@@ skipping 382 matching lines @@
         classAttributeChanged(AtomicString(m_className->currentValue()->value()));
         invalidateInstances();
         return;
     }
 
     if (attrName == HTMLNames::idAttr) {
         LayoutObject* object = layoutObject();
         // Notify resources about id changes, this is important as we cache resources by id in SVGDocumentExtensions
         if (object && object->isSVGResourceContainer())
             toLayoutSVGResourceContainer(object)->idChanged();
-        if (inShadowIncludingDocument())
+        if (isConnected())
             buildPendingResourcesIfNeeded();
         invalidateInstances();
         return;
     }
 }
 
 void SVGElement::svgAttributeBaseValChanged(const QualifiedName& attribute)
 {
     svgAttributeChanged(attribute);
 
@@ skipping 106 matching lines @@
 
     const HeapHashSet<WeakMember<SVGElement>>& set = instancesForElement();
     if (set.isEmpty())
         return;
 
     // Mark all use elements referencing 'element' for rebuilding
     for (SVGElement* instance : set) {
         instance->setCorrespondingElement(0);
 
         if (SVGUseElement* element = instance->correspondingUseElement()) {
-            if (element->inShadowIncludingDocument())
+            if (element->isConnected())
                 element->invalidateShadowTree();
         }
     }
 
     svgRareData()->elementInstances().clear();
 }
 
 SVGElement::InstanceUpdateBlocker::InstanceUpdateBlocker(SVGElement* targetElement)
     : m_targetElement(targetElement)
 {
@@ skipping 182 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
     return evtString;
 }
 
 } // namespace blink