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/display/screen_ash.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 'ash/display/screen_ash.cc')
| -rw-r--r-- | ash/display/screen_ash.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc index 9d42e49e..d32deb8 100644 --- a/ash/display/screen_ash.cc +++ b/ash/display/screen_ash.cc @@ -234,8 +234,7 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const { return GetPrimaryDisplay(); const RootWindowSettings* rws = GetRootWindowSettings(root_window); if (rws->shutdown) - return GetPrimaryDisplay(); - + return gfx::Display(1); int64 id = rws->display_id; // if id is |kInvaildDisplayID|, it's being deleted. DCHECK(id != gfx::Display::kInvalidDisplayID); |