Refactor code around ScriptLoader::FetchScript() according to the spec

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

 /*
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef ScriptLoader_h
 #define ScriptLoader_h
 
 #include "core/CoreExport.h"
 #include "core/dom/PendingScript.h"
 #include "core/dom/Script.h"
 #include "core/dom/ScriptRunner.h"
-#include "core/loader/resource/ScriptResource.h"
-#include "platform/loader/fetch/FetchParameters.h"
-#include "platform/loader/fetch/ResourceClient.h"
+#include "core/html/CrossOriginAttribute.h"
+#include "platform/loader/fetch/ResourceLoaderOptions.h"
 #include "platform/wtf/text/TextPosition.h"
 #include "platform/wtf/text/WTFString.h"
+#include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
 class ScriptElementBase;
 class Script;
 
+class ResourceFetcher;
+class ScriptResource;
+
 class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
                                  public PendingScriptClient {
   USING_GARBAGE_COLLECTED_MIXIN(ScriptLoader);
 
  public:
   static ScriptLoader* Create(ScriptElementBase* element,
                               bool created_by_parser,
                               bool is_evaluated,
                               bool created_during_document_write = false) {
     return new ScriptLoader(element, created_by_parser, is_evaluated,
@@ skipping 14 matching lines @@
       ScriptType& out_script_type);
 
   // https://html.spec.whatwg.org/#prepare-a-script
   bool PrepareScript(const TextPosition& script_start_position =
                          TextPosition::MinimumPosition(),
                      LegacyTypeSupport = kDisallowLegacyTypeInTypeAttribute);
 
   String ScriptContent() const;
 
   // Creates a PendingScript for external script whose fetch is started in
-  // fetchScript().
+  // FetchClassicScript().
   PendingScript* CreatePendingScript();
 
   // Returns false if and only if execution was blocked.
   bool ExecuteScript(const Script*);
   virtual void Execute();
 
   // XML parser calls these
   void DispatchLoadEvent();
   void DispatchErrorEvent();
   bool IsScriptTypeSupported(LegacyTypeSupport,
@@ skipping 41 matching lines @@
  protected:
   ScriptLoader(ScriptElementBase*,
                bool created_by_parser,
                bool is_evaluated,
                bool created_during_document_write);
 
  private:
   bool IgnoresLoadRequest() const;
   bool IsScriptForEventSupported() const;
 
-  bool FetchScript(const String& source_url,
-                   const String& encoding,
-                   FetchParameters::DeferOption);
+  // FetchClassicScript corresponds to Step 21.6 of
+  // https://html.spec.whatwg.org/#prepare-a-script
+  // and must NOT be called from outside of PendingScript().
+  //
+  // https://html.spec.whatwg.org/#fetch-a-classic-script
+  bool FetchClassicScript(const KURL&,
+                          ResourceFetcher*,
+                          const String& nonce,
+                          const IntegrityMetadataSet&,
+                          ParserDisposition,
+                          CrossOriginAttributeValue,
+                          SecurityOrigin*,
+                          const String& encoding);
+
   bool DoExecuteScript(const Script*);
 
   // Clears the connection to the PendingScript.
   void DetachPendingScript();
 
   // PendingScriptClient
   void PendingScriptFinished(PendingScript*) override;
 
   Member<ScriptElementBase> element_;
   Member<ScriptResource> resource_;
@@ skipping 53 matching lines @@
   };
 
   DocumentWriteIntervention document_write_intervention_;
 
   Member<PendingScript> pending_script_;
 };
 
 }  // namespace blink
 
 #endif  // ScriptLoader_h