Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/base/cursor/cursor_loader_x11.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/base/clipboard/clipboard_win.cc ('k') | trunk/src/ui/base/cursor/cursors_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/base/cursor/cursor_loader_x11.cc
===================================================================
--- trunk/src/ui/base/cursor/cursor_loader_x11.cc (revision 224498)
+++ trunk/src/ui/base/cursor/cursor_loader_x11.cc (working copy)
@@ -159,7 +159,7 @@
const gfx::ImageSkia* image =
ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(
- display().device_scale_factor());
+ GetScaleFactorFromScale(display().device_scale_factor()));
SkBitmap bitmap = image_rep.sk_bitmap();
gfx::Point hotpoint = hot;
ScaleAndRotateCursorBitmapAndHotpoint(
@@ -177,7 +177,7 @@
const gfx::ImageSkia* image =
ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(
- display().device_scale_factor());
+ GetScaleFactorFromScale(display().device_scale_factor()));
SkBitmap bitmap = image_rep.sk_bitmap();
int frame_width = bitmap.height();
int frame_height = frame_width;
« no previous file with comments | « trunk/src/ui/base/clipboard/clipboard_win.cc ('k') | trunk/src/ui/base/cursor/cursors_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698