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

ui/views/widget/desktop_aura/desktop_screen_x11.cc

 // Copyright (c) 2012 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/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
 #undef RootWindow
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/display/x11/edid_parser_x11.h"
+#include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace {
 
@@ skipping 98 matching lines @@
   int randr_version_minor = 0;
   has_xrandr_ = XRRQueryVersion(
         xdisplay_, &randr_version_major, &randr_version_minor) &&
       randr_version_major == 1 &&
       randr_version_minor >= 3;
 
   if (has_xrandr_) {
     int error_base_ignored = 0;
     XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
 
-    base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
+    if (ui::PlatformEventSource::GetInstance())
+      ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
     XRRSelectInput(xdisplay_,
                    x_root_window_,
                    RRScreenChangeNotifyMask | RROutputChangeNotifyMask);
 
     displays_ = BuildDisplaysFromXRandRInfo();
   } else {
     displays_ = GetFallbackDisplayList();
   }
 }
 
 DesktopScreenX11::~DesktopScreenX11() {
-  if (has_xrandr_)
-    base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
+  if (has_xrandr_ && ui::PlatformEventSource::GetInstance())
+    ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 }
 
 void DesktopScreenX11::ProcessDisplayChange(
     const std::vector<gfx::Display>& incoming) {
   std::vector<gfx::Display> old_displays = displays_;
   displays_ = incoming;
 
   typedef std::vector<gfx::Display>::const_iterator DisplayIt;
   std::vector<gfx::Display>::const_iterator old_it = old_displays.begin();
   for (; old_it != old_displays.end(); ++old_it) {
@@ skipping 136 matching lines @@
 }
 
 void DesktopScreenX11::AddObserver(gfx::DisplayObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void DesktopScreenX11::RemoveObserver(gfx::DisplayObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-uint32_t DesktopScreenX11::Dispatch(const base::NativeEvent& event) {
+bool DesktopScreenX11::CanDispatchEvent(const ui::PlatformEvent& event) {
+  return event->type - xrandr_event_base_ == RRScreenChangeNotify ||
+         event->type - xrandr_event_base_ == RRNotify;
+}
+
+uint32_t DesktopScreenX11::DispatchEvent(const ui::PlatformEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     // Pass the event through to xlib.
     XRRUpdateConfiguration(event);
   } else if (event->type - xrandr_event_base_ == RRNotify) {
     // There's some sort of observer dispatch going on here, but I don't think
     // it's the screen's?
     if (configure_timer_.get() && configure_timer_->IsRunning()) {
       configure_timer_->Reset();
     } else {
       configure_timer_.reset(new base::OneShotTimer<DesktopScreenX11>());
       configure_timer_->Start(
           FROM_HERE,
           base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
           this,
           &DesktopScreenX11::ConfigureTimerFired);
     }
+  } else {
+    NOTREACHED();
   }
 
-  return POST_DISPATCH_NONE;
+  return ui::POST_DISPATCH_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, private:
 
 DesktopScreenX11::DesktopScreenX11(
     const std::vector<gfx::Display>& test_displays)
     : xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       has_xrandr_(false),
@@ skipping 85 matching lines @@
   ProcessDisplayChange(new_displays);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views