mustash: Use ui::chromeos::EventRewriter in mus

services/ui/ws/display.cc

 // Copyright 2015 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 "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 246 matching lines @@
       display_manager()->GetAndAdvanceNextRootId(),
       ServerWindow::Properties()));
   root_->set_event_targeting_policy(
       mojom::EventTargetingPolicy::DESCENDANTS_ONLY);
   root_->SetBounds(gfx::Rect(size));
   root_->SetVisible(true);
   focus_controller_ = base::MakeUnique<FocusController>(this, root_.get());
   focus_controller_->AddObserver(this);
 }
 
+bool Display::CanDispatchToTarget(EventTarget* target) {
+  NOTREACHED();
+  return true;
+}
+
+ui::EventTarget* Display::GetRootForEvent(ui::Event* event) {
+  NOTREACHED();
+  return nullptr;
+}
+
+ui::EventTargeter* Display::GetDefaultEventTargeter() {
+  NOTREACHED();

[sadrul, 2017/02/24 15:59:54]

These should have proper implementations.

[Peng, 2017/02/28 16:47:30]

I did little research and found out it is not easy to use ui::EventTarget and
ui::EventTargeter to do the targeting in mus. (Becasus mus handles event
asynchronously, but ui::EventTarget and ui::EventTargeter don't support it).
Talked offline with sadrul, we decide to only use ui::EventSource for now, and
may revisit later.

[sky, 2017/02/28 17:54:26]

It feels a bit hacky to try to use parts of event without the others. My
understanding is you want to do this change to use EventRewriters. Is there
another way to plumb in the rewriter that doesn't require making the display a
ui::EventProcessor?

[Peng, 2017/02/28 18:14:29]

We can let PlatformDisplayDefault to implement the ui::EventProcessor or add a
new class PlatformDisplayDefaultEventProcessor which implements
ui::EventProcessor. WDYT?

+  return nullptr;
+}
+
+ui::EventDispatchDetails Display::OnEventFromSource(Event* event) {
+  WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
+  if (display_root)
+    display_root->window_manager_state()->ProcessEvent(*event, GetId());
+  window_server_
+      ->GetUserActivityMonitorForUser(
+          window_server_->user_id_tracker()->active_id())
+      ->OnUserActivity();
+  return ui::EventDispatchDetails();
+}
+
 display::Display Display::GetDisplay() {
   return ToDisplay();
 }
 
 ServerWindow* Display::GetRootWindow() {
   return root_.get();
 }
 
+ui::EventProcessor* Display::GetEventProcessor() {
+  return this;
+}
+
 void Display::OnAcceleratedWidgetAvailable() {
   display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
   InitWindowManagerDisplayRoots();
 }
 
 bool Display::IsInHighContrastMode() {
   return window_server_->IsActiveUserInHighContrastMode();
 }
 
-void Display::OnEvent(const ui::Event& event) {
-  WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
-  if (display_root)
-    display_root->window_manager_state()->ProcessEvent(event, GetId());
-  window_server_
-      ->GetUserActivityMonitorForUser(
-          window_server_->user_id_tracker()->active_id())
-      ->OnUserActivity();
-}
-
 void Display::OnNativeCaptureLost() {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
   if (display_root)
     display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId);
 }
 
 void Display::OnViewportMetricsChanged(
     const display::ViewportMetrics& metrics) {
   if (root_->bounds().size() == metrics.pixel_size)
     return;
@@ skipping 89 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui