diff --git a/third_party/WebKit/Source/core/dom/Modulator.cpp b/third_party/WebKit/Source/core/dom/Modulator.cpp index e0b2ed2b428930..83a11579aaab62 100644 --- a/third_party/WebKit/Source/core/dom/Modulator.cpp +++ b/third_party/WebKit/Source/core/dom/Modulator.cpp @@ -29,7 +29,7 @@ Modulator* Modulator::From(ScriptState* script_state) { static_cast(per_context_data->GetData(kPerContextDataKey)); if (!modulator) { if (Document* document = ToDocument(ExecutionContext::From(script_state))) { - modulator = ModulatorImpl::Create(script_state, *document); + modulator = ModulatorImpl::Create(script_state, document->Fetcher()); Modulator::SetModulator(script_state, modulator); } } diff --git a/third_party/WebKit/Source/core/dom/ModulatorImpl.cpp b/third_party/WebKit/Source/core/dom/ModulatorImpl.cpp index e5e4f35dd77ff0..16081ff5eb37c2 100644 --- a/third_party/WebKit/Source/core/dom/ModulatorImpl.cpp +++ b/third_party/WebKit/Source/core/dom/ModulatorImpl.cpp @@ -4,7 +4,6 @@ #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" @@ -19,18 +18,15 @@ namespace blink { ModulatorImpl* ModulatorImpl::Create(RefPtr script_state, - Document& document) { - return new ModulatorImpl( - std::move(script_state), - TaskRunnerHelper::Get(TaskType::kNetworking, &document), - document.Fetcher()); + ResourceFetcher* resource_fetcher) { + return new ModulatorImpl(std::move(script_state), resource_fetcher); } ModulatorImpl::ModulatorImpl(RefPtr script_state, - RefPtr task_runner, ResourceFetcher* fetcher) : script_state_(std::move(script_state)), - task_runner_(std::move(task_runner)), + task_runner_( + TaskRunnerHelper::Get(TaskType::kNetworking, script_state_.Get())), fetcher_(fetcher), map_(this, ModuleMap::Create(this)), loader_registry_(ModuleScriptLoaderRegistry::Create()), diff --git a/third_party/WebKit/Source/core/dom/ModulatorImpl.h b/third_party/WebKit/Source/core/dom/ModulatorImpl.h index b4f2afdabd6eb3..c971e761bbee31 100644 --- a/third_party/WebKit/Source/core/dom/ModulatorImpl.h +++ b/third_party/WebKit/Source/core/dom/ModulatorImpl.h @@ -14,7 +14,6 @@ namespace blink { -class Document; class ExecutionContext; class ModuleMap; class ModuleScriptLoaderRegistry; @@ -29,7 +28,7 @@ class WebTaskRunner; // components together. class ModulatorImpl final : public Modulator { public: - static ModulatorImpl* Create(RefPtr, Document&); + static ModulatorImpl* Create(RefPtr, ResourceFetcher*); virtual ~ModulatorImpl(); DECLARE_TRACE(); @@ -67,7 +66,7 @@ class ModulatorImpl final : public Modulator { Vector ModuleRequestsFromScriptModule(ScriptModule) override; void ExecuteModule(const ModuleScript*) override; - ModulatorImpl(RefPtr, RefPtr, ResourceFetcher*); + ModulatorImpl(RefPtr, ResourceFetcher*); ExecutionContext* GetExecutionContext() const;