diff options
| author | kalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 13:21:11 +0000 |
|---|---|---|
| committer | kalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 13:21:11 +0000 |
| commit | b84054fb216ccf322a970cabdde2b0bd34f60d5c (patch) | |
| tree | dd3e136c94d766a416b99c7d5cdc3370dec279b1 /ui/base/cursor/cursor_loader_ozone.cc | |
| parent | 934472e4bdec9005536ae401b07eaa7f87597c65 (diff) | |
| download | chromium_src-b84054fb216ccf322a970cabdde2b0bd34f60d5c.zip chromium_src-b84054fb216ccf322a970cabdde2b0bd34f60d5c.tar.gz chromium_src-b84054fb216ccf322a970cabdde2b0bd34f60d5c.tar.bz2 | |
Fix potential crash in CursorLoaderOzone.
We load a different set of cursors with Ash and DesktopAura. Hence,
we cannot assume kCursorPointer is always loaded. Instead of making
any assumptions for default cursor image, we set this as NULL.
Review URL: https://codereview.chromium.org/179903006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/cursor/cursor_loader_ozone.cc')
| -rw-r--r-- | ui/base/cursor/cursor_loader_ozone.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/base/cursor/cursor_loader_ozone.cc b/ui/base/cursor/cursor_loader_ozone.cc index bbe524f..c853a3b 100644 --- a/ui/base/cursor/cursor_loader_ozone.cc +++ b/ui/base/cursor/cursor_loader_ozone.cc @@ -64,11 +64,9 @@ void CursorLoaderOzone::SetPlatformCursor(gfx::NativeCursor* cursor) { // TODO(dnicoara) Add support for custom cursors: crbug.com/343155 cursor->SetPlatformCursor(cursor->platform()); } else { - const gfx::ImageSkiaRep& image_rep = - cursors_[kCursorPointer]->GetRepresentation( - display().device_scale_factor()); - - cursor->SetPlatformCursor(&image_rep.sk_bitmap()); + // We load different set of cursors with Ash and DesktopAura. Since we do + // not have the resource for this cursor, set platform cursor to NULL. + cursor->SetPlatformCursor(NULL); } } |