Updates PointerEventRouter to handle switching move type

services/ui/public/cpp/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 614 matching lines @@
   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::StartPointerWatcher(bool want_moves) {
   if (has_pointer_watcher_)
     StopPointerWatcher();
   has_pointer_watcher_ = true;
-  pointer_watcher_id_++;
-  if (pointer_watcher_id_ == 0)
-    pointer_watcher_id_++;
-  tree_->StartPointerWatcher(want_moves, pointer_watcher_id_);
+  tree_->StartPointerWatcher(want_moves);
 }
 
 void WindowTreeClient::StopPointerWatcher() {
   DCHECK(has_pointer_watcher_);
   tree_->StopPointerWatcher();
   has_pointer_watcher_ = false;
 }
 
 void WindowTreeClient::PerformWindowMove(
     Window* window,
@@ skipping 325 matching lines @@
   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 pointer_watcher_id) {
+                                          bool matches_pointer_watcher) {
   DCHECK(event);
   Window* window = GetWindowByServerId(window_id);  // May be null.
 
   // Non-zero pointer_watcher_id means it matched a pointer watcher on the

[msw, 2016/08/18 22:45:23]

nit: update comment

[sky, 2016/08/18 23:17:14]

I just removed the comment as the code isn't particularly tricky at this point
that it warrants a comment.

   // server.
-  if (pointer_watcher_id_ != 0 && has_pointer_watcher_ &&
-      pointer_watcher_id == pointer_watcher_id_) {
+  if (matches_pointer_watcher && has_pointer_watcher_) {
     DCHECK(event->IsPointerEvent());
     delegate_->OnPointerEventObserved(*event->AsPointerEvent(), window);
   }
 
   if (!window || !window->input_event_handler_) {
     tree_->OnWindowInputEventAck(event_id, mojom::EventResult::UNHANDLED);
     return;
   }
 
   std::unique_ptr<base::Callback<void(mojom::EventResult)>> ack_callback(
@@ skipping 14 matching lines @@
                                                      &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::OnPointerEventObserved(std::unique_ptr<ui::Event> event,
-                                              uint32_t pointer_watcher_id,
                                               uint32_t window_id) {
   DCHECK(event);
   DCHECK(event->IsPointerEvent());
-  if (has_pointer_watcher_ && pointer_watcher_id == pointer_watcher_id_) {
+  if (has_pointer_watcher_) {
     Window* target_window = GetWindowByServerId(window_id);
     delegate_->OnPointerEventObserved(*event->AsPointerEvent(), target_window);
   }
 }
 
 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;
@@ skipping 224 matching lines @@
     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);
   }
 }
 
 }  // namespace ui