Implement cursor compositing mode on Ash

ash/wm/ash_native_cursor_manager.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 "ash/wm/ash_native_cursor_manager.h"
 
+#include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/image_cursors.h"
 #include "base/logging.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/cursor/cursor.h"
 
 namespace ash {
 namespace  {
 
 void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->GetDispatcher()->SetCursor(cursor);
 #if defined(OS_CHROMEOS)
   Shell::GetInstance()->display_controller()->
-      mirror_window_controller()->SetMirroredCursor(cursor);
+      cursor_window_controller()->SetCursor(cursor);
+  Shell::GetInstance()->display_controller()->
+      mirror_window_controller()->SetCursor(cursor);
 #endif
 }
 
 void NotifyCursorVisibilityChange(bool visible) {
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->GetDispatcher()->OnCursorVisibilityChanged(visible);
 #if defined(OS_CHROMEOS)
+  Shell::GetInstance()->display_controller()->cursor_window_controller()->
+      SetCursorVisibility(visible);
   Shell::GetInstance()->display_controller()->mirror_window_controller()->
-      SetMirroredCursorVisibility(visible);
+      SetCursorVisibility(visible);
 #endif
 }
 
 void NotifyMouseEventsEnableStateChange(bool enabled) {
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->GetDispatcher()->OnMouseEventsEnableStateChanged(enabled);
   // Mirror window never process events.
 }
 
 }  // namespace
 
 AshNativeCursorManager::AshNativeCursorManager()
-    : image_cursors_(new ImageCursors) {
+    : native_cursor_enabled_(true),
+      image_cursors_(new ImageCursors) {
 }
 
 AshNativeCursorManager::~AshNativeCursorManager() {
 }
 
 void AshNativeCursorManager::SetDisplay(
     const gfx::Display& display,
     views::corewm::NativeCursorManagerDelegate* delegate) {
   if (image_cursors_->SetDisplay(display))
     SetCursor(delegate->GetCursor(), delegate);
 }
 
 void AshNativeCursorManager::SetCursor(
     gfx::NativeCursor cursor,
     views::corewm::NativeCursorManagerDelegate* delegate) {
   gfx::NativeCursor new_cursor = cursor;
-  image_cursors_->SetPlatformCursor(&new_cursor);
+  if (native_cursor_enabled_) {
+    image_cursors_->SetPlatformCursor(&new_cursor);
+  } else {
+    gfx::NativeCursor invisible_cursor(ui::kCursorNone);
+    image_cursors_->SetPlatformCursor(&invisible_cursor);
+    new_cursor.SetPlatformCursor(invisible_cursor.platform());
+  }
   new_cursor.set_device_scale_factor(
       image_cursors_->GetDisplay().device_scale_factor());
 
   delegate->CommitCursor(new_cursor);
 
   if (delegate->IsCursorVisible())
     SetCursorOnAllRootWindows(new_cursor);
 }
 
 void AshNativeCursorManager::SetCursorSet(
     ui::CursorSetType cursor_set,
     views::corewm::NativeCursorManagerDelegate* delegate) {
   image_cursors_->SetCursorSet(cursor_set);
   delegate->CommitCursorSet(cursor_set);
 
   // Sets the cursor to reflect the scale change immediately.
   if (delegate->IsCursorVisible())
     SetCursor(delegate->GetCursor(), delegate);
+
+#if defined(OS_CHROMEOS)
+  Shell::GetInstance()->display_controller()->cursor_window_controller()->
+      SetCursorSet(cursor_set);
+#endif
 }
 
 void AshNativeCursorManager::SetScale(
     float scale,
     views::corewm::NativeCursorManagerDelegate* delegate) {
   image_cursors_->SetScale(scale);
   delegate->CommitScale(scale);
 
   // Sets the cursor to reflect the scale change immediately.
   SetCursor(delegate->GetCursor(), delegate);
@@ skipping 24 matching lines @@
     aura::Env::GetInstance()->set_last_mouse_location(
         disabled_cursor_location_);
   } else {
     disabled_cursor_location_ = aura::Env::GetInstance()->last_mouse_location();
   }
 
   SetVisibility(delegate->IsCursorVisible(), delegate);
   NotifyMouseEventsEnableStateChange(enabled);
 }
 
+void AshNativeCursorManager::SetNativeCursorEnabled(
+    bool enabled,
+    views::corewm::NativeCursorManagerDelegate* delegate) {
+  native_cursor_enabled_ = enabled;
+  SetCursor(delegate->GetCursor(), delegate);
+}
+
 }  // namespace ash