From db2f05dd09ab30b49356b01997501890c6e427ba Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Wed, 23 Apr 2014 13:24:08 +0000 Subject: Revert of Use platform's device scale factor for cursor (https://codereview.chromium.org/226293005/) Reason for revert: There are no resize cursors in DevTools on Linux Aura anymore. Original issue's description: > Use platform's device scale factor for cursor instead of gfx::Display because gfx::Display's DSF may differ from > platform's one when UI scaling is used. > > BUG=361672 > TEST=covered by unit test > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=265592 TBR=tdanderson@chromium.org,sky@chromium.org,oshima@chromium.org NOTREECHECKS=true NOTRY=true BUG=361672 Review URL: https://codereview.chromium.org/249303002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265625 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/wm/ash_native_cursor_manager.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ash/wm/ash_native_cursor_manager.cc') diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc index e78eb94..98078ac 100644 --- a/ash/wm/ash_native_cursor_manager.cc +++ b/ash/wm/ash_native_cursor_manager.cc @@ -95,7 +95,8 @@ void AshNativeCursorManager::SetCursor( new_cursor.SetPlatformCursor(invisible_cursor.platform()); } } - new_cursor.set_device_scale_factor(image_cursors_->GetScale()); + new_cursor.set_device_scale_factor( + image_cursors_->GetDisplay().device_scale_factor()); delegate->CommitCursor(new_cursor); -- cgit v1.1