ui/base/cursor/cursor.cc - Issue 10928154: Fix incorrect use of UnrefCustomCursor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/cursor/cursor.cc

Issue 10928154: Fix incorrect use of UnrefCustomCursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: check if platform_cursor_ is non-zero in {Ref/Unref}CustomCursor. Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/base/cursor/cursor.cc

diff --git a/ui/base/cursor/cursor.cc b/ui/base/cursor/cursor.cc

index 223042e036f2dc667a20f0fdec55b77519a6e306..83963558ad0d2ac9926df3a135ebc83b03e8a00f 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();

« no previous file with comments | « no previous file | ui/base/cursor/cursor_x11.cc » ('j') | ui/base/cursor/cursor_x11.cc » ('J')