Ensure that mouse lock works correctly on Chrome ASH in Windows 8.

ui/aura/remote_window_tree_host_win.cc

 // Copyright (c) 2012 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 "ui/aura/remote_window_tree_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 75 matching lines @@
 RemoteWindowTreeHostWin* g_instance = NULL;
 
 // static
 RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() {
   return g_instance;
 }
 
 RemoteWindowTreeHostWin::RemoteWindowTreeHostWin()
     : remote_window_(NULL),
       host_(NULL),
-      ignore_mouse_moves_until_set_cursor_ack_(false),
+      ignore_mouse_moves_until_set_cursor_ack_(0),
       event_flags_(0),
       window_size_(aura::WindowTreeHost::GetNativeScreenSize()) {
   CHECK(!g_instance);
   g_instance = this;
   prop_.reset(new ui::ViewProp(NULL, kWindowTreeHostWinKey, this));
   CreateCompositor(GetAcceleratedWidget());
 }
 
 RemoteWindowTreeHostWin::~RemoteWindowTreeHostWin() {
   DestroyCompositor();
@@ skipping 148 matching lines @@
   // Other cases which don't expect this behavior should continue to work
   // without issues.
 
   // The mouse events are received by the viewer process and sent to the
   // browser. If we invoke the SetCursor API here we continue to receive
   // mouse messages from the viewer which were posted before the SetCursor
   // API executes which messes up the state in the browser. To workaround
   // this we invoke the SetCursor API in the viewer process and ignore
   // mouse messages until we received an ACK from the viewer indicating that
   // the SetCursor operation completed.
-  ignore_mouse_moves_until_set_cursor_ack_ = true;
+  ignore_mouse_moves_until_set_cursor_ack_++;
   VLOG(1) << "In MoveCursorTo. Sending IPC";
   host_->Send(new MetroViewerHostMsg_SetCursorPos(location.x(), location.y()));
 }
 
 void RemoteWindowTreeHostWin::OnCursorVisibilityChangedNative(bool show) {
   NOTIMPLEMENTED();
 }
 
 void RemoteWindowTreeHostWin::PostNativeEvent(
     const base::NativeEvent& native_event) {
@@ skipping 147 matching lines @@
                                            uint32 pointer_id) {
   gfx::Point location = PointFromNativeEvent(x, y);
   ui::TouchEvent event(ui::ET_TOUCH_MOVED,
                        location,
                        pointer_id,
                        base::TimeDelta::FromMicroseconds(timestamp));
   SendEventToProcessor(&event);
 }
 
 void RemoteWindowTreeHostWin::OnSetCursorPosAck() {
-  DCHECK(ignore_mouse_moves_until_set_cursor_ack_);
-  ignore_mouse_moves_until_set_cursor_ack_ = false;
+  if (ignore_mouse_moves_until_set_cursor_ack_ > 0) {

[sky, 2014/09/09 23:34:18]

DCHECK?

[ananta, 2014/09/09 23:39:17]

Done.

+    ignore_mouse_moves_until_set_cursor_ack_--;
+  } else {
+    NOTREACHED() << "Received unexpected SetCursorPos ACK";
+  }
 }
 
 ui::RemoteInputMethodPrivateWin*
 RemoteWindowTreeHostWin::GetRemoteInputMethodPrivate() {
   ui::InputMethod* input_method = GetAshWindow()->GetProperty(
       aura::client::kRootWindowInputMethodKey);
   return ui::RemoteInputMethodPrivateWin::Get(input_method);
 }
 
 void RemoteWindowTreeHostWin::OnImeCandidatePopupChanged(bool visible) {
@@ skipping 70 matching lines @@
 }
 
 void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;
   SetVirtualKeyStates(event_flags_);
 }
 
 }  // namespace aura