Move ash specific cursor code to CursorManager.

ui/base/cursor/cursor.cc

Index: ui/base/cursor/cursor.cc
diff --git a/ui/base/cursor/cursor.cc b/ui/base/cursor/cursor.cc
index e2811bf10e1770ce1abb1fb07cf84756faf3db60..223042e036f2dc667a20f0fdec55b77519a6e306 100644
--- a/ui/base/cursor/cursor.cc
+++ b/ui/base/cursor/cursor.cc
@@ -8,17 +8,20 @@ namespace ui {
 
 Cursor::Cursor()
     : native_type_(0),
-      platform_cursor_(0) {
+      platform_cursor_(0),
+      device_scale_factor_(0.0f) {
 }
 
 Cursor::Cursor(int type)
     : native_type_(type),
-      platform_cursor_(0) {
+      platform_cursor_(0),
+      device_scale_factor_(0.0f) {
 }
 
 Cursor::Cursor(const Cursor& cursor)
     : native_type_(cursor.native_type_),
-      platform_cursor_(cursor.platform_cursor_) {
+      platform_cursor_(cursor.platform_cursor_),
+      device_scale_factor_(cursor.device_scale_factor_) {
   if (native_type_ == kCursorCustom)
     RefCustomCursor();
 }
@@ -29,22 +32,23 @@ Cursor::~Cursor() {
 }
 
 void Cursor::SetPlatformCursor(const PlatformCursor& platform) {
-  if (platform_cursor_)
+  if (native_type_ == kCursorCustom)
     UnrefCustomCursor();
-  native_type_ = kCursorCustom;

[sky, 2012/09/10 22:49:06]

How come you're removing this?

[mazda, 2012/09/11 00:45:09]

Originally the cursor that had non-zero platform_cursor_ always had
kCursorCustom as native type.
I changed this assumption so that the cursors for other native types also have
non-zero platform_cursor_. That is convenient to handle image cursor used for 2x
scale factor consistently.
Since this function had been used only in webkit/glue/webcursor_aura.cc and I
changed it accordingly, it should be safe to make this change.

   platform_cursor_ = platform;
-  RefCustomCursor();
+  if (native_type_ == kCursorCustom)
+    RefCustomCursor();
 }
 
 void Cursor::Assign(const Cursor& cursor) {
   if (*this == cursor)
     return;
   native_type_ = cursor.native_type_;
-  if (platform_cursor_)
+  if (native_type_ == kCursorCustom)
     UnrefCustomCursor();
   platform_cursor_ = cursor.platform_cursor_;
-  if (platform_cursor_)
+  if (native_type_ == kCursorCustom)
     RefCustomCursor();
+  device_scale_factor_ = cursor.device_scale_factor_;
 }
 
 }  // namespace ui