Chromium Code Reviews| Index: Source/web/WebKit.cpp |
| diff --git a/Source/web/WebKit.cpp b/Source/web/WebKit.cpp |
| index 115b9574ed6922873d187687acef7401b507f8de..8b7e9f8566321a53ef20d95bfe5a3b4d4dd83e4c 100644 |
| --- a/Source/web/WebKit.cpp |
| +++ b/Source/web/WebKit.cpp |
| @@ -182,7 +182,10 @@ 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); |
|
jamesr
2014/09/25 06:52:16
this ASSERT() isn't needed any more. delete NULL
haraken
2014/09/25 06:53:23
Done.
|
| - 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. |
| + // Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskRunner); |
|
jamesr
2014/09/25 06:52:16
having commented out code is not useful - just del
haraken
2014/09/25 06:53:23
Done.
|
| delete s_endOfTaskRunner; |
| s_endOfTaskRunner = 0; |
| } |