De-Element ScriptLoader

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

Index: third_party/WebKit/Source/core/dom/Document.h
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index 9fcc67b3ed3628decb7e00ae79a69fbba7021337..e3175551a6599a9caaf747d98a3290a53a18d03b 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -153,6 +153,7 @@ class ResourceFetcher;
 class RootScrollerController;
 class SVGDocumentExtensions;
 class SVGUseElement;
+class ScriptLoaderClient;
 class ScriptRunner;
 class ScriptableDocumentParser;
 class ScriptedAnimationController;
@@ -933,13 +934,9 @@ class CORE_EXPORT Document : public ContainerNode,
 
   ScriptRunner* scriptRunner() { return m_scriptRunner.get(); }
 
-  Element* currentScript() const {
-    return !m_currentScriptStack.isEmpty() ? m_currentScriptStack.back().get()
-                                           : nullptr;
-  }
   void currentScriptForBinding(HTMLScriptElementOrSVGScriptElement&) const;
-  void pushCurrentScript(Element*);
-  void popCurrentScript();
+  void pushCurrentScript(ScriptLoaderClient*);
+  void popCurrentScript(ScriptLoaderClient*);
 
   void setTransformSource(std::unique_ptr<TransformSource>);
   TransformSource* transformSource() const { return m_transformSource.get(); }
@@ -1028,7 +1025,7 @@ class CORE_EXPORT Document : public ContainerNode,
                                EventListener*,
                                const String& contextURL,
                                const WTF::OrdinalNumber& contextLine);
-  bool allowExecutingScripts(Node*);
+  bool allowExecutingScripts(Document*);

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

Document::allowExecutingScripts(Document*) looks unclear what it does (e.g. two
Documents are involved, what are the two Documents?), so adding a comment might
be helpful.
(Actually I'm still not sure even after I read the implementation of
allowExecutingScripts() though...what does it intend to do?)

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

It appears to do 2 things: (1) check that both elementDocument and
contextDocument are attached, (2) check canExecuteScripts() for the
contextDocument. Given that ScriptLoader is the sole caller, I've inlined these
checks to hopefully make them a little clearer.

 
   void enforceSandboxFlags(SandboxFlags mask) override;
 
@@ -1552,7 +1549,7 @@ class CORE_EXPORT Document : public ContainerNode,
 
   Member<ScriptRunner> m_scriptRunner;
 
-  HeapVector<Member<Element>> m_currentScriptStack;
+  HeapVector<Member<ScriptLoaderClient>> m_currentScriptStack;
 
   std::unique_ptr<TransformSource> m_transformSource;