De-Element ScriptLoader

third_party/WebKit/Source/core/dom/Document.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.
@@ skipping 5113 matching lines @@
     UseCounter::count(*this, osdDisposition);
 
     return linkElement->href();
   }
 
   return KURL();
 }
 
 void Document::currentScriptForBinding(
     HTMLScriptElementOrSVGScriptElement& scriptElement) const {
-  if (Element* script = currentScript()) {
-    if (script->isInV1ShadowTree())
-      return;
-    if (isHTMLScriptElement(script))
-      scriptElement.setHTMLScriptElement(toHTMLScriptElement(script));
-    else if (isSVGScriptElement(script))
-      scriptElement.setSVGScriptElement(toSVGScriptElement(script));
-  }
+  if (!m_currentScriptStack.isEmpty())
+    m_currentScriptStack.back()->setScriptElementForBinding(scriptElement);
 }
 
-void Document::pushCurrentScript(Element* newCurrentScript) {
-  DCHECK(isHTMLScriptElement(newCurrentScript) ||
-         isSVGScriptElement(newCurrentScript));
+void Document::pushCurrentScript(ScriptLoaderClient* newCurrentScript) {
   m_currentScriptStack.push_back(newCurrentScript);
 }
 
-void Document::popCurrentScript() {
+void Document::popCurrentScript(ScriptLoaderClient* script) {
   DCHECK(!m_currentScriptStack.isEmpty());
+  DCHECK(m_currentScriptStack.back().get() == script);

[hiroshige, 2017/03/01 00:58:14]

nit: DCHECK_EQ

[Nate Chapin, 2017/03/01 21:34:58]

Done.

   m_currentScriptStack.pop_back();
 }
 
 void Document::setTransformSource(std::unique_ptr<TransformSource> source) {
   m_transformSource = std::move(source);
 }
 
 String Document::designMode() const {
   return inDesignMode() ? "on" : "off";
 }
@@ skipping 506 matching lines @@
   if (!contextDocument()->canExecuteScripts(NotAboutToExecuteScript))
     return false;
   if (node && node->document() != this &&
       !node->document().allowInlineEventHandler(node, listener, contextURL,
                                                 contextLine))
     return false;
 
   return true;
 }
 
-bool Document::allowExecutingScripts(Node* node) {
+bool Document::allowExecutingScripts(Document* document) {
   // FIXME: Eventually we'd like to evaluate scripts which are inserted into a
   // viewless document but this'll do for now.
   // See http://bugs.webkit.org/show_bug.cgi?id=5727
   LocalFrame* frame = executingFrame();
   if (!frame)
     return false;
-  if (!node->document().executingFrame())
+  if (!document->executingFrame())
     return false;
   if (!canExecuteScripts(AboutToExecuteScript))
     return false;
   return true;
 }
 
 void Document::enforceSandboxFlags(SandboxFlags mask) {
   RefPtr<SecurityOrigin> standInOrigin = getSecurityOrigin();
   applySandboxFlags(mask);
   // Send a notification if the origin has been updated.
@@ skipping 965 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif