Revert "Refactor MessagePumpX to dispatch events inside of the source Dispatch function."

base/message_pump_x.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_x.h"
 
 #include <X11/extensions/XInput2.h>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 
 namespace {
 
 gboolean XSourcePrepare(GSource* source, gint* timeout_ms) {
   if (XPending(base::MessagePumpX::GetDefaultXDisplay()))
     *timeout_ms = 0;
   else
     *timeout_ms = -1;
   return FALSE;
 }
 
 gboolean XSourceCheck(GSource* source) {
   return XPending(base::MessagePumpX::GetDefaultXDisplay());
 }
 
 gboolean XSourceDispatch(GSource* source,
                          GSourceFunc unused_func,
-                         gpointer data) {
-  base::MessagePumpX* pump = static_cast<base::MessagePumpX*>(data);
-  return pump->DispatchXEvents();
+                         gpointer unused_data) {
+  // TODO(sad): When GTK event proecssing is completely removed, the event
+  // processing and dispatching should be done here (i.e. XNextEvent,
+  // ProcessXEvent etc.)
+  return TRUE;
 }
 
 GSourceFuncs XSourceFuncs = {
   XSourcePrepare,
   XSourceCheck,
   XSourceDispatch,
   NULL
 };
 
 // The opcode used for checking events.
@@ skipping 79 matching lines @@
   DCHECK(!x_source_);
   GPollFD* x_poll = new GPollFD();
   Display* display = GetDefaultXDisplay();
   DCHECK(display) << "Unable to get connection to X server";
   x_poll->fd = ConnectionNumber(display);
   x_poll->events = G_IO_IN;
 
   x_source_ = g_source_new(&XSourceFuncs, sizeof(GSource));
   g_source_add_poll(x_source_, x_poll);
   g_source_set_can_recurse(x_source_, FALSE);
-  g_source_set_callback(x_source_, NULL, this, NULL);
   g_source_attach(x_source_, g_main_context_default());
 }
 
 bool MessagePumpX::ProcessXEvent(MessagePumpDispatcher* dispatcher,
                                  XEvent* xev) {
   bool should_quit = false;
 
   bool have_cookie = false;
   if (xev->type == GenericEvent &&
       XGetEventData(xev->xgeneric.display, &xev->xcookie)) {
@@ skipping 13 matching lines @@
     DidProcessXEvent(xev);
   }
 
   if (have_cookie) {
     XFreeEventData(xev->xgeneric.display, &xev->xcookie);
   }
 
   return should_quit;
 }
 
-gboolean MessagePumpX::DispatchXEvents() {
+bool MessagePumpX::RunOnce(GMainContext* context, bool block) {
   Display* display = GetDefaultXDisplay();
-  DCHECK(display);
   MessagePumpDispatcher* dispatcher =
       GetDispatcher() ? GetDispatcher() : g_default_dispatcher;
 
+  if (!display)
+    return g_main_context_iteration(context, block);
+
   // In the general case, we want to handle all pending events before running
   // the tasks. This is what happens in the message_pump_glib case.
   while (XPending(display)) {
     XEvent xev;
     XNextEvent(display, &xev);
     if (dispatcher && ProcessXEvent(dispatcher, &xev))
-      return TRUE;
+      return true;
   }
-  return TRUE;
+
+  return g_main_context_iteration(context, block);
 }
 
 bool MessagePumpX::WillProcessXEvent(XEvent* xevent) {
   if (!observers().might_have_observers())
     return false;
   ObserverListBase<MessagePumpObserver>::Iterator it(observers());
   MessagePumpObserver* obs;
   while ((obs = it.GetNext()) != NULL) {
     if (obs->WillProcessEvent(xevent))
       return true;
   }
   return false;
 }
 
 void MessagePumpX::DidProcessXEvent(XEvent* xevent) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(xevent));
 }
 
 }  // namespace base