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

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 2013 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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/platform/platform_event_dispatcher.h"
+#include "ui/events/platform/platform_event_source.h"
+#include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace views {
 
 const int64 kFirstDisplay = 5321829;
 const int64 kSecondDisplay = 928310;
 
 // Class which waits till the X11 window associated with the widget passed into
 // the constructor is activated. We cannot listen for the widget's activation
 // because the _NET_ACTIVE_WINDOW property is changed after the widget is
 // activated.
-class ActivationWaiter : public base::MessagePumpDispatcher {
+class ActivationWaiter : public ui::PlatformEventDispatcher {
  public:
   explicit ActivationWaiter(views::Widget* widget)
       : x_root_window_(DefaultRootWindow(gfx::GetXDisplay())),
         widget_xid_(0),
         active_(false) {
     const char* kAtomToCache[] = {
         "_NET_ACTIVE_WINDOW",
         NULL
     };
     atom_cache_.reset(new ui::X11AtomCache(gfx::GetXDisplay(), kAtomToCache));
     widget_xid_ = widget->GetNativeWindow()->GetHost()->
          GetAcceleratedWidget();
-    base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
+    ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
   }
 
   virtual ~ActivationWaiter() {
-    base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
+    ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
   }
 
   // Blocks till |widget_xid_| becomes active.
   void Wait() {
     if (active_)
       return;
     base::RunLoop run_loop;
     quit_closure_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
-  virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE {
+  // ui::PlatformEventDispatcher:
+  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE {
+    return event->type == PropertyNotify &&
+           event->xproperty.window == x_root_window_;
+  }
+
+  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE {
     ::Window xid;
-    if (event->type == PropertyNotify &&
-        event->xproperty.window == x_root_window_ &&
-        event->xproperty.atom == atom_cache_->GetAtom("_NET_ACTIVE_WINDOW") &&
+    CHECK_EQ(PropertyNotify, event->type);
+    CHECK_EQ(x_root_window_, event->xproperty.window);
+
+    if (event->xproperty.atom == atom_cache_->GetAtom("_NET_ACTIVE_WINDOW") &&
         ui::GetXIDProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &xid) &&
         xid == widget_xid_) {
       active_ = true;
       if (!quit_closure_.is_null())
         quit_closure_.Run();
     }
-    return POST_DISPATCH_NONE;
+    return ui::POST_DISPATCH_NONE;
   }
 
  private:
   scoped_ptr<ui::X11AtomCache> atom_cache_;
   ::Window x_root_window_;
   ::Window widget_xid_;
 
   bool active_;
   base::Closure quit_closure_;
 
@@ skipping 177 matching lines @@
                                   gfx::Rect(640, 0, 1024, 768)));
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 640, 480)));
   screen()->ProcessDisplayChange(displays);
 
   // The first display in the list is always the primary, even if other
   // displays are to the left in screen layout.
   EXPECT_EQ(kFirstDisplay, screen()->GetPrimaryDisplay().id());
 }
 
 TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
+  ui::X11EventSource x11_source(gfx::GetXDisplay());
   Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(110, 110, 10, 10));
   Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(150, 150, 10, 10));
   Widget* window_three =
       BuildTopLevelDesktopWidget(gfx::Rect(115, 115, 20, 20));
 
   window_three->Show();
   window_two->Show();
   window_one->Show();
 
   // Make sure the internal state of DesktopWindowTreeHostX11 is set up
@@ skipping 37 matching lines @@
       screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
   EXPECT_EQ(
       kSecondDisplay,
       screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id());
 
   window_one->CloseNow();
   window_two->CloseNow();
 }
 
 }  // namespace views