diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/loader/modulescript')
18 files changed, 26 insertions, 23 deletions
diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.cc index 29765436437..860134d9706 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.cc @@ -48,7 +48,7 @@ void DocumentModuleScriptFetcher::NotifyFinished(Resource* resource) { client_->NotifyFetchFinished(params, error_messages); } -void DocumentModuleScriptFetcher::Trace(Visitor* visitor) { +void DocumentModuleScriptFetcher::Trace(Visitor* visitor) const { ModuleScriptFetcher::Trace(visitor); visitor->Trace(client_); ResourceClient::Trace(visitor); diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.h b/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.h index 4ac35597297..6012aa2c8aa 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.h @@ -33,7 +33,7 @@ class CORE_EXPORT DocumentModuleScriptFetcher final void NotifyFinished(Resource*) override; String DebugName() const override { return "DocumentModuleScriptFetcher"; } - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: Member<Client> client_; diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc index 1862a248eb4..8667eba3cc0 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc @@ -110,7 +110,7 @@ void InstalledServiceWorkerModuleScriptFetcher::Fetch( client->NotifyFetchFinished(params, HeapVector<Member<ConsoleMessage>>()); } -void InstalledServiceWorkerModuleScriptFetcher::Trace(Visitor* visitor) { +void InstalledServiceWorkerModuleScriptFetcher::Trace(Visitor* visitor) const { ModuleScriptFetcher::Trace(visitor); visitor->Trace(global_scope_); } diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.h b/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.h index e68a730dfec..7be9182c42a 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.h @@ -29,7 +29,7 @@ class CORE_EXPORT InstalledServiceWorkerModuleScriptFetcher final ModuleGraphLevel, ModuleScriptFetcher::Client*) override; - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: String DebugName() const override { diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.cc index af7f699107c..5a29760fc6d 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.cc @@ -28,7 +28,7 @@ void ModuleScriptFetcher::Client::OnFailed() { NotifyFetchFinished(base::nullopt, HeapVector<Member<ConsoleMessage>>()); } -void ModuleScriptFetcher::Trace(Visitor* visitor) { +void ModuleScriptFetcher::Trace(Visitor* visitor) const { ResourceClient::Trace(visitor); } diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.h b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.h index 9b034af0c37..8018964df93 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_fetcher.h @@ -49,7 +49,7 @@ class CORE_EXPORT ModuleScriptFetcher : public ResourceClient { ModuleGraphLevel, Client*) = 0; - void Trace(Visitor*) override; + void Trace(Visitor*) const override; protected: static bool WasModuleLoadSuccessful( diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc index 60517e94b89..f51db68c182 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc @@ -279,7 +279,7 @@ void ModuleScriptLoader::NotifyFetchFinished( AdvanceState(State::kFinished); } -void ModuleScriptLoader::Trace(Visitor* visitor) { +void ModuleScriptLoader::Trace(Visitor* visitor) const { visitor->Trace(modulator_); visitor->Trace(module_script_); visitor->Trace(registry_); diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.h b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.h index 1874e4cfb89..8fe7414f4b9 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.h @@ -67,7 +67,7 @@ class CORE_EXPORT ModuleScriptLoader final bool IsInitialState() const { return state_ == State::kInitial; } bool HasFinished() const { return state_ == State::kFinished; } - void Trace(Visitor*) override; + void Trace(Visitor*) const override; friend class WorkletModuleResponsesMapTest; diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.cc index 9f250d20293..e4b145e195a 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.cc @@ -8,7 +8,7 @@ namespace blink { -void ModuleScriptLoaderRegistry::Trace(Visitor* visitor) { +void ModuleScriptLoaderRegistry::Trace(Visitor* visitor) const { visitor->Trace(active_loaders_); } diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.h b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.h index af8cb737342..1aac234058d 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_registry.h @@ -19,7 +19,7 @@ class CORE_EXPORT ModuleScriptLoaderRegistry final public: ModuleScriptLoaderRegistry() = default; - void Trace(Visitor*); + void Trace(Visitor*) const; private: friend class ModuleScriptLoader; diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc index 27198816336..0f36eea7c4b 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc @@ -53,7 +53,9 @@ class TestModuleScriptLoaderClient final TestModuleScriptLoaderClient() = default; ~TestModuleScriptLoaderClient() override = default; - void Trace(Visitor* visitor) override { visitor->Trace(module_script_); } + void Trace(Visitor* visitor) const override { + visitor->Trace(module_script_); + } void NotifyNewSingleModuleFinished(ModuleScript* module_script) override { was_notify_finished_ = true; @@ -108,14 +110,14 @@ class ModuleScriptLoaderTestModulator final : public DummyModulator { return MakeGarbageCollected<DocumentModuleScriptFetcher>(pass_key); } - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: Member<ScriptState> script_state_; Vector<ModuleRequest> requests_; }; -void ModuleScriptLoaderTestModulator::Trace(Visitor* visitor) { +void ModuleScriptLoaderTestModulator::Trace(Visitor* visitor) const { visitor->Trace(script_state_); DummyModulator::Trace(visitor); } @@ -491,7 +493,8 @@ void ModuleScriptLoaderTest::TestFetchURL( TestModuleScriptLoaderClient* client) { KURL url("https://example.test/module.js"); url_test_helpers::RegisterMockedURLLoad( - url, test::CoreTestDataPath("module.js"), "text/javascript"); + url, test::CoreTestDataPath("module.js"), "text/javascript", + platform_->GetURLLoaderMockFactory()); auto* registry = MakeGarbageCollected<ModuleScriptLoaderRegistry>(); ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url), diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc index 5e710b04a5b..89f8ccd977e 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.cc @@ -87,7 +87,7 @@ ModuleTreeLinker::ModuleTreeLinker( CHECK(client); } -void ModuleTreeLinker::Trace(Visitor* visitor) { +void ModuleTreeLinker::Trace(Visitor* visitor) const { visitor->Trace(fetch_client_settings_object_fetcher_); visitor->Trace(modulator_); visitor->Trace(registry_); diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.h b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.h index c4a664b1987..bd15eda9db5 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker.h @@ -60,7 +60,7 @@ class CORE_EXPORT ModuleTreeLinker final : public SingleModuleClient { ModuleTreeLinkerRegistry*, ModuleTreeClient*); ~ModuleTreeLinker() override = default; - void Trace(Visitor*) override; + void Trace(Visitor*) const override; bool IsFetching() const { return State::kFetchingSelf <= state_ && state_ < State::kFinished; diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.cc index 152aace03c0..86f6f3bde6b 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.cc @@ -11,7 +11,7 @@ namespace blink { -void ModuleTreeLinkerRegistry::Trace(Visitor* visitor) { +void ModuleTreeLinkerRegistry::Trace(Visitor* visitor) const { visitor->Trace(active_tree_linkers_); } diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.h b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.h index 9bfb1121d9e..a5bb392548d 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_registry.h @@ -20,7 +20,7 @@ class CORE_EXPORT ModuleTreeLinkerRegistry final public: ModuleTreeLinkerRegistry() = default; - void Trace(Visitor*); + void Trace(Visitor*) const; const char* NameInHeapSnapshot() const override { return "ModuleTreeLinkerRegistry"; } diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_test.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_test.cc index ce6ccc0ef19..662eefc3890 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_test.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_tree_linker_test.cc @@ -34,7 +34,7 @@ class TestModuleTreeClient final : public ModuleTreeClient { public: TestModuleTreeClient() = default; - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { visitor->Trace(module_script_); ModuleTreeClient::Trace(visitor); } @@ -60,7 +60,7 @@ class ModuleTreeLinkerTestModulator final : public DummyModulator { : script_state_(script_state) {} ~ModuleTreeLinkerTestModulator() override = default; - void Trace(Visitor*) override; + void Trace(Visitor*) const override; enum class ResolveResult { kFailure, kSuccess }; @@ -182,7 +182,7 @@ class ModuleTreeLinkerTestModulator final : public DummyModulator { bool instantiate_should_fail_ = false; }; -void ModuleTreeLinkerTestModulator::Trace(Visitor* visitor) { +void ModuleTreeLinkerTestModulator::Trace(Visitor* visitor) const { visitor->Trace(script_state_); visitor->Trace(pending_clients_); visitor->Trace(module_map_); diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc index 2b00996a03a..54ef8fc78e4 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc @@ -51,7 +51,7 @@ void WorkerModuleScriptFetcher::Fetch( this, ScriptResource::kNoStreaming); } -void WorkerModuleScriptFetcher::Trace(Visitor* visitor) { +void WorkerModuleScriptFetcher::Trace(Visitor* visitor) const { ModuleScriptFetcher::Trace(visitor); visitor->Trace(client_); visitor->Trace(global_scope_); diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.h b/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.h index 9453005523a..7f1d67bbc2e 100644 --- a/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.h +++ b/chromium/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.h @@ -31,7 +31,7 @@ class CORE_EXPORT WorkerModuleScriptFetcher final ModuleGraphLevel, ModuleScriptFetcher::Client*) override; - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: // Implements ResourceClient |