Revert of Use platform's device scale factor for cursor

ui/base/cursor/cursor_loader_x11.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/base/cursor/cursor_loader_x11.h"
 
 #include <float.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 
@@ skipping 141 matching lines @@
 
 CursorLoaderX11::~CursorLoaderX11() {
   UnloadAll();
 }
 
 void CursorLoaderX11::LoadImageCursor(int id,
                                       int resource_id,
                                       const gfx::Point& hot) {
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
-  const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(scale());
+  const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(
+      display().device_scale_factor());
   SkBitmap bitmap = image_rep.sk_bitmap();
   gfx::Point hotpoint = hot;
   ScaleAndRotateCursorBitmapAndHotpoint(
-      scale(), rotation(), &bitmap, &hotpoint);
+      scale(), display().rotation(), &bitmap, &hotpoint);
 
   XcursorImage* x_image = SkBitmapToXcursorImage(&bitmap, hotpoint);
   cursors_[id] = CreateReffedCustomXCursor(x_image);
   // |image_rep| is owned by the resource bundle. So we do not need to free it.
 }
 
 void CursorLoaderX11::LoadAnimatedCursor(int id,
                                          int resource_id,
                                          const gfx::Point& hot,
                                          int frame_delay_ms) {
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
-  const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(scale());
+  const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(
+      display().device_scale_factor());
   SkBitmap bitmap = image_rep.sk_bitmap();
   int frame_width = bitmap.height();
   int frame_height = frame_width;
   int total_width = bitmap.width();
   DCHECK_EQ(total_width % frame_width, 0);
   int frame_count = total_width / frame_width;
   DCHECK_GT(frame_count, 0);
   XcursorImages* x_images = XcursorImagesCreate(frame_count);
   x_images->nimage = frame_count;
 
@@ skipping 34 matching lines @@
 void CursorLoaderX11::SetPlatformCursor(gfx::NativeCursor* cursor) {
   DCHECK(cursor);
 
   ::Cursor xcursor;
   if (IsImageCursor(*cursor))
     xcursor = ImageCursorFromNative(*cursor);
   else if (*cursor == kCursorNone)
     xcursor =  invisible_cursor_.get();
   else if (*cursor == kCursorCustom)
     xcursor = cursor->platform();
-  else if (scale() == 1.0f && rotation() == gfx::Display::ROTATE_0) {
+  else if (display().device_scale_factor() == 1.0f &&
+           display().rotation() == gfx::Display::ROTATE_0) {
     xcursor = GetXCursor(CursorShapeFromNative(*cursor));
   } else {
     xcursor = ImageCursorFromNative(kCursorPointer);
   }
 
   cursor->SetPlatformCursor(xcursor);
 }
 
 bool CursorLoaderX11::IsImageCursor(gfx::NativeCursor native_cursor) {
   int type = native_cursor.native_type();
   return cursors_.count(type) || animated_cursors_.count(type);
 }
 
 ::Cursor CursorLoaderX11::ImageCursorFromNative(
     gfx::NativeCursor native_cursor) {
   int type = native_cursor.native_type();
   if (animated_cursors_.count(type))
     return animated_cursors_[type].first;
 
   ImageCursorMap::iterator find = cursors_.find(type);
   if (find != cursors_.end())
     return cursors_[type];
   return GetXCursor(CursorShapeFromNative(native_cursor));
 }
 
 }  // namespace ui