mus: Change PointerWatcher to watch for all events.

ui/views/mus/window_manager_connection.cc

Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 6ad419589a43415de1d3844bf96a35fe703cff41..b77a4403d95cec65544dbe418620a14adf78ae72 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -21,7 +21,6 @@
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/screen_mus.h"
 #include "ui/views/pointer_watcher.h"
-#include "ui/views/touch_event_watcher.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
@@ -95,17 +94,33 @@ NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
                              ui::mojom::SurfaceType::DEFAULT);
 }
 
-void WindowManagerConnection::AddPointerWatcher(PointerWatcher* watcher) {
+void WindowManagerConnection::AddPointerWatcher(PointerWatcher* watcher,
+                                                ui::EventPointerType type,
+                                                bool want_moves) {
   // TODO(riajiang): Support multiple event matchers (crbug.com/627146).
-  DCHECK(!HasTouchEventWatcher());
+  DCHECK(type != ui::EventPointerType::POINTER_TYPE_ANY || !want_moves);
+  DCHECK(event_pointer_type_ == ui::EventPointerType::POINTER_TYPE_UNKNOWN ||
+         event_pointer_type_ == type);
   bool had_watcher = HasPointerWatcher();
   pointer_watchers_.AddObserver(watcher);
   if (!had_watcher) {
-    // Start a watcher for pointer down.
-    // TODO(jamescook): Extend event observers to handle multiple event types.
+    event_pointer_type_ = type;
     ui::mojom::EventMatcherPtr matcher = ui::mojom::EventMatcher::New();
-    matcher->type_matcher = ui::mojom::EventTypeMatcher::New();
-    matcher->type_matcher->type = ui::mojom::EventType::POINTER_DOWN;
+    if (want_moves) {
+      matcher->pointer_kind_matcher = ui::mojom::PointerKindMatcher::New();
+      if (type == ui::EventPointerType::POINTER_TYPE_TOUCH) {
+        matcher->pointer_kind_matcher->pointer_kind =
+            ui::mojom::PointerKind::TOUCH;
+      } else {
+        matcher->pointer_kind_matcher->pointer_kind =
+            ui::mojom::PointerKind::MOUSE;
+      }
+    } else {
+      // Start a watcher for pointer down.
+      // TODO(jamescook): Extend event observers to handle multiple event types.
+      matcher->type_matcher = ui::mojom::EventTypeMatcher::New();
+      matcher->type_matcher->type = ui::mojom::EventType::POINTER_DOWN;

[James Cook, 2016/07/22 22:06:26]

Likewise, it's very odd that want_moves false implies down events only.

+    }
     client_->SetEventObserver(std::move(matcher));
   }
 }
@@ -115,28 +130,7 @@ void WindowManagerConnection::RemovePointerWatcher(PointerWatcher* watcher) {
   if (!HasPointerWatcher()) {
     // Last PointerWatcher removed, stop the event observer.
     client_->SetEventObserver(nullptr);
-  }
-}
-
-void WindowManagerConnection::AddTouchEventWatcher(TouchEventWatcher* watcher) {
-  // TODO(riajiang): Support multiple event matchers (crbug.com/627146).
-  DCHECK(!HasPointerWatcher());
-  bool had_watcher = HasTouchEventWatcher();
-  touch_event_watchers_.AddObserver(watcher);
-  if (!had_watcher) {
-    ui::mojom::EventMatcherPtr matcher = ui::mojom::EventMatcher::New();
-    matcher->pointer_kind_matcher = ui::mojom::PointerKindMatcher::New();
-    matcher->pointer_kind_matcher->pointer_kind = ui::mojom::PointerKind::TOUCH;
-    client_->SetEventObserver(std::move(matcher));
-  }
-}
-
-void WindowManagerConnection::RemoveTouchEventWatcher(
-    TouchEventWatcher* watcher) {
-  touch_event_watchers_.RemoveObserver(watcher);
-  if (!HasTouchEventWatcher()) {
-    // Last TouchEventWatcher removed, stop the event observer.
-    client_->SetEventObserver(nullptr);
+    event_pointer_type_ = ui::EventPointerType::POINTER_TYPE_UNKNOWN;
   }
 }
 
@@ -147,7 +141,9 @@ const std::set<ui::Window*>& WindowManagerConnection::GetRoots() const {
 WindowManagerConnection::WindowManagerConnection(
     shell::Connector* connector,
     const shell::Identity& identity)
-    : connector_(connector), identity_(identity) {
+    : connector_(connector),
+      identity_(identity),
+      event_pointer_type_(ui::EventPointerType::POINTER_TYPE_UNKNOWN) {
   lazy_tls_ptr.Pointer()->Set(this);
 
   ui::GpuService::Initialize(connector);
@@ -176,15 +172,6 @@ bool WindowManagerConnection::HasPointerWatcher() {
   return !!iterator.GetNext();
 }
 
-bool WindowManagerConnection::HasTouchEventWatcher() {
-  // Check to see if we really have any observers left. This doesn't use
-  // base::ObserverList<>::might_have_observers() because that returns true
-  // during iteration over the list even when the last observer is removed.
-  base::ObserverList<TouchEventWatcher>::Iterator iterator(
-      &touch_event_watchers_);
-  return !!iterator.GetNext();
-}
-
 void WindowManagerConnection::OnEmbed(ui::Window* root) {}
 
 void WindowManagerConnection::OnDidDestroyClient(ui::WindowTreeClient* client) {
@@ -209,23 +196,26 @@ void WindowManagerConnection::OnEventObserved(const ui::Event& event,
   // to store screen coordinates. Screen coordinates really should be returned
   // separately. See http://crbug.com/608547
   gfx::Point location_in_screen = event.AsLocatedEvent()->root_location();
-  if (HasPointerWatcher()) {
-    if (event.type() == ui::ET_MOUSE_PRESSED) {
-      FOR_EACH_OBSERVER(PointerWatcher, pointer_watchers_,
-                        OnMousePressed(*event.AsMouseEvent(),
-                                       location_in_screen, target_widget));
-    } else if (event.type() == ui::ET_TOUCH_PRESSED) {
-      FOR_EACH_OBSERVER(PointerWatcher, pointer_watchers_,
-                        OnTouchPressed(*event.AsTouchEvent(),
-                                       location_in_screen, target_widget));
-    }
-  } else if (HasTouchEventWatcher()) {
-    if (event.IsTouchEvent() || event.IsTouchPointerEvent()) {
-      FOR_EACH_OBSERVER(
-          TouchEventWatcher, touch_event_watchers_,
-          OnTouchEventObserved(*event.AsLocatedEvent(), target_widget));
-    }
+  bool event_match = false;
+  switch (event_pointer_type_) {
+    case ui::EventPointerType::POINTER_TYPE_TOUCH:
+      event_match = event.IsTouchEvent() || event.IsTouchPointerEvent();
+      break;
+    case ui::EventPointerType::POINTER_TYPE_MOUSE:
+      event_match = event.IsMouseEvent() || event.IsMousePointerEvent();
+      break;
+    case ui::EventPointerType::POINTER_TYPE_ANY:
+      event_match = event.type() == ui::ET_MOUSE_PRESSED ||
+                    event.type() == ui::ET_TOUCH_PRESSED;
+      break;
+    default:
+      NOTREACHED();
   }
+  if (event_match)
+    FOR_EACH_OBSERVER(
+        PointerWatcher, pointer_watchers_,
+        OnPointerEventObserved(*event.AsLocatedEvent(), location_in_screen,
+                               target_widget));
 }
 
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {