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

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

Issue 203393002: Revert of Explicit notification and removal of lifecycle observers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.cpp ('k') | Source/platform/LifecycleNotifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/workers/WorkerThread.cpp
diff --git a/Source/core/workers/WorkerThread.cpp b/Source/core/workers/WorkerThread.cpp
index 9a4286b12bfd6006e7346105ca4927f3c26cc772..c60511544ab3c579e55ce404dcde5ef77705a1b8 100644
--- a/Source/core/workers/WorkerThread.cpp
+++ b/Source/core/workers/WorkerThread.cpp
@@ -135,31 +135,23 @@
ThreadIdentifier threadID = m_threadID;
-#if !ENABLE(OILPAN)
+ // The below assignment will destroy the context, which will in turn notify messaging proxy.
+ // We cannot let any objects survive past thread exit, because no other thread will run GC or otherwise destroy them.
+ // If Oilpan is enabled, we detach of the context/global scope, with the final heap cleanup below sweeping it out.
+#if ENABLE(OILPAN)
+ m_workerGlobalScope->dispose();
+#else
ASSERT(m_workerGlobalScope->hasOneRef());
#endif
- // Dispose of the WorkerGlobalScope and its context. If Oilpan is not enabled, clearing
- // m_workerGlobalScope synchronously destructs the object. If Oilpan is enabled,
- // that finalization will instead happen when a final GC is run below during
- // ThreadState::detach().
- m_workerGlobalScope->dispose();
m_workerGlobalScope = nullptr;
- // Notify the proxy that the WorkerGlobalScope has been disposed of.
- // This can free this thread object, hence it must not be touched afterwards.
- workerReportingProxy().workerGlobalScopeDestroyed();
+ ThreadState::detach();
// Clean up PlatformThreadData before WTF::WTFThreadData goes away!
PlatformThreadData::current().destroy();
// The thread object may be already destroyed from notification now, don't try to access "this".
detachThread(threadID);
-
- // And, finally, detach the ThreadState, cleaning out the thread's
- // heap by performing a final GC. The cleanup operation will at
- // the end assert that the heap is empty, as any surviving objects
- // will otherwise leak and never be destructed.
- ThreadState::detach();
}
void WorkerThread::runEventLoop()
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.cpp ('k') | Source/platform/LifecycleNotifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698