diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 02:34:49 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 02:34:49 +0000 |
| commit | 0964345b534a3e2daf3a3ef3d6924644d7981596 (patch) | |
| tree | 0f6b25d138c3412069b74ef0ec41fb3272028b90 /ui | |
| parent | 1cd1220f61a456e31d91156a8534a39d8819e59b (diff) | |
| download | chromium_src-0964345b534a3e2daf3a3ef3d6924644d7981596.zip chromium_src-0964345b534a3e2daf3a3ef3d6924644d7981596.tar.gz chromium_src-0964345b534a3e2daf3a3ef3d6924644d7981596.tar.bz2 | |
Fix incorrect use of UnrefCustomCursor.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10928154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/cursor/cursor.cc | 2 | ||||
| -rw-r--r-- | ui/base/cursor/cursor_x11.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/base/cursor/cursor.cc b/ui/base/cursor/cursor.cc index 223042e..8396355 100644 --- a/ui/base/cursor/cursor.cc +++ b/ui/base/cursor/cursor.cc @@ -42,9 +42,9 @@ void Cursor::SetPlatformCursor(const PlatformCursor& platform) { void Cursor::Assign(const Cursor& cursor) { if (*this == cursor) return; - native_type_ = cursor.native_type_; if (native_type_ == kCursorCustom) UnrefCustomCursor(); + native_type_ = cursor.native_type_; platform_cursor_ = cursor.platform_cursor_; if (native_type_ == kCursorCustom) RefCustomCursor(); diff --git a/ui/base/cursor/cursor_x11.cc b/ui/base/cursor/cursor_x11.cc index b74d03c..edf6c9b 100644 --- a/ui/base/cursor/cursor_x11.cc +++ b/ui/base/cursor/cursor_x11.cc @@ -9,11 +9,13 @@ namespace ui { void Cursor::RefCustomCursor() { - ui::RefCustomXCursor(platform_cursor_); + if (platform_cursor_) + ui::RefCustomXCursor(platform_cursor_); } void Cursor::UnrefCustomCursor() { - ui::UnrefCustomXCursor(platform_cursor_); + if (platform_cursor_) + ui::UnrefCustomXCursor(platform_cursor_); } } // namespace ui |