Pass AccessControlStatus to compileModule()

third_party/WebKit/Source/core/loader/modulescript/ModuleScriptLoader.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/loader/modulescript/ModuleScriptLoader.h"
 
 #include "core/dom/Modulator.h"
 #include "core/dom/ModuleScript.h"
 #include "core/loader/modulescript/ModuleScriptLoaderClient.h"
 #include "core/loader/modulescript/ModuleScriptLoaderRegistry.h"
@@ skipping 182 matching lines @@
   // null, asynchronously complete this algorithm with null, and abort these
   // steps.
   if (!wasModuleLoadSuccessful(resource())) {
     advanceState(State::Finished);
     return;
   }
 
   // Step 8. Let source text be the result of UTF-8 decoding response's body.
   String sourceText = resource()->script();
 
+  AccessControlStatus accessControlStatus =
+      resource()->calculateAccessControlStatus(m_modulator->securityOrigin());
+
   // Step 9. Let module script be the result of creating a module script given
   // source text, module map settings object, response's url, cryptographic
   // nonce, parser state, and credentials mode.
   m_moduleScript = createModuleScript(
       sourceText, resource()->response().url(), m_modulator, m_nonce,
-      m_parserState, resource()->resourceRequest().fetchCredentialsMode());
+      m_parserState, resource()->resourceRequest().fetchCredentialsMode(),
+      accessControlStatus);
 
   advanceState(State::Finished);
 }
 
 // https://html.spec.whatwg.org/#creating-a-module-script
 ModuleScript* ModuleScriptLoader::createModuleScript(
     const String& sourceText,
     const KURL& url,
     Modulator* modulator,
     const String& nonce,
     ParserDisposition parserState,
-    WebURLRequest::FetchCredentialsMode credentialsMode) {
+    WebURLRequest::FetchCredentialsMode credentialsMode,
+    AccessControlStatus accessControlStatus) {
   // Step 1. Let script be a new module script that this algorithm will
   // subsequently initialize.
   // Step 2. Set script's settings object to the environment settings object
   // provided.
   // Note: "script's settings object" will be "modulator".
 
   // Delegate to Modulator::compileModule to process Steps 3-6.
-  ScriptModule result = modulator->compileModule(sourceText, url.getString());
+  ScriptModule result = modulator->compileModule(sourceText, url.getString(),
+                                                 accessControlStatus);
   // Step 6: "...return null, and abort these steps."
   if (result.isNull())
     return nullptr;
   // Step 7. Set script's module record to result.
   // Step 8. Set script's base URL to the script base URL provided.
   // Step 9. Set script's cryptographic nonce to the cryptographic nonce
   // provided.
   // Step 10. Set script's parser state to the parser state.
   // Step 11. Set script's credentials mode to the credentials mode provided.
   // Step 12. Return script.
   return ModuleScript::create(result, url, nonce, parserState, credentialsMode);
 }
 
 DEFINE_TRACE(ModuleScriptLoader) {
   visitor->trace(m_modulator);
   visitor->trace(m_moduleScript);
   visitor->trace(m_registry);
   visitor->trace(m_client);
   ResourceOwner<ScriptResource>::trace(visitor);
 }
 
 }  // namespace blink