mus: Change PointerWatcher to observe all pointer events, with moves optional.

services/ui/public/cpp/lib/window_tree_client.cc

Index: services/ui/public/cpp/lib/window_tree_client.cc
diff --git a/services/ui/public/cpp/lib/window_tree_client.cc b/services/ui/public/cpp/lib/window_tree_client.cc
index 1cfdf74f62889c6a754ac3cd1a9c368df6db0fd7..c6207ba764387e40aa33de14fb22e5dd54d09114 100644
--- a/services/ui/public/cpp/lib/window_tree_client.cc
+++ b/services/ui/public/cpp/lib/window_tree_client.cc
@@ -626,15 +626,15 @@ gfx::Point WindowTreeClient::GetCursorScreenPoint() {
                     static_cast<int16_t>(location & 0xFFFF));
 }
 
-void WindowTreeClient::SetEventObserver(mojom::EventMatcherPtr matcher) {
-  if (matcher.is_null()) {
-    has_event_observer_ = false;
-    tree_->SetEventObserver(nullptr, 0u);
-  } else {
-    has_event_observer_ = true;
-    event_observer_id_++;
-    tree_->SetEventObserver(std::move(matcher), event_observer_id_);
-  }
+void WindowTreeClient::StartPointerWatcher(bool want_moves) {
+  has_pointer_watcher_ = true;
+  pointer_watcher_id_++;
+  tree_->StartPointerWatcher(want_moves, pointer_watcher_id_);
+}
+
+void WindowTreeClient::StopPointerWatcher() {
+  tree_->StopPointerWatcher();
+  has_pointer_watcher_ = false;
 }
 
 void WindowTreeClient::PerformWindowMove(
@@ -972,15 +972,16 @@ void WindowTreeClient::OnWindowSharedPropertyChanged(
 void WindowTreeClient::OnWindowInputEvent(uint32_t event_id,
                                           Id window_id,
                                           std::unique_ptr<ui::Event> event,
-                                          uint32_t event_observer_id) {
+                                          uint32_t pointer_watcher_id) {
   DCHECK(event);
   Window* window = GetWindowByServerId(window_id);  // May be null.
 
-  // Non-zero event_observer_id means it matched an event observer on the
+  // Non-zero pointer_watcher_id means it matched a pointer watcher on the
   // server.
-  if (event_observer_id != 0 && has_event_observer_ &&
-      event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), window);
+  if (pointer_watcher_id_ != 0 && has_pointer_watcher_ &&
+      pointer_watcher_id == pointer_watcher_id_) {
+    OnPointerWatcherEventImpl(*event.get(), window);
+  }
 
   if (!window || !window->input_event_handler_) {
     tree_->OnWindowInputEventAck(event_id, mojom::EventResult::UNHANDLED);
@@ -1011,11 +1012,11 @@ void WindowTreeClient::OnWindowInputEvent(uint32_t event_id,
     ack_callback->Run(mojom::EventResult::UNHANDLED);
 }
 
-void WindowTreeClient::OnEventObserved(std::unique_ptr<ui::Event> event,
-                                       uint32_t event_observer_id) {
+void WindowTreeClient::OnPointerWatcherEvent(std::unique_ptr<ui::Event> event,
+                                             uint32_t pointer_watcher_id) {
   DCHECK(event);
-  if (has_event_observer_ && event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), nullptr /* target */);
+  if (has_pointer_watcher_ && pointer_watcher_id == pointer_watcher_id_)
+    OnPointerWatcherEventImpl(*event.get(), nullptr /* target */);
 }
 
 void WindowTreeClient::OnWindowFocused(Id focused_window_id) {
@@ -1256,4 +1257,18 @@ void WindowTreeClient::SetUnderlaySurfaceOffsetAndExtendedHitArea(
   }
 }
 
+void WindowTreeClient::OnPointerWatcherEventImpl(const ui::Event& event,
+                                                 Window* target) {
+  if (event.IsTouchEvent()) {
+    delegate_->OnPointerWatcherEvent(ui::PointerEvent(*event.AsTouchEvent()),
+                                     target);
+  } else if (event.IsMouseEvent()) {
+    delegate_->OnPointerWatcherEvent(ui::PointerEvent(*event.AsMouseEvent()),
+                                     target);
+  } else {
+    delegate_->OnPointerWatcherEvent(ui::PointerEvent(*event.AsPointerEvent()),
+                                     target);
+  }

[sadrul, 2016/07/29 20:26:10]

It doesn't look like we should get a Mouse or a Touch event here. Can you
DCHECK() instead that we are not getting those?

[sadrul, 2016/08/02 16:13:51]

if (event.IsPointerEvent()) {
} else {
  DCHECK(!mouse && !touch);
}

[riajiang, 2016/08/02 19:59:53]

Added DCHECK and moved this back to OnWindowInputEvent and OnPointerWatcherEvent
since it's back to a one-liner?

+}
+
 }  // namespace ui