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

Unified Diff: Source/web/WebKit.cpp

Issue 598903002: blink::shutdown() should not touch a message loop (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebKit.cpp
diff --git a/Source/web/WebKit.cpp b/Source/web/WebKit.cpp
index 115b9574ed6922873d187687acef7401b507f8de..b29de6b6a3f9622346a4453a2f4415126e799eae 100644
--- a/Source/web/WebKit.cpp
+++ b/Source/web/WebKit.cpp
@@ -181,8 +181,9 @@ void shutdown()
{
// currentThread will always be non-null in production, but can be null in Chromium unit tests.
if (Platform::current()->currentThread()) {
- ASSERT(s_endOfTaskRunner);
- Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskRunner);
+ // We don't need to (cannot) remove s_endOfTaskRunner from the current
+ // message loop, because the message loop is already destructed before
+ // the shutdown() is called.
delete s_endOfTaskRunner;
s_endOfTaskRunner = 0;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698