Make DispatchLoad/ErrorEvent() and ExecuteScript() non-public

As a result of centralizing script execution and load/error event
dispatching into ScriptLoader::ExecuteScriptBlock(), ExecuteScript(),
DispatchLoadEvent() and DispatchErrorEvent() are now called only
from ScriptLoader.

Bug: 686281
Change-Id: I47f7b1c0d79d9d7bc586cb02028d72260f20be7b
Reviewed-on: https://chromium-review.googlesource.com/557383
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485893}

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

@@ -38,9 +38,6 @@ class CORE_EXPORT ScriptElementBase : public GarbageCollectedMixin {
  public:
   static ScriptElementBase* FromElementIfPossible(Element*);
 
-  virtual void DispatchLoadEvent() = 0;
-  virtual void DispatchErrorEvent() = 0;
-
   virtual bool AsyncAttributeValue() const = 0;
   virtual String CharsetAttributeValue() const = 0;
   virtual String CrossOriginAttributeValue() const = 0;
@@ -73,6 +70,10 @@ class CORE_EXPORT ScriptElementBase : public GarbageCollectedMixin {
   ScriptLoader* InitializeScriptLoader(bool parser_inserted,
                                        bool already_started,
                                        bool created_during_document_write);
+
+  friend class ScriptLoader;
+  virtual void DispatchLoadEvent() = 0;
+  virtual void DispatchErrorEvent() = 0;
 };
 
 }  // namespace blink

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

@@ -95,19 +95,9 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
   // FetchClassicScript()/FetchModuleScriptTree().
   PendingScript* CreatePendingScript();
 
-  enum class ExecuteScriptResult {
-    kShouldFireErrorEvent,
-    kShouldFireLoadEvent,
-    kShouldFireNone
-  };
-  WARN_UNUSED_RESULT ExecuteScriptResult ExecuteScript(const Script*);
-
   // The entry point only for ScriptRunner that wraps ExecuteScriptBlock().
   virtual void Execute();
 
-  // XML parser calls these
-  void DispatchLoadEvent();
-  void DispatchErrorEvent();
   bool IsScriptTypeSupported(LegacyTypeSupport,
                              ScriptType& out_script_type) const;
 
@@ -180,7 +170,15 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
                              ParserDisposition,
                              WebURLRequest::FetchCredentialsMode);
 
+  enum class ExecuteScriptResult {
+    kShouldFireErrorEvent,
+    kShouldFireLoadEvent,
+    kShouldFireNone
+  };
+  WARN_UNUSED_RESULT ExecuteScriptResult ExecuteScript(const Script*);
   ExecuteScriptResult DoExecuteScript(const Script*);
+  void DispatchLoadEvent();
+  void DispatchErrorEvent();
 
   // Clears the connection to the PendingScript.
   void DetachPendingScript();