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

Unified Diff: content/gpu/gpu_main.cc

Issue 7792078: Preload D3DX DLLs before ANGLE is loaded. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | ui/gfx/gl/gl_implementation_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
===================================================================
--- content/gpu/gpu_main.cc (revision 99168)
+++ content/gpu/gpu_main.cc (working copy)
@@ -41,6 +41,19 @@
ChildProcess::WaitForDebugger("Gpu");
}
+ if (!command_line.HasSwitch(switches::kSingleProcess)) {
+#if defined(OS_WIN)
+ // Prevent Windows from displaying a modal dialog on failures like not being
+ // able to load a DLL.
+ SetErrorMode(
+ SEM_FAILCRITICALERRORS |
+ SEM_NOGPFAULTERRORBOX |
+ SEM_NOOPENFILEERRORBOX);
+#elif defined(USE_X11)
+ ui::SetDefaultX11ErrorHandlers();
+#endif
+ }
+
// Initialization of the OpenGL bindings may fail, in which case we
// will need to tear down this process. However, we can not do so
// safely until the IPC channel is set up, because the detection of
@@ -92,19 +105,6 @@
MessageLoop main_message_loop(message_loop_type);
base::PlatformThread::SetName("CrGpuMain");
- if (!command_line.HasSwitch(switches::kSingleProcess)) {
-#if defined(OS_WIN)
- // Prevent Windows from displaying a modal dialog on failures like not being
- // able to load a DLL.
- SetErrorMode(
- SEM_FAILCRITICALERRORS |
- SEM_NOGPFAULTERRORBOX |
- SEM_NOOPENFILEERRORBOX);
-#elif defined(USE_X11)
- ui::SetDefaultX11ErrorHandlers();
-#endif
- }
-
GpuProcess gpu_process;
GpuChildThread* child_thread = new GpuChildThread(dead_on_arrival);
« no previous file with comments | « no previous file | ui/gfx/gl/gl_implementation_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698