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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 675423002: ServiceWorker: Fix data race in shutdown sequence (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7677ac58692a1cea119687e28f778c2ee8484364..1b4243db002571c40e7976a3d45e739727c3386f 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -649,11 +649,6 @@ void RenderThreadImpl::Shutdown() {
input_event_filter_ = NULL;
}
- // RemoveEmbeddedWorkerRoute may be called while deleting
- // EmbeddedWorkerDispatcher. So it must be deleted before deleting
- // RenderThreadImpl.
- embedded_worker_dispatcher_.reset();
-
// Ramp down IDB before we ramp down WebKit (and V8), since IDB classes might
// hold pointers to V8 objects (e.g., via pending requests).
main_thread_indexed_db_dispatcher_.reset();
@@ -663,6 +658,11 @@ void RenderThreadImpl::Shutdown() {
if (blink_platform_impl_)
blink::shutdown();
+ // RemoveEmbeddedWorkerRoute may be called while deleting
+ // EmbeddedWorkerDispatcher. So it must be deleted before deleting
+ // RenderThreadImpl.
+ embedded_worker_dispatcher_.reset();
horo 2014/10/27 13:38:25 Could you please write the comments about the race
Kunihiko Sakamoto 2014/10/28 01:12:27 Done.
+
lazy_tls.Pointer()->Set(NULL);
// TODO(port)
« 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