mus: Add watcher for all touch events.

services/ui/ws/window_tree.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/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/ws/default_access_policy.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/event_matcher.h"
 #include "services/ui/ws/focus_controller.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "services/ui/ws/user_display_manager.h"
@@ skipping 941 matching lines @@
   // We do not want to create a sequential id for each event, because that can
   // leak some information to the client. So instead, manufacture the id
   // randomly.
   // TODO(moshayedi): Find a faster way to generate ids.
   event_ack_id_ = 0x1000000 | (rand() & 0xffffff);
   WindowManagerDisplayRoot* display_root = GetWindowManagerDisplayRoot(target);
   DCHECK(display_root);
   event_source_wms_ = display_root->window_manager_state();
   // Should only get events from windows attached to a host.
   DCHECK(event_source_wms_);
-  bool matched_observer =
-      event_observer_matcher_ && event_observer_matcher_->MatchesEvent(event);
+  mojo::Array<uint32_t> event_observer_ids;
+  std::map<uint32_t, std::unique_ptr<EventMatcher>>::iterator it;
+  for (it = event_observer_matchers_.begin();
+    it != event_observer_matchers_.end(); ++it) {
+    bool matched_observer = it->second->MatchesEvent(event);
+    if (matched_observer) {
+      event_observer_ids.push_back(it->first);
+    } else {
+      event_observer_ids.push_back(0);
+    }
+  }
   client()->OnWindowInputEvent(
       event_ack_id_, ClientWindowIdForWindow(target).id,
-      ui::Event::Clone(event), matched_observer ? event_observer_id_ : 0);
+      ui::Event::Clone(event), std::move(event_observer_ids));
 }
 
 void WindowTree::SendToEventObserver(const ui::Event& event) {
-  if (event_observer_matcher_ && event_observer_matcher_->MatchesEvent(event))
-    client()->OnEventObserved(ui::Event::Clone(event), event_observer_id_);
+  mojo::Array<uint32_t> event_observer_ids;
+  std::map<uint32_t, std::unique_ptr<EventMatcher>>::iterator it;
+  for (it = event_observer_matchers_.begin();
+    it != event_observer_matchers_.end(); ++it) {
+    if(it->second->MatchesEvent(event)) {
+      event_observer_ids.push_back(it->first);
+    }
+  }
+  if (!event_observer_ids.empty()) {
+    client()->OnEventObserved(ui::Event::Clone(event),
+      std::move(event_observer_ids));
+  }
 }
 
 void WindowTree::NewWindow(
     uint32_t change_id,
     Id transport_window_id,
     mojo::Map<mojo::String, mojo::Array<uint8_t>> transport_properties) {
   std::map<std::string, std::vector<uint8_t>> properties;
   if (!transport_properties.is_null()) {
     properties =
         transport_properties.To<std::map<std::string, std::vector<uint8_t>>>();
@@ skipping 143 matching lines @@
                   access_policy_->CanSetCapture(current_capture_window)) &&
                  window == current_capture_window;
   if (success) {
     Operation op(this, window_server_, OperationType::RELEASE_CAPTURE);
     success = display_root->window_manager_state()->SetCapture(
         nullptr, kInvalidClientId);
   }
   client()->OnChangeCompleted(change_id, success);
 }
 
-void WindowTree::SetEventObserver(mojom::EventMatcherPtr matcher,
+void WindowTree::AddEventObserver(mojom::EventMatcherPtr matcher,
                                   uint32_t observer_id) {
   if (matcher.is_null() || observer_id == 0) {
-    // Clear any existing event observer.
-    event_observer_matcher_.reset();
-    event_observer_id_ = 0;
     return;
   }
 
   // Do not allow key events to be observed, as a compromised app could register
   // itself as an event observer and spy on keystrokes to another app.
-  if (!matcher->type_matcher) {
+  if (!matcher->type_matcher && !matcher->pointer_kind_matcher) {
     DVLOG(1) << "SetEventObserver must specify an event type.";
     return;
   }
+
   const ui::mojom::EventType event_type_whitelist[] = {
       ui::mojom::EventType::POINTER_CANCEL, ui::mojom::EventType::POINTER_DOWN,
       ui::mojom::EventType::POINTER_MOVE,   ui::mojom::EventType::POINTER_UP,
       ui::mojom::EventType::MOUSE_EXIT,     ui::mojom::EventType::WHEEL,
   };
+  const ui::mojom::PointerKind pointer_kind_whitelist[] = {
+      ui::mojom::PointerKind::MOUSE, ui::mojom::PointerKind::TOUCH,
+  };
+
   bool allowed = false;
-  for (ui::mojom::EventType event_type : event_type_whitelist) {
-    if (matcher->type_matcher->type == event_type) {
-      allowed = true;
-      break;
+  if (matcher->type_matcher) {
+    for (ui::mojom::EventType event_type : event_type_whitelist) {
+      if (matcher->type_matcher->type == event_type) {
+        allowed = true;
+        break;
+      }
+    }
+  }
+  if (matcher->pointer_kind_matcher) {
+    for (ui::mojom::PointerKind pointer : pointer_kind_whitelist) {
+      if (matcher->pointer_kind_matcher->pointer_kind == pointer) {
+        allowed = true;
+        break;
+      }
     }
   }
   if (!allowed) {
     DVLOG(1) << "SetEventObserver event type not allowed";
     return;
   }
 
-  event_observer_matcher_.reset(new EventMatcher(*matcher));
-  event_observer_id_ = observer_id;
+  std::unique_ptr<EventMatcher> event_observer_matcher;
+  event_observer_matcher.reset(new EventMatcher(*matcher));
+  event_observer_matchers_[observer_id] = std::move(event_observer_matcher);
+}
+
+void WindowTree::RemoveEventObserver(uint32_t observer_id) {
+  std::map<uint32_t, std::unique_ptr<EventMatcher>>::iterator it =
+    event_observer_matchers_.find(observer_id);
+  if (it != event_observer_matchers_.end())
+    event_observer_matchers_.erase(it);
 }
 
 void WindowTree::SetWindowBounds(uint32_t change_id,
                                  Id window_id,
                                  const gfx::Rect& bounds) {
   ServerWindow* window = GetWindowByClientId(ClientWindowId(window_id));
   if (window && ShouldRouteToWindowManager(window)) {
     const uint32_t wm_change_id =
         window_server_->GenerateWindowManagerChangeId(this, change_id);
     // |window_id| may be a client id, use the id from the window to ensure
@@ skipping 428 matching lines @@
 }
 
 bool WindowTree::IsWindowRootOfAnotherTreeForAccessPolicy(
     const ServerWindow* window) const {
   WindowTree* tree = window_server_->GetTreeWithRoot(window);
   return tree && tree != this;
 }
 
 }  // namespace ws
 }  // namespace ui