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 /ash/test | |
| 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 'ash/test')
| -rw-r--r-- | ash/test/cursor_manager_test_api.cc | 11 | ||||
| -rw-r--r-- | ash/test/cursor_manager_test_api.h | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc index 4ff7cf7..22aa261 100644 --- a/ash/test/cursor_manager_test_api.cc +++ b/ash/test/cursor_manager_test_api.cc @@ -31,16 +31,9 @@ gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const { return cursor_manager_->GetCursor(); } -gfx::Display::Rotation -CursorManagerTestApi::GetCurrentCursorRotation() const { +gfx::Display CursorManagerTestApi::GetDisplay() const { return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> - image_cursors_->GetRotation(); -} - -float -CursorManagerTestApi::GetCurrentCursorScale() const { - return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()-> - image_cursors_->GetScale(); + image_cursors_->GetDisplay(); } } // namespace test diff --git a/ash/test/cursor_manager_test_api.h b/ash/test/cursor_manager_test_api.h index fce98ca..1b9c6b8 100644 --- a/ash/test/cursor_manager_test_api.h +++ b/ash/test/cursor_manager_test_api.h @@ -7,9 +7,12 @@ #include "base/basictypes.h" #include "ui/base/cursor/cursor.h" -#include "ui/gfx/display.h" #include "ui/gfx/native_widget_types.h" +namespace gfx { +class Display; +} + namespace wm { class CursorManager; } @@ -25,8 +28,7 @@ class CursorManagerTestApi { ui::CursorSetType GetCurrentCursorSet() const; gfx::NativeCursor GetCurrentCursor() const; - gfx::Display::Rotation GetCurrentCursorRotation() const; - float GetCurrentCursorScale() const; + gfx::Display GetDisplay() const; private: ::wm::CursorManager* cursor_manager_; |