Do not scale cursor image for 2x image

ui/base/cursor/cursor_loader_x11.cc

Index: ui/base/cursor/cursor_loader_x11.cc
diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc
index 9c2f609bf8e5d370497eaf27d8934d70296f87ec..c9ffac26fadd67cafa461393e926ba25ca69966e 100644
--- a/ui/base/cursor/cursor_loader_x11.cc
+++ b/ui/base/cursor/cursor_loader_x11.cc
@@ -162,8 +162,10 @@ void CursorLoaderX11::LoadImageCursor(int id,
   const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(scale());
   SkBitmap bitmap = image_rep.sk_bitmap();
   gfx::Point hotpoint = hot;
+  // TODO(oshima): The cursor should use resource scale factor when
+  // fractional scale factor is enabled. crbug.com/372212
   ScaleAndRotateCursorBitmapAndHotpoint(
-      scale(), rotation(), &bitmap, &hotpoint);
+      scale() / image_rep.scale(), rotation(), &bitmap, &hotpoint);

[tdanderson, 2014/05/12 13:53:09]

What caused this regression in the first place?

 
   XcursorImage* x_image = SkBitmapToXcursorImage(&bitmap, hotpoint);
   cursors_[id] = CreateReffedCustomXCursor(x_image);