Aura: Adds custom cursors for drag and drop.

webkit/glue/webcursor_aurax11.cc

Index: webkit/glue/webcursor_aurax11.cc
diff --git a/webkit/glue/webcursor_aurax11.cc b/webkit/glue/webcursor_aurax11.cc
index fe221e29f80bd7b183adad5ee8ac74b8b6fca83d..b3f698900688279d109a280aaeb58f4c3f235a95 100644
--- a/webkit/glue/webcursor_aurax11.cc
+++ b/webkit/glue/webcursor_aurax11.cc
@@ -10,7 +10,6 @@
 
 #include "base/logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
-#include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/x/x11_util.h"
 
@@ -18,35 +17,13 @@ const ui::PlatformCursor WebCursor::GetPlatformCursor() {
   if (platform_cursor_)
     return platform_cursor_;
 
-  XcursorImage* image =
-      XcursorImageCreate(custom_size_.width(), custom_size_.height());
-  image->xhot = hotspot_.x();
-  image->yhot = hotspot_.y();
-  uint32* pixels = image->pixels;
-
-  if (custom_size_.width() && custom_size_.height()) {
-    SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                     custom_size_.width(), custom_size_.height());
-    bitmap.allocPixels();
-    memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size());
-
-    bitmap.lockPixels();
-    int height = bitmap.height(), width = bitmap.width();
-    for (int y = 0, i = 0; y < height; y++) {
-      for (int x = 0; x < width; x++) {
-        uint32 pixel = bitmap.getAddr32(0, y)[x];
-        int alpha = SkColorGetA(pixel);
-        if (alpha != 0 && alpha != 255)
-          pixels[i] = SkUnPreMultiply::PMColorToColor(pixel);
-        else
-          pixels[i] = pixel;
-        ++i;
-      }
-    }
-    bitmap.unlockPixels();
-  }
+  SkBitmap bitmap;
+  bitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                   custom_size_.width(), custom_size_.height());
+  bitmap.allocPixels();
+  memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size());
 
+  XcursorImage* image = ui::SkBitmapToXcursorImage(&bitmap, hotspot_);
   platform_cursor_ = ui::CreateReffedCustomXCursor(image);
   return platform_cursor_;
 }