Worklet: Enable module script loading for main thread worklets

third_party/WebKit/Source/core/dom/ModulatorImpl.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/dom/ModulatorImpl.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ModuleMap.h"
 #include "core/dom/ModuleScript.h"
 #include "core/dom/ScriptModuleResolverImpl.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/modulescript/ModuleScriptFetchRequest.h"
 #include "core/loader/modulescript/ModuleScriptLoaderRegistry.h"
 #include "core/loader/modulescript/ModuleTreeLinkerRegistry.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 
 namespace blink {
 
 ModulatorImpl* ModulatorImpl::Create(RefPtr<ScriptState> script_state,
-                                     Document& document) {
+                                     ExecutionContext& execution_context,
+                                     ResourceFetcher* fetcher) {
   return new ModulatorImpl(
       std::move(script_state),
-      TaskRunnerHelper::Get(TaskType::kNetworking, &document),
-      document.Fetcher());
+      TaskRunnerHelper::Get(TaskType::kNetworking, &execution_context),

[kouhei (in TOK), 2017/05/01 10:15:32]

shouldn't be needed.

[nhiroki, 2017/05/02 03:54:38]

Done.

+      fetcher);
 }
 
 ModulatorImpl::ModulatorImpl(RefPtr<ScriptState> script_state,
                              RefPtr<WebTaskRunner> task_runner,
                              ResourceFetcher* fetcher)
     : script_state_(std::move(script_state)),
       task_runner_(std::move(task_runner)),

[kouhei (in TOK), 2017/05/01 10:15:32]

Maybe we should simply get this via TaskRunnerHelper::Get(TaskType::kNetworking,
ExecutionContext::From(script_state_.Get()));

[nhiroki, 2017/05/02 03:54:38]

Done.

       fetcher_(fetcher),
       map_(this, ModuleMap::Create(this)),
       loader_registry_(ModuleScriptLoaderRegistry::Create()),
       tree_linker_registry_(ModuleTreeLinkerRegistry::Create()),
       script_module_resolver_(ScriptModuleResolverImpl::Create(this)) {
   DCHECK(script_state_);
   DCHECK(task_runner_);
   DCHECK(fetcher_);
 }
 
@@ skipping 174 matching lines @@
   visitor->Trace(loader_registry_);
   visitor->Trace(tree_linker_registry_);
   visitor->Trace(script_module_resolver_);
 }
 
 DEFINE_TRACE_WRAPPERS(ModulatorImpl) {
   visitor->TraceWrappers(map_);
 }
 
 }  // namespace blink