De-Element ScriptLoader

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

Index: third_party/WebKit/Source/core/dom/ScriptLoader.h
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.h b/third_party/WebKit/Source/core/dom/ScriptLoader.h
index 295c12c9250ccdb07d50c8265da4b9d5066f4d3d..bfc2730e89afb4f57f834a01d5d61ab3ace14a32 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.h
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.h
@@ -32,29 +32,26 @@
 
 namespace blink {
 
-class Element;
+class LocalFrame;
 class ScriptLoaderClient;
 class ScriptSourceCode;
-class LocalFrame;
 
 class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
                                  public PendingScriptClient {
   USING_GARBAGE_COLLECTED_MIXIN(ScriptLoader);
 
  public:
-  static ScriptLoader* create(Element* element,
+  static ScriptLoader* create(ScriptLoaderClient* client,
                               bool createdByParser,
                               bool isEvaluated,
                               bool createdDuringDocumentWrite = false) {
-    return new ScriptLoader(element, createdByParser, isEvaluated,
+    return new ScriptLoader(client, createdByParser, isEvaluated,
                             createdDuringDocumentWrite);
   }
 
   ~ScriptLoader() override;
   DECLARE_VIRTUAL_TRACE();
 
-  Element* element() const { return m_element; }
-
   enum LegacyTypeSupport {
     DisallowLegacyTypeInTypeAttribute,
     AllowLegacyTypeInTypeAttribute
@@ -116,7 +113,7 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
   void setFetchDocWrittenScriptDeferIdle();
 
  protected:
-  ScriptLoader(Element*,
+  ScriptLoader(ScriptLoaderClient*,
                bool createdByParser,
                bool isEvaluated,
                bool createdDuringDocumentWrite);
@@ -131,15 +128,13 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
                    FetchRequest::DeferOption);
   bool doExecuteScript(const ScriptSourceCode&);
 
-  ScriptLoaderClient* client() const;
-
   // Clears the connection to the PendingScript.
   void detachPendingScript();
 
   // PendingScriptClient
   void pendingScriptFinished(PendingScript*) override;
 
-  Member<Element> m_element;
+  Member<ScriptLoaderClient> m_client;
   Member<ScriptResource> m_resource;
   WTF::OrdinalNumber m_startLineNumber;
 
@@ -197,8 +192,6 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
   Member<PendingScript> m_pendingScript;
 };
 
-ScriptLoader* toScriptLoaderIfPossible(Element*);
-
 }  // namespace blink
 
 #endif  // ScriptLoader_h