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

Unified Diff: content/browser/browser_main_loop.cc

Issue 10806091: Revert 143711 so GPU process launches on browser startup. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/browser/browser_main_loop.cc
===================================================================
--- content/browser/browser_main_loop.cc (revision 147886)
+++ content/browser/browser_main_loop.cc (working copy)
@@ -608,7 +608,22 @@
// Start the GpuDataManager before we set up the MessageLoops because
// otherwise we'll trigger the assertion about doing IO on the UI thread.
- content::GpuDataManager::GetInstance();
+ GpuDataManager* gpu_data_manager = content::GpuDataManager::GetInstance();
+
+ // When running the GPU thread in-process, avoid optimistically starting it
+ // since creating the GPU thread races against creation of the one-and-only
+ // ChildProcess instance which is created by the renderer thread.
+ if (gpu_data_manager->GpuAccessAllowed() &&
+ !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) &&
+ !parsed_command_line_.HasSwitch(switches::kSingleProcess) &&
+ !parsed_command_line_.HasSwitch(switches::kInProcessGPU)) {
+ TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process");
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE, base::Bind(
+ base::IgnoreResult(&GpuProcessHost::Get),
+ GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
+ content::CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP));
+ }
}
void BrowserMainLoop::InitializeToolkit() {
« 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