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

third_party/WebKit/Source/core/dom/StyleEngine.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 129 matching lines @@
     context.addingPendingSheet(document());
     if (context.addedPendingSheetBeforeBody())
         m_pendingRenderBlockingStylesheets++;
 }
 
 // This method is called whenever a top-level stylesheet has finished loading.
 void StyleEngine::removePendingSheet(Node* styleSheetCandidateNode, const StyleEngineContext &context)
 {
     DCHECK(styleSheetCandidateNode);
     TreeScope* treeScope = isStyleElement(*styleSheetCandidateNode) ? &styleSheetCandidateNode->treeScope() : m_document.get();
-    if (styleSheetCandidateNode->inShadowIncludingDocument())
+    if (styleSheetCandidateNode->isConnected())
         markTreeScopeDirty(*treeScope);
 
     if (context.addedPendingSheetBeforeBody()) {
         DCHECK_GT(m_pendingRenderBlockingStylesheets, 0);
         m_pendingRenderBlockingStylesheets--;
     }
 
     // Make sure we knew this sheet was pending, and that our count isn't out of sync.
     DCHECK_GT(m_pendingScriptBlockingStylesheets, 0);
 
     m_pendingScriptBlockingStylesheets--;
     if (m_pendingScriptBlockingStylesheets)
         return;
 
     document().didRemoveAllPendingStylesheet();
 }
 
 void StyleEngine::setNeedsActiveStyleUpdate(StyleSheet* sheet, StyleResolverUpdateMode updateMode)
 {
     // resolverChanged() is called for inactive non-master documents because
     // import documents are inactive documents. resolverChanged() for imports
     // will call resolverChanged() for the master document and update the active
     // stylesheets including the ones from the import.
     if (!document().isActive() && isMaster())
         return;
 
     if (sheet && document().isActive()) {
         Node* node = sheet->ownerNode();
-        if (node && node->inShadowIncludingDocument()) {
+        if (node && node->isConnected()) {
             TreeScope& treeScope = isStyleElement(*node) ? node->treeScope() : *m_document;
             DCHECK(isStyleElement(*node) || node->treeScope() == m_document);
             markTreeScopeDirty(treeScope);
         }
     }
 
     resolverChanged(updateMode);
 }
 
 void StyleEngine::addStyleSheetCandidateNode(Node* node)
 {
-    if (!node->inShadowIncludingDocument() || document().isDetached())
+    if (!node->isConnected() || document().isDetached())
         return;
 
     TreeScope& treeScope = isStyleElement(*node) ? node->treeScope() : *m_document;
     DCHECK(isStyleElement(*node) || treeScope == m_document);
     DCHECK(!isXSLStyleSheet(*node));
     TreeScopeStyleSheetCollection* collection = ensureStyleSheetCollectionFor(treeScope);
     DCHECK(collection);
     collection->addStyleSheetCandidateNode(node);
 
     markTreeScopeDirty(treeScope);
@@ skipping 16 matching lines @@
     // we should not update anything. Instead, just return.
     if (!collection)
         return;
     collection->removeStyleSheetCandidateNode(node);
 
     markTreeScopeDirty(treeScope);
 }
 
 void StyleEngine::modifiedStyleSheetCandidateNode(Node* node)
 {
-    if (!node->inShadowIncludingDocument())
+    if (!node->isConnected())
         return;
 
     TreeScope& treeScope = isStyleElement(*node) ? node->treeScope() : *m_document;
     DCHECK(isStyleElement(*node) || treeScope == m_document);
     markTreeScopeDirty(treeScope);
     resolverChanged(FullStyleUpdate);
 }
 
 void StyleEngine::watchedSelectorsChanged()
 {
@@ skipping 590 matching lines @@
 
 DEFINE_TRACE_WRAPPERS(StyleEngine)
 {
     for (auto sheet : m_injectedAuthorStyleSheets) {
         visitor->traceWrappers(sheet);
     }
     visitor->traceWrappers(m_documentStyleSheetCollection);
 }
 
 } // namespace blink