mus: Add watcher for all touch events.

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

 // Copyright 2014 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/public/cpp/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 609 matching lines @@
   // We raced initialization. Return (0, 0).
   if (!cursor_location_memory())
     return gfx::Point();
 
   base::subtle::Atomic32 location =
       base::subtle::NoBarrier_Load(cursor_location_memory());
   return gfx::Point(static_cast<int16_t>(location >> 16),
                     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;
+uint32_t WindowTreeClient::AddEventObserver(mojom::EventMatcherPtr matcher) {
+  if (!matcher.is_null()) {
     event_observer_id_++;
-    tree_->SetEventObserver(std::move(matcher), event_observer_id_);
+    tree_->AddEventObserver(std::move(matcher), event_observer_id_);
+    event_observer_ids_.push_back(event_observer_id_);
+    return event_observer_id_;
+  }
+  return 0u;
+}
+
+void WindowTreeClient::RemoveEventObserver(uint32_t event_observer_id) {
+  std::vector<uint32_t>::iterator it;
+  it = find(event_observer_ids_.begin(), event_observer_ids_.end(),
+    event_observer_id);
+  if (it != event_observer_ids_.end()) {
+    event_observer_ids_.erase(it);
+    tree_->RemoveEventObserver(event_observer_id);
   }
 }
 
 void WindowTreeClient::PerformWindowMove(
     Window* window,
     ui::mojom::MoveLoopSource source,
     const gfx::Point& cursor_location,
     const base::Callback<void(bool)>& callback) {
   DCHECK(on_current_move_finished_.is_null());
   on_current_move_finished_ = callback;
@@ skipping 309 matching lines @@
   if (!window)
     return;
 
   InFlightPropertyChange new_change(window, name, new_data);
   if (ApplyServerChangeToExistingInFlightChange(new_change))
     return;
 
   WindowPrivate(window).LocalSetSharedProperty(name, std::move(new_data));
 }
 
-void WindowTreeClient::OnWindowInputEvent(uint32_t event_id,
-                                          Id window_id,
-                                          std::unique_ptr<ui::Event> event,
-                                          uint32_t event_observer_id) {
+void WindowTreeClient::OnWindowInputEvent(
+  uint32_t event_id, Id window_id, std::unique_ptr<ui::Event> event,
+  mojo::Array<uint32_t> event_observer_ids) {
   DCHECK(event);
   Window* window = GetWindowByServerId(window_id);  // May be null.
 
   // Non-zero event_observer_id means it matched an event observer on the
   // server.
-  if (event_observer_id != 0 && has_event_observer_ &&
-      event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), window);
+  for (uint32_t id : event_observer_ids) {
+    if (id != 0 && MatchEventObserverId(id)) {
+      delegate_->OnEventObserved(*event.get(), window);
+      break;
+    }
+  }
 
   if (!window || !window->input_event_handler_) {
     tree_->OnWindowInputEventAck(event_id, mojom::EventResult::UNHANDLED);
     return;
   }
 
   std::unique_ptr<base::Callback<void(mojom::EventResult)>> ack_callback(
       new base::Callback<void(mojom::EventResult)>(
           base::Bind(&mojom::WindowTree::OnWindowInputEventAck,
                      base::Unretained(tree_), event_id)));
@@ skipping 10 matching lines @@
     window->input_event_handler_->OnWindowInputEvent(window, *event.get(),
                                                      &ack_callback);
   }
 
   // The handler did not take ownership of the callback, so we send the ack,
   // marking the event as not consumed.
   if (ack_callback)
     ack_callback->Run(mojom::EventResult::UNHANDLED);
 }
 
-void WindowTreeClient::OnEventObserved(std::unique_ptr<ui::Event> event,
-                                       uint32_t event_observer_id) {
+void WindowTreeClient::OnEventObserved(
+  std::unique_ptr<ui::Event> event, mojo::Array<uint32_t> event_observer_ids) {
   DCHECK(event);
-  if (has_event_observer_ && event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), nullptr /* target */);
+  for (uint32_t id : event_observer_ids) {
+    if (MatchEventObserverId(id)) {
+      delegate_->OnEventObserved(*event.get(), nullptr /* target */);
+      break;
+    }
+  }
 }
 
 void WindowTreeClient::OnWindowFocused(Id focused_window_id) {
   Window* focused_window = GetWindowByServerId(focused_window_id);
   InFlightFocusChange new_change(this, focused_window);
   if (ApplyServerChangeToExistingInFlightChange(new_change))
     return;
 
   LocalSetFocus(focused_window);
 }
@@ skipping 217 matching lines @@
 void WindowTreeClient::SetUnderlaySurfaceOffsetAndExtendedHitArea(
     Window* window,
     const gfx::Vector2d& offset,
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         server_id(window), offset.x(), offset.y(), hit_area);
   }
 }
 
+bool WindowTreeClient::MatchEventObserverId(uint32_t event_observer_id) {
+  std::vector<uint32_t>::iterator it;
+  it = find(event_observer_ids_.begin(), event_observer_ids_.end(),
+    event_observer_id);
+  if (it != event_observer_ids_.end()) {
+    return true;
+  }
+  return false;
+}
+
 }  // namespace ui