| commit | 2216f232f22777cabab33e2a889af82b5b92468d | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Mon Oct 22 23:45:05 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Mon Oct 22 23:45:05 2012 |
| tree | fe56924229bc1d7fc490649180dfd311cae2ae34 | |
| parent | b75e0ad9d0e78f14a9c477f155688b02b78e26ad [diff] [blame] |
Ensure ImageCursor to load image cursors. After http://crrev.com/163108, ImageCursor does not load image cursors until a device scale factor other than 1.0f is set. This CL fixes that. BUG=157059 Review URL: https://chromiumcodereview.appspot.com/11235030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163443 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/wm/cursor_manager.cc b/ash/wm/cursor_manager.cc index d1bfa83..b2510517 100644 --- a/ash/wm/cursor_manager.cc +++ b/ash/wm/cursor_manager.cc
@@ -69,10 +69,8 @@ } void CursorManager::SetDeviceScaleFactor(float device_scale_factor) { - if (image_cursors_->GetDeviceScaleFactor() == device_scale_factor) - return; - image_cursors_->SetDeviceScaleFactor(device_scale_factor); - SetCursorInternal(current_cursor_); + if (image_cursors_->SetDeviceScaleFactor(device_scale_factor)) + SetCursorInternal(current_cursor_); } void CursorManager::LockCursor() {