chromium/src
0
Fork 0
Code Activity

Fix incorrect use of UnrefCustomCursor.

Browse Source 
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
This commit is contained in:
mazda@chromium.org
2012-09-13 02:34:49 +00:00
parent 1cd1220f61
commit 0964345b53
2 changed files with 5 additions and 3 deletions

2
ui/base/cursor/cursor.cc

@@ -42,9 +42,9 @@ void Cursor::SetPlatformCursor(const PlatformCursor& platform) {
void Cursor::Assign(const Cursor& cursor) { void Cursor::Assign(const Cursor& cursor) {
if (*this == cursor) if (*this == cursor)
return; return;
native_type_ = cursor.native_type_;
if (native_type_ == kCursorCustom) if (native_type_ == kCursorCustom)
UnrefCustomCursor(); UnrefCustomCursor();
native_type_ = cursor.native_type_;
platform_cursor_ = cursor.platform_cursor_; platform_cursor_ = cursor.platform_cursor_;
if (native_type_ == kCursorCustom) if (native_type_ == kCursorCustom)
RefCustomCursor(); RefCustomCursor();

6
ui/base/cursor/cursor_x11.cc

@@ -9,11 +9,13 @@
namespace ui { namespace ui {
void Cursor::RefCustomCursor() { void Cursor::RefCustomCursor() {
ui::RefCustomXCursor(platform_cursor_); if (platform_cursor_)
ui::RefCustomXCursor(platform_cursor_);
} }
void Cursor::UnrefCustomCursor() { void Cursor::UnrefCustomCursor() {
ui::UnrefCustomXCursor(platform_cursor_); if (platform_cursor_)
ui::UnrefCustomXCursor(platform_cursor_);
} }
} // namespace ui } // namespace ui