Share X connection between GLSurfaceGLX/EGL and MessagePumpX/GTK

content/gpu/gpu_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 12 matching lines @@
 #include "ui/gfx/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
+#if defined(TOOLKIT_USES_GTK)
+#include "ui/gfx/gtk_util.h"
+#endif
+
 // Main function for starting the Gpu process.
 int GpuMain(const content::MainFunctionParams& parameters) {
   base::Time start_time = base::Time::Now();
 
   const CommandLine& command_line = parameters.command_line;
   if (command_line.HasSwitch(switches::kGpuStartupDialog)) {
     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
+#if defined(TOOLKIT_USES_GTK)
+    gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+#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
   // early return of a child process is implemented using an IPC
   // channel error. If the IPC channel is not fully set up between the
   // browser and GPU process, and the GPU process crashes or exits
   // early, the browser process will never detect it.  For this reason
   // we defer tearing down the GPU process until receiving the
@@ skipping 43 matching lines @@
   child_thread->Init(start_time);
 
   gpu_process.set_main_thread(child_thread);
 
   main_message_loop.Run();
 
   child_thread->StopWatchdog();
 
   return 0;
 }