x11: Move X event handling out of the message-pump.

ui/events/platform/x11/x11_event_source.cc

 // Copyright 2014 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 "ui/events/platform/x11/x11_event_source.h"
 
 #include <glib.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
 struct GLibX11Source : public GSource {
   // Note: The GLibX11Source is created and destroyed by GLib. So its
   // constructor/destructor may or may not get called.
   XDisplay* display;
   GPollFD* poll_fd;
@@ skipping 159 matching lines @@
   g_source_set_callback(x_source_, NULL, this, NULL);
   g_source_attach(x_source_, g_main_context_default());
 }
 
 uint32_t X11EventSource::DispatchEvent(XEvent* xevent) {
   bool have_cookie = false;
   if (xevent->type == GenericEvent &&
       XGetEventData(xevent->xgeneric.display, &xevent->xcookie)) {
     have_cookie = true;
   }
-  int action = PlatformEventSource::DispatchEvent(xevent);
+
+  // TODO(sad): Remove this once all MessagePumpObservers are turned into
+  // PlatformEventObservers.
+  uint32_t action = ui::POST_DISPATCH_NONE;
+  if (!base::MessagePumpX11::Current()->WillProcessXEvent(xevent)) {
+    action = PlatformEventSource::DispatchEvent(xevent);
+    base::MessagePumpX11::Current()->DidProcessXEvent(xevent);
+  }
+
   if (have_cookie)
     XFreeEventData(xevent->xgeneric.display, &xevent->xcookie);
   return action;
 }
 
+scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() {
+  return scoped_ptr<PlatformEventSource>(
+      new X11EventSource(gfx::GetXDisplay()));
+}
+
 }  // namespace ui