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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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 78 matching lines @@
 }
 
 void ScriptLoader::didNotifySubtreeInsertionsToDocument()
 {
     if (!m_parserInserted)
         prepareScript(); // FIXME: Provide a real starting line number here.
 }
 
 void ScriptLoader::childrenChanged()
 {
-    if (!m_parserInserted && m_element->inShadowIncludingDocument())
+    if (!m_parserInserted && m_element->isConnected())
         prepareScript(); // FIXME: Provide a real starting line number here.
 }
 
 void ScriptLoader::handleSourceAttribute(const String& sourceUrl)
 {
     if (ignoresLoadRequest() || sourceUrl.isEmpty())
         return;
 
     prepareScript(); // FIXME: Provide a real starting line number here.
 }
@@ skipping 91 matching lines @@
         wasParserInserted = false;
     }
 
     if (wasParserInserted && !client->asyncAttributeValue())
         m_forceAsync = true;
 
     // FIXME: HTML5 spec says we should check that all children are either comments or empty text nodes.
     if (!client->hasSourceAttribute() && !m_element->hasChildren())
         return false;
 
-    if (!m_element->inShadowIncludingDocument())
+    if (!m_element->isConnected())
         return false;
 
     if (!isScriptTypeSupported(supportLegacyTypes))
         return false;
 
     if (wasParserInserted) {
         m_parserInserted = true;
         m_forceAsync = false;
     }
 
@@ skipping 58 matching lines @@
     }
 
     return true;
 }
 
 bool ScriptLoader::fetchScript(const String& sourceUrl, FetchRequest::DeferOption defer)
 {
     DCHECK(m_element);
 
     Document* elementDocument = &(m_element->document());
-    if (!m_element->inShadowIncludingDocument() || m_element->document() != elementDocument)
+    if (!m_element->isConnected() || m_element->document() != elementDocument)
         return false;
 
     DCHECK(!m_resource);
     if (!stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
         FetchRequest request(ResourceRequest(elementDocument->completeURL(sourceUrl)), m_element->localName());
 
         CrossOriginAttributeValue crossOrigin = crossOriginAttributeValue(m_element->fastGetAttribute(HTMLNames::crossoriginAttr));
         if (crossOrigin != CrossOriginAttributeNotSet)
             request.setCrossOriginAccessControl(elementDocument->getSecurityOrigin(), crossOrigin);
         request.setCharset(scriptCharset());
@@ skipping 172 matching lines @@
         detach();
         dispatchErrorEvent();
         return;
     }
     contextDocument->scriptRunner()->notifyScriptReady(this, runOrder);
     m_pendingScript->stopWatchingForLoad();
 }
 
 bool ScriptLoader::ignoresLoadRequest() const
 {
-    return m_alreadyStarted || m_isExternalScript || m_parserInserted || !element() || !element()->inShadowIncludingDocument();
+    return m_alreadyStarted || m_isExternalScript || m_parserInserted || !element() || !element()->isConnected();
 }
 
 bool ScriptLoader::isScriptForEventSupported() const
 {
     String eventAttribute = client()->eventAttributeValue();
     String forAttribute = client()->forAttributeValue();
     if (eventAttribute.isNull() || forAttribute.isNull())
         return true;
 
     forAttribute = forAttribute.stripWhiteSpace();
@@ skipping 25 matching lines @@
     if (isHTMLScriptLoader(element))
         return toHTMLScriptElement(element)->loader();
 
     if (isSVGScriptLoader(element))
         return toSVGScriptElement(element)->loader();
 
     return 0;
 }
 
 } // namespace blink