Commit 1500663f authored by Nate Chapin's avatar Nate Chapin Committed by Commit Bot

Avoid using TasksWerePaused/TasksWereUnpaused in WorkerGlobalScope

These callbacks are going away.

Bug: 1029822
Change-Id: I6871110447bfd6e7e90a059108dc8ef52b10d2d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948493
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Nate Chapin <japhet@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721259}
parent 7598e87a
......@@ -476,16 +476,10 @@ void WorkerOrWorkletGlobalScope::FetchModuleScript(
destination, options, custom_fetch_type, client);
}
void WorkerOrWorkletGlobalScope::TasksWerePaused() {
ExecutionContext::TasksWerePaused();
void WorkerOrWorkletGlobalScope::SetDefersLoadingForResourceFetchers(
bool defers) {
for (ResourceFetcher* resource_fetcher : resource_fetchers_)
resource_fetcher->SetDefersLoading(true);
}
void WorkerOrWorkletGlobalScope::TasksWereUnpaused() {
ExecutionContext::TasksWereUnpaused();
for (ResourceFetcher* resource_fetcher : resource_fetchers_)
resource_fetcher->SetDefersLoading(false);
resource_fetcher->SetDefersLoading(defers);
}
void WorkerOrWorkletGlobalScope::Trace(blink::Visitor* visitor) {
......
......@@ -151,6 +151,8 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public EventTargetWithInlineData,
void ApplySandboxFlags(SandboxFlags mask);
void SetDefersLoadingForResourceFetchers(bool defers);
protected:
// Sets outside's CSP used for off-main-thread top-level worker script
// fetch.
......@@ -168,9 +170,6 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public EventTargetWithInlineData,
ModuleScriptCustomFetchType,
ModuleTreeClient*);
void TasksWerePaused() override;
void TasksWereUnpaused() override;
const Vector<CSPHeaderAndType>& OutsideContentSecurityPolicyHeaders() const {
return outside_content_security_policy_headers_;
}
......
......@@ -802,6 +802,7 @@ void WorkerThread::PauseOrFreezeOnWorkerThread(
state == mojom::FrameLifecycleState::kPaused);
pause_or_freeze_count_++;
GlobalScope()->SetLifecycleState(state);
GlobalScope()->SetDefersLoadingForResourceFetchers(true);
// If already paused return early.
if (pause_or_freeze_count_ > 1)
......@@ -820,6 +821,7 @@ void WorkerThread::PauseOrFreezeOnWorkerThread(
&nested_runner_, nested_runner.get());
nested_runner->Run();
}
GlobalScope()->SetDefersLoadingForResourceFetchers(false);
GlobalScope()->SetLifecycleState(mojom::FrameLifecycleState::kRunning);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment