Final(?) eradications of GDK / GTK from the GPU process.

base/message_pump_gtk.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 "base/message_pump_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include "base/profiler/scoped_profile.h"
@@ skipping 68 matching lines @@
   MessagePumpDispatcher* dispatcher = GetDispatcher();
   if (!dispatcher)
     gtk_main_do_event(event);
   else if (!dispatcher->Dispatch(event))
     Quit();
 
   DidProcessEvent(event);
 }
 
 // static
 Display* MessagePumpGtk::GetDefaultXDisplay() {

[darin (slow to review), 2012/04/23 16:52:57]

why do we need to involve a class named *Gtk in code that should never be using
GTK?  can you say more about why this change is needed?

   static GdkDisplay* display = gdk_display_get_default();
-  return display ? GDK_DISPLAY_XDISPLAY(display) : NULL;
+  if (!display) {
+    // GTK / GDK has not been initialized, which is a decision we wish to
+    // support, for example for the GPU process.
+    static Display* xdisplay = XOpenDisplay(NULL);
+    return xdisplay;
+  }
+  return GDK_DISPLAY_XDISPLAY(display);
 }
 
 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event));
 }
 
 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event));
 }
 
 // static
 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) {
   MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data);
   message_pump->DispatchEvents(event);
 }
 
 }  // namespace base