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 b37771cc3fa49eb7e1a354429d7ac31ef27ba9fe..ef332db50b728d9362652e88080d27c77768ea07 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,17 @@ 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_) {
+    delegate_->OnPointerWatcherEvent(*ConvertEventToPointerEvent(event.get()),
+                                     window);
+  }
 
   if (!window || !window->input_event_handler_) {
     tree_->OnWindowInputEventAck(event_id, mojom::EventResult::UNHANDLED);
@@ -1011,11 +1013,12 @@ 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_)
+    delegate_->OnPointerWatcherEvent(*ConvertEventToPointerEvent(event.get()),
+                                     nullptr /* target */);
 }
 
 void WindowTreeClient::OnWindowFocused(Id focused_window_id) {
@@ -1256,4 +1259,16 @@ void WindowTreeClient::SetUnderlaySurfaceOffsetAndExtendedHitArea(
   }
 }
 
+ui::PointerEvent* WindowTreeClient::ConvertEventToPointerEvent(

[James Cook, 2016/07/27 23:21:21]

This function leaks memory for every event matched by a PointerWatcher.

One approach to fix this would be to make this function
OnPointerWatcherEventImpl(), and call delegate_ here, similar to how
OnWindowInputEvent() handles its event type conversions on line 999.

There are probably other ways to fix it, but it would be nice to avoid heap
allocations if possible.

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

Moved it back since it's back to a one-liner.

+    ui::Event* event) {
+  ui::PointerEvent* pointer_event = nullptr;
+  if (event->IsTouchEvent())
+    pointer_event = new ui::PointerEvent(*event->AsTouchEvent());
+  else if (event->IsMouseEvent())
+    pointer_event = new ui::PointerEvent(*event->AsMouseEvent());
+  else
+    pointer_event = new ui::PointerEvent(*event->AsPointerEvent());
+  return pointer_event;
+}
+
 }  // namespace ui