diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 13:24:08 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 13:24:08 +0000 |
| commit | db2f05dd09ab30b49356b01997501890c6e427ba (patch) | |
| tree | 97f34b2d574039a60139539c2bcbeaa499157fcc /ui/base/cursor/cursor_loader_x11.cc | |
| parent | 0651dcf0c09e481b6aa3a5340b72ba30ecc58106 (diff) | |
| download | chromium_src-db2f05dd09ab30b49356b01997501890c6e427ba.zip chromium_src-db2f05dd09ab30b49356b01997501890c6e427ba.tar.gz chromium_src-db2f05dd09ab30b49356b01997501890c6e427ba.tar.bz2 | |
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
Diffstat (limited to 'ui/base/cursor/cursor_loader_x11.cc')
| -rw-r--r-- | ui/base/cursor/cursor_loader_x11.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc index 9c2f609..0161da2 100644 --- a/ui/base/cursor/cursor_loader_x11.cc +++ b/ui/base/cursor/cursor_loader_x11.cc @@ -159,11 +159,12 @@ void CursorLoaderX11::LoadImageCursor(int 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); @@ -176,7 +177,8 @@ void CursorLoaderX11::LoadAnimatedCursor(int id, 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; @@ -231,7 +233,8 @@ void CursorLoaderX11::SetPlatformCursor(gfx::NativeCursor* cursor) { 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); |