summaryrefslogtreecommitdiffstats
path: root/ui/base/cursor/cursor_loader.h
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-23 13:24:08 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-23 13:24:08 +0000
commitdb2f05dd09ab30b49356b01997501890c6e427ba (patch)
tree97f34b2d574039a60139539c2bcbeaa499157fcc /ui/base/cursor/cursor_loader.h
parent0651dcf0c09e481b6aa3a5340b72ba30ecc58106 (diff)
downloadchromium_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.h')
-rw-r--r--ui/base/cursor/cursor_loader.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/ui/base/cursor/cursor_loader.h b/ui/base/cursor/cursor_loader.h
index 0e16237..8526e29 100644
--- a/ui/base/cursor/cursor_loader.h
+++ b/ui/base/cursor/cursor_loader.h
@@ -19,12 +19,14 @@ class UI_BASE_EXPORT CursorLoader {
CursorLoader() : scale_(1.f) {}
virtual ~CursorLoader() {}
- gfx::Display::Rotation rotation() const {
- return rotation_;
+ // Returns the display the loader loads images for.
+ const gfx::Display& display() const {
+ return display_;
}
- void set_rotation(gfx::Display::Rotation rotation) {
- rotation_ = rotation;
+ // Sets the display the loader loads images for.
+ void set_display(const gfx::Display& display) {
+ display_ = display;
}
// Returns the current scale of the mouse cursor icon.
@@ -62,8 +64,8 @@ class UI_BASE_EXPORT CursorLoader {
static CursorLoader* Create();
private:
- // The current rotation of the mouse cursor icon.
- gfx::Display::Rotation rotation_;
+ // The display the loader loads images for.
+ gfx::Display display_;
// The current scale of the mouse cursor icon.
float scale_;