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

third_party/WebKit/Source/core/dom/Element.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003-2011, 2013, 2014 Apple Inc. All rights reserved.
  *
  * 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 545 matching lines @@
     // created. In order to know which properties are actually proxied, we
     // maintain a count of the number of compositor proxies associated with each
     // property.
     bool hasCompositorProxy() const;
     void incrementCompositorProxiedProperties(uint32_t mutableProperties);
     void decrementCompositorProxiedProperties(uint32_t mutableProperties);
     uint32_t compositorMutableProperties() const;
     void updateFromCompositorMutation(const CompositorMutation&);
 
     // Helpers for V8DOMActivityLogger::logEvent.  They call logEvent only if
-    // the element is inShadowIncludingDocument() and the context is an isolated world.
+    // the element is isConnected() and the context is an isolated world.
     void logAddElementIfIsolatedWorldAndInDocument(const char element[], const QualifiedName& attr1);
     void logAddElementIfIsolatedWorldAndInDocument(const char element[], const QualifiedName& attr1, const QualifiedName& attr2);
     void logAddElementIfIsolatedWorldAndInDocument(const char element[], const QualifiedName& attr1, const QualifiedName& attr2, const QualifiedName& attr3);
     void logUpdateAttributeIfIsolatedWorldAndInDocument(const char element[], const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue);
 
     DECLARE_VIRTUAL_TRACE();
 
     DECLARE_VIRTUAL_TRACE_WRAPPERS();
 
     SpellcheckAttributeState spellcheckAttributeState() const;
@@ skipping 285 matching lines @@
 {
     if (!elementData() || !elementData()->isUnique())
         createUniqueElementData();
     return toUniqueElementData(*m_elementData);
 }
 
 inline Node::InsertionNotificationRequest Node::insertedInto(ContainerNode* insertionPoint)
 {
     DCHECK(!childNeedsStyleInvalidation());
     DCHECK(!needsStyleInvalidation());
-    DCHECK(insertionPoint->inShadowIncludingDocument() || insertionPoint->isInShadowTree() || isContainerNode());
-    if (insertionPoint->inShadowIncludingDocument()) {
-        setFlag(InDocumentFlag);
+    DCHECK(insertionPoint->isConnected() || insertionPoint->isInShadowTree() || isContainerNode());
+    if (insertionPoint->isConnected()) {
+        setFlag(IsConnectedFlag);
         insertionPoint->document().incrementNodeCount();
     }
     if (parentOrShadowHostNode()->isInShadowTree())
         setFlag(IsInShadowTreeFlag);
     if (childNeedsDistributionRecalc() && !insertionPoint->childNeedsDistributionRecalc())
         insertionPoint->markAncestorsWithChildNeedsDistributionRecalc();
     return InsertionDone;
 }
 
 inline void Node::removedFrom(ContainerNode* insertionPoint)
 {
-    DCHECK(insertionPoint->inShadowIncludingDocument() || isContainerNode() || isInShadowTree());
-    if (insertionPoint->inShadowIncludingDocument()) {
-        clearFlag(InDocumentFlag);
+    DCHECK(insertionPoint->isConnected() || isContainerNode() || isInShadowTree());
+    if (insertionPoint->isConnected()) {
+        clearFlag(IsConnectedFlag);
         insertionPoint->document().decrementNodeCount();
     }
     if (isInShadowTree() && !containingTreeScope().rootNode().isShadowRoot())
         clearFlag(IsInShadowTreeFlag);
     if (AXObjectCache* cache = document().existingAXObjectCache())
         cache->remove(this);
 }
 
 inline void Element::invalidateStyleAttribute()
 {
@@ skipping 69 matching lines @@
     static T* create(const QualifiedName&, Document&)
 #define DEFINE_ELEMENT_FACTORY_WITH_TAGNAME(T) \
     T* T::create(const QualifiedName& tagName, Document& document) \
     { \
         return new T(tagName, document); \
     }
 
 } // namespace blink
 
 #endif // Element_h