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

Unified Diff: chrome/gpu/gpu_main.cc

Issue 4641003: Fixed regression in order of initialization on Linux in r65461 causing... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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: chrome/gpu/gpu_main.cc
===================================================================
--- chrome/gpu/gpu_main.cc (revision 65570)
+++ chrome/gpu/gpu_main.cc (working copy)
@@ -90,16 +90,19 @@
SetGpuX11ErrorHandlers();
#endif
+ // On Linux the GpuThread constructor performs certain
+ // initialization that is required before accessing the default X
+ // display.
+ GpuProcess gpu_process;
+ GpuThread* gpu_thread = new GpuThread;
+ gpu_process.set_main_thread(gpu_thread);
+
// Load the GL implementation and locate the bindings before starting as
// this can take a lot of time and the GPU watchdog might terminate the GPU
// process.
if (!gfx::GLContext::InitializeOneOff())
return EXIT_FAILURE;
- GpuProcess gpu_process;
- GpuThread* gpu_thread = new GpuThread;
- gpu_process.set_main_thread(gpu_thread);
-
// Only enable this experimental feaure for a subset of users.
scoped_refptr<base::FieldTrial> watchdog_trial(
new base::FieldTrial("GpuWatchdogTrial", 100));
« 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