Pointer watcher modifications to support laser pointer.

ash/pointer_watcher_delegate_aura.cc

 // Copyright 2016 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 "ash/pointer_watcher_delegate_aura.h"
 
 #include "ash/shell.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 PointerWatcherDelegateAura::PointerWatcherDelegateAura() {
   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 PointerWatcherDelegateAura::~PointerWatcherDelegateAura() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
 void PointerWatcherDelegateAura::AddPointerWatcher(
-    views::PointerWatcher* watcher) {
+    views::PointerWatcher* watcher,
+    bool wants_moves) {
   pointer_watchers_.AddObserver(watcher);
+  if (wants_moves) {

[James Cook, 2016/08/11 23:51:10]

Since want_moves is always true in the map, you could use a set.

+    wants_moves_map_.insert(
+        std::pair<views::PointerWatcher*, bool>(watcher, wants_moves));
+  }
 }
 
 void PointerWatcherDelegateAura::RemovePointerWatcher(
     views::PointerWatcher* watcher) {
   pointer_watchers_.RemoveObserver(watcher);
+  auto it = wants_moves_map_.find(watcher);
+  if (it != wants_moves_map_.end())
+    wants_moves_map_.erase(it);
 }
 
 void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
   // For compatibility with the mus version, don't send moves.
-  if (event->type() != ui::ET_MOUSE_PRESSED &&
+  if (event->type() != ui::ET_MOUSE_DRAGGED &&

[James Cook, 2016/08/11 23:51:10]

Good catch on drags.

+      event->type() != ui::ET_MOUSE_MOVED &&
+      event->type() != ui::ET_MOUSE_PRESSED &&
       event->type() != ui::ET_MOUSE_RELEASED)
     return;
+
   ui::PointerEvent mouse_pointer_event(*event);
-  FOR_EACH_OBSERVER(
-      views::PointerWatcher, pointer_watchers_,
-      OnPointerEventObserved(mouse_pointer_event, GetLocationInScreen(*event),
-                             GetTargetWidget(*event)));
+  // Mouse move events only sent to a select number of observers.
+  if (event->type() == ui::ET_MOUSE_DRAGGED ||
+      event->type() == ui::ET_MOUSE_MOVED) {
+    auto it = wants_moves_map_.begin();
+    for (; it != wants_moves_map_.end(); it++) {
+      it->first->OnPointerEventObserved(mouse_pointer_event,
+                                        GetLocationInScreen(*event),
+                                        GetTargetWidget(*event));
+    }
+  } else {
+    FOR_EACH_OBSERVER(
+        views::PointerWatcher, pointer_watchers_,
+        OnPointerEventObserved(mouse_pointer_event, GetLocationInScreen(*event),
+                               GetTargetWidget(*event)));
+  }
 }
 
 void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
   // For compatibility with the mus version, don't send moves.
   if (event->type() != ui::ET_TOUCH_PRESSED &&
       event->type() != ui::ET_TOUCH_RELEASED)
     return;
   ui::PointerEvent touch_pointer_event(*event);
   FOR_EACH_OBSERVER(
       views::PointerWatcher, pointer_watchers_,
@@ skipping 10 matching lines @@
   return location_in_screen;
 }
 
 views::Widget* PointerWatcherDelegateAura::GetTargetWidget(
     const ui::LocatedEvent& event) const {
   aura::Window* window = static_cast<aura::Window*>(event.target());
   return views::Widget::GetTopLevelWidgetForNativeView(window);
 }
 
 }  // namespace ash