Add PlatformWindow/Event related code for Ozone X11.

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 <X11/extensions/XInput2.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ skipping 76 matching lines @@
 }
 
 // static
 X11EventSource* X11EventSource::GetInstance() {
   return static_cast<X11EventSource*>(PlatformEventSource::GetInstance());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // X11EventSource, public
 
+void X11EventSource::AddXEventDispatcher(XEventDispatcher* dispatcher) {
+  CHECK(dispatcher);

[spang, 2016/01/26 21:37:40]

CHECK is not allowed except for security-critical assertions. Use DCHECK or no
check.

[kylechar, 2016/01/27 15:39:26]

Done.

+  x_dispatchers_.AddObserver(dispatcher);
+}
+
+void X11EventSource::RemoveXEventDispatcher(XEventDispatcher* dispatcher) {
+  x_dispatchers_.RemoveObserver(dispatcher);
+}
+
 void X11EventSource::DispatchXEvents() {
   DCHECK(display_);
   // Handle all pending events.
   // It may be useful to eventually align this event dispatch with vsync, but
   // not yet.
   continue_stream_ = true;
   while (XPending(display_) && continue_stream_) {
     XEvent xevent;
     XNextEvent(display_, &xevent);
     ExtractCookieDataDispatchEvent(&xevent);
@@ skipping 18 matching lines @@
   if (xevent->type == GenericEvent &&
       XGetEventData(xevent->xgeneric.display, &xevent->xcookie)) {
     have_cookie = true;
   }
   uint32_t action = DispatchEvent(xevent);
   if (have_cookie)
     XFreeEventData(xevent->xgeneric.display, &xevent->xcookie);
   return action;
 }
 
-uint32_t X11EventSource::DispatchEvent(XEvent* xevent) {
-  uint32_t action = PlatformEventSource::DispatchEvent(xevent);
+void X11EventSource::DispatchXEventToXEventDispatchers(XEvent* xevent) {
+  if (x_dispatchers_.might_have_observers()) {
+    base::ObserverList<XEventDispatcher>::Iterator iter(&x_dispatchers_);
+    while (XEventDispatcher* dispatcher = iter.GetNext()) {
+      if (dispatcher->DispatchXEvent(*xevent))
+        break;

[spang, 2016/01/26 21:37:40]

If DispatchXEvent returns true, do we still try to turn it into a PlatformEvent?
We probably shouldn't.

[kylechar, 2016/01/27 15:39:26]

It doesn't right now because it actually happens in the opposite order, only if
we can't turn it into a PlatfromEvent(ui::Event) then we try to dispatch it as
an XEvent. If I invert the order I'll ensure that doesn't happen.

+    }
+  }
+}
+
+void X11EventSource::PostDispatchEvent(XEvent* xevent) {
   if (xevent->type == GenericEvent &&
       (xevent->xgeneric.evtype == XI_HierarchyChanged ||
        xevent->xgeneric.evtype == XI_DeviceChanged)) {
     ui::UpdateDeviceList();
     hotplug_event_handler_->OnHotplugEvent();
   }
 
   if (xevent->type == EnterNotify &&
       xevent->xcrossing.detail != NotifyInferior &&
       xevent->xcrossing.mode != NotifyUngrab) {
     // Clear stored scroll data
     ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses();
   }
-  return action;
 }
 
 void X11EventSource::StopCurrentEventStream() {
   continue_stream_ = false;
 }
 
 void X11EventSource::OnDispatcherListChanged() {
   if (!hotplug_event_handler_) {
     hotplug_event_handler_.reset(new X11HotplugEventHandler());
     // Force the initial device query to have an update list of active devices.
     hotplug_event_handler_->OnHotplugEvent();
   }
 }
 
 }  // namespace ui