third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp - Issue 2124693002: Worker: Fix broken GC logic on Dedicated Worker while DOMTimer is set

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

Issue 2124693002: Worker: Fix broken GC logic on Dedicated Worker while DOMTimer is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: annotate WorkerGlobalScope interface with 'ActiveScriptWrappable' and make tests stricter Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/workers/InProcessWorkerObjectProxy.cpp ('K') | « third_party/WebKit/Source/core/workers/WorkerGlobalScope.h ('k') | third_party/WebKit/Source/core/workers/WorkerGlobalScope.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

index 4d5192dabb97c756d37fedda027bdfc2185acf18..ece0725351f377c948d311295949c44635fcac15 100644

--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

@@ -235,6 +235,11 @@ v8::Local<v8::Object> WorkerGlobalScope::associateWithWrapper(v8::Isolate*, cons

return v8::Local<v8::Object>();

}

+bool WorkerGlobalScope::hasPendingActivity() const

+ return m_timers.hasInstalledTimeout();

bool WorkerGlobalScope::isJSExecutionForbidden() const

{

return m_scriptController->isExecutionForbidden();

@@ -287,7 +292,8 @@ ExecutionContext* WorkerGlobalScope::getExecutionContext() const

}

WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, std::unique_ptr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, WorkerClients* workerClients)

- : m_url(url)

+ : ActiveScriptWrappable(this)

+ , m_url(url)

, m_userAgent(userAgent)

, m_v8CacheOptions(V8CacheOptionsDefault)

, m_scriptController(WorkerOrWorkletScriptController::create(this, thread->isolate()))