De-Element ScriptLoader

third_party/WebKit/Source/core/html/HTMLScriptElement.h

Index: third_party/WebKit/Source/core/html/HTMLScriptElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLScriptElement.h b/third_party/WebKit/Source/core/html/HTMLScriptElement.h
index 223a8fd905a2f15d62b615d7614d643d419b4c7e..48c45183ba46cec5c293356567d51b4eb8a5d43b 100644
--- a/third_party/WebKit/Source/core/html/HTMLScriptElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLScriptElement.h
@@ -26,15 +26,16 @@
 #define HTMLScriptElement_h
 
 #include "core/CoreExport.h"
+#include "core/dom/ScriptElementBase.h"
 #include "core/dom/ScriptLoader.h"
-#include "core/dom/ScriptLoaderClient.h"
 #include "core/html/HTMLElement.h"
 
 namespace blink {
 
 class CORE_EXPORT HTMLScriptElement final : public HTMLElement,
-                                            public ScriptLoaderClient {
+                                            public ScriptElementBase {
   DEFINE_WRAPPERTYPEINFO();
+  USING_GARBAGE_COLLECTED_MIXIN(HTMLScriptElement);
 
  public:
   static HTMLScriptElement* create(Document&,
@@ -52,6 +53,9 @@ class CORE_EXPORT HTMLScriptElement final : public HTMLElement,
 
   ScriptLoader* loader() const { return m_loader.get(); }
 
+  bool isScriptElement() const override { return true; }
+  Document& document() const override;
+
   DECLARE_VIRTUAL_TRACE();
 
  private:
@@ -70,21 +74,33 @@ class CORE_EXPORT HTMLScriptElement final : public HTMLElement,
   bool hasLegalLinkAttribute(const QualifiedName&) const override;
   const QualifiedName& subResourceAttributeName() const override;
 
+  // ScriptElementBase overrides:
   String sourceAttributeValue() const override;
   String charsetAttributeValue() const override;
   String typeAttributeValue() const override;
   String languageAttributeValue() const override;
   String forAttributeValue() const override;
   String eventAttributeValue() const override;
+  String crossOriginAttributeValue() const override;
+  String integrityAttributeValue() const override;
+  String textFromChildren() override;
+  String textContent() const override;
   bool asyncAttributeValue() const override;
   bool deferAttributeValue() const override;
   bool hasSourceAttribute() const override;
-
+  bool isConnected() const override;
+  bool hasChildren() const override;
+  bool isNonceableElement() const override;
+  bool allowInlineScriptForCSP(const AtomicString& nonce,
+                               const WTF::OrdinalNumber&,
+                               const String& scriptContent) override;
+  AtomicString initiatorName() const override;
   void dispatchLoadEvent() override;
+  void dispatchErrorEvent() override;
+  void setScriptElementForBinding(
+      HTMLScriptElementOrSVGScriptElement&) override;
 
   Element* cloneElementWithoutAttributesAndChildren() override;
-
-  Member<ScriptLoader> m_loader;
 };
 
 }  // namespace blink