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) |