Updates PointerEventRouter to handle switching move type

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>
 
@@ skipping 715 matching lines @@
 
 void WindowTree::SendToPointerWatcher(const ui::Event& event,
                                       ServerWindow* target_window) {
   if (!EventMatchesPointerWatcher(event))
     return;
 
   ClientWindowId client_window_id;
   // Ignore the return value from IsWindowKnown() as in the case of the client
   // not knowing the window we'll send 0, which corresponds to no window.
   IsWindowKnown(target_window, &client_window_id);
-  client()->OnPointerEventObserved(ui::Event::Clone(event), pointer_watcher_id_,
+  client()->OnPointerEventObserved(ui::Event::Clone(event),
                                    client_window_id.id);
 }
 
 bool WindowTree::ShouldRouteToWindowManager(const ServerWindow* window) const {
   if (window_manager_state_)
     return false;  // We are the window manager, don't route to ourself.
 
   // If the client created this window, then do not route it through the WM.
   if (window->id().client_id == id_)
     return false;
@@ skipping 285 matching lines @@
                                         const ui::Event& event) {
   GenerateEventAckId();
   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_pointer_watcher = EventMatchesPointerWatcher(event);
   client()->OnWindowInputEvent(
       event_ack_id_, ClientWindowIdForWindow(target).id,
-      ui::Event::Clone(event),
-      matched_pointer_watcher ? pointer_watcher_id_ : 0);
+      ui::Event::Clone(event), matched_pointer_watcher);
 }
 
 bool WindowTree::EventMatchesPointerWatcher(const ui::Event& event) const {
-  if (pointer_watcher_id_ == 0)
+  if (!has_pointer_watcher_)
     return false;
   if (!event.IsPointerEvent())
     return false;
   if (pointer_watcher_want_moves_ && event.type() == ui::ET_POINTER_MOVED)
     return true;
   return event.type() == ui::ET_POINTER_DOWN ||
          event.type() == ui::ET_POINTER_UP;
 }
 
 void WindowTree::NewWindow(
@@ skipping 138 matching lines @@
 
 void WindowTree::SetCapture(uint32_t change_id, Id window_id) {
   client()->OnChangeCompleted(change_id, SetCapture(ClientWindowId(window_id)));
 }
 
 void WindowTree::ReleaseCapture(uint32_t change_id, Id window_id) {
   client()->OnChangeCompleted(change_id,
                               ReleaseCapture(ClientWindowId(window_id)));
 }
 
-void WindowTree::StartPointerWatcher(bool want_moves,
-                                     uint32_t pointer_watcher_id) {
-  if (pointer_watcher_id == 0) {
-    DVLOG(1) << "StartPointerWatcher called with 0.";
-    StopPointerWatcher();
-    return;
-  }
+void WindowTree::StartPointerWatcher(bool want_moves) {
+  has_pointer_watcher_ = true;
   pointer_watcher_want_moves_ = want_moves;
-  pointer_watcher_id_ = pointer_watcher_id;
 }
 
 void WindowTree::StopPointerWatcher() {
+  has_pointer_watcher_ = false;
   pointer_watcher_want_moves_ = false;
-  pointer_watcher_id_ = 0;
 }
 
 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 451 matching lines @@
 }
 
 bool WindowTree::IsWindowRootOfAnotherTreeForAccessPolicy(
     const ServerWindow* window) const {
   WindowTree* tree = window_server_->GetTreeWithRoot(window);
   return tree && tree != this;
 }
 
 }  // namespace ws
 }  // namespace ui