Move cursor when it's hidden so that UX can update correctly

ui/aura/root_window.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/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 213 matching lines @@
   if (dnd_client && dnd_client->IsDragDropInProgress())
     cursor = dnd_client->GetDragCursor();
 
   last_cursor_ = cursor;
   // A lot of code seems to depend on NULL cursors actually showing an arrow,
   // so just pass everything along to the host.
   host_->SetCursor(cursor);
 }
 
 void RootWindow::ShowCursor(bool show) {
-  cursor_shown_ = show;
-  host_->ShowCursor(show);
+  // Send entered / exited so that visual state can be updated to match
+  // cursor state.
+  if (show != cursor_shown_) {
+    cursor_shown_ = show;
+    host_->ShowCursor(show);
+    GetRootWindow()->SynthesizeMouseEvent(ui::ET_MOUSE_MOVED, show);
+  }

[oshima, 2012/08/06 03:24:24]

I think it's better to change last_mouse_location to somewhere really off when
the mouse cursor is not visible,
and simply call PostMouseMoveEventAfterWindowChange because
1) last_mouse_location is used in other places and it may cause similar issue.
2) there may be an posted task that sends synthesized mouse move, which can
override the call above.

Ideally, we should move the mouse AND ignore all mouse events after that, but
that's probably outside of this CL's scope.

 }
 
 void RootWindow::MoveCursorTo(const gfx::Point& location_in_dip) {
   gfx::Point location = location_in_dip;
   layer()->transform().TransformPoint(location);
   host_->MoveCursorTo(ui::ConvertPointToPixel(layer(), location));
   SetLastMouseLocation(this, location_in_dip);
 }
 
 bool RootWindow::ConfineCursorToWindow() {
@@ skipping 763 matching lines @@
 void RootWindow::PostMouseMoveEventAfterWindowChange() {
   if (synthesize_mouse_move_)
     return;
   synthesize_mouse_move_ = true;
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&RootWindow::SynthesizeMouseMoveEvent,
                  event_factory_.GetWeakPtr()));
 }
 
+void RootWindow::SynthesizeMouseEvent(ui::EventType event_type,
+                                      bool use_current_position) {
+#if !defined(OS_WIN)
+  // Temporarily disabled for windows. See crbug.com/112222.
+  gfx::Point previous_last_mouse_position =
+      Env::GetInstance()->last_mouse_location();
+
+  gfx::Point3f point(use_current_position ?
+                     GetLastMouseLocationInRoot() : gfx::Point(-1, -1));

[oshima, 2012/08/06 03:24:24]

-1, -1 may still overlap a views' component. I'd suggest to use something like
(-10000, -10000)

+  ui::Transform transform = layer()->transform();
+  float scale = ui::GetDeviceScaleFactor(layer());
+  transform.ConcatScale(scale, scale);
+  transform.TransformPoint(point);
+  gfx::Point mouse_location = point.AsPoint();
+
+  // TODO(derat|oshima): Don't use mouse_button_flags_ as it's
+  // currently broken. See/ crbug.com/107931.
+  MouseEvent event(event_type,
+                   mouse_location,
+                   mouse_location,
+                   ui::EF_IS_SYNTHESIZED);
+  OnHostMouseEvent(&event);
+  SetLastMouseLocation(this, previous_last_mouse_position);
+#endif
+}
+
 void RootWindow::SynthesizeMouseMoveEvent() {
   if (!synthesize_mouse_move_)
     return;
   synthesize_mouse_move_ = false;
-#if !defined(OS_WIN)
-  // Temporarily disabled for windows. See crbug.com/112222.
-  gfx::Point3f point(GetLastMouseLocationInRoot());
-  ui::Transform transform = layer()->transform();
-  float scale = ui::GetDeviceScaleFactor(layer());
-  transform.ConcatScale(scale, scale);
-  transform.TransformPoint(point);
-  gfx::Point orig_mouse_location = point.AsPoint();
-
-  // TODO(derat|oshima): Don't use mouse_button_flags_ as it's
-  // currently broken. See/ crbug.com/107931.
-  MouseEvent event(ui::ET_MOUSE_MOVED,
-                   orig_mouse_location,
-                   orig_mouse_location,
-                   ui::EF_IS_SYNTHESIZED);
-  OnHostMouseEvent(&event);
-#endif
+  SynthesizeMouseEvent(ui::ET_MOUSE_MOVED, true);
 }
 
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura