Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

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

Issue 1111693003: Remove the concept of a cleanup task (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Potential shutdown sequence with some debug logging. Created 5 years, 8 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
Index: Source/core/workers/WorkerGlobalScope.cpp
diff --git a/Source/core/workers/WorkerGlobalScope.cpp b/Source/core/workers/WorkerGlobalScope.cpp
index 48280c3525443f8add1f77792d20956b4acefca2..27adbf039cbba9b6b4c64d230e147aae49b07659 100644
--- a/Source/core/workers/WorkerGlobalScope.cpp
+++ b/Source/core/workers/WorkerGlobalScope.cpp
@@ -68,23 +68,6 @@
namespace blink {
-class CloseWorkerGlobalScopeTask : public ExecutionContextTask {
-public:
- static PassOwnPtr<CloseWorkerGlobalScopeTask> create()
- {
- return adoptPtr(new CloseWorkerGlobalScopeTask);
- }
-
- virtual void performTask(ExecutionContext *context)
- {
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
- // Notify parent that this context is closed. Parent is responsible for calling WorkerThread::stop().
- workerGlobalScope->thread()->workerReportingProxy().workerGlobalScopeClosed();
- }
-
- virtual bool isCleanupTask() const { return true; }
-};
-
WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
: m_url(url)
, m_userAgent(userAgent)
@@ -176,14 +159,8 @@ WorkerLocation* WorkerGlobalScope::location() const
void WorkerGlobalScope::close()
{
- if (m_closing)
- return;
-
- // Let current script run to completion but prevent future script evaluations.
- // After m_closing is set, all the tasks in the queue continue to be fetched but only
- // tasks with isCleanupTask()==true will be executed.
+ // Let current script run to completion, but tell the worker thread to shut down after the script exits.
m_closing = true;
- postTask(FROM_HERE, CloseWorkerGlobalScopeTask::create());
}
WorkerConsole* WorkerGlobalScope::console()

Powered by Google App Engine
This is Rietveld 408576698