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

Unified Diff: content/browser/browser_main_loop.cc

Issue 11886005: Fix GpuChannelHost destruction races. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stupid ios Created 7 years, 11 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index e7faa9ef0089bfadd1e5ebf9edd41cfa95ec8132..87059036956215f2f7f6960fa3f4a5b54748668d 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -513,7 +513,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
#if defined(USE_AURA)
ImageTransportFactory::Terminate();
#endif
- BrowserGpuChannelHostFactory::Terminate();
// The device monitors are using |system_monitor_| as dependency, so delete
// them before |system_monitor_| goes away.
@@ -618,6 +617,10 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
BrowserThreadImpl::ShutdownThreadPool();
#if !defined(OS_IOS)
+ // Must happen after the IO thread is shutdown since this may be accessed from
+ // it.
+ BrowserGpuChannelHostFactory::Terminate();
+
// Must happen after the I/O thread is shutdown since this class lives on the
// I/O thread and isn't threadsafe.
GamepadService::GetInstance()->Terminate();

Powered by Google App Engine
This is Rietveld 408576698