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

Side by Side Diff

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

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

Side by Side Diff: ui/base/cursor/cursor_x11.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:

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/base/cursor/cursor.h"	5 #include "ui/base/cursor/cursor.h"

6	6

7 #include "ui/base/x/x11_util.h"	7 #include "ui/base/x/x11_util.h"

8	8

9 namespace ui {	9 namespace ui {

10	10

11 void Cursor::RefCustomCursor() {	11 void Cursor::RefCustomCursor() {

12 ui::RefCustomXCursor(platform_cursor_);	12 if (platform_cursor_)

	13 ui::RefCustomXCursor(platform_cursor_);
	sadrul 2012/09/12 19:46:56 Do you know where Ref/Unref is getting called but Do you know where Ref/Unref is getting called but platform_cursor_ is null? mazda 2012/09/12 19:56:43 That's the following lines in webkit/glue/webcurso Show quoted text On 2012/09/12 19:46:56, sadrul wrote: > Do you know where Ref/Unref is getting called but platform_cursor_ is null? That's the following lines in webkit/glue/webcursor_aura.cc (line 102). ui::Cursor cursor(ui::kCursorCustom); cursor.SetPlatformCursor(GetPlatformCursor());
13 }	14 }

14	15

15 void Cursor::UnrefCustomCursor() {	16 void Cursor::UnrefCustomCursor() {

16 ui::UnrefCustomXCursor(platform_cursor_);	17 if (platform_cursor_)

	18 ui::UnrefCustomXCursor(platform_cursor_);

17 }	19 }

18	20

19 } // namespace ui	21 } // namespace ui

OLD	NEW

« no previous file with comments | « ui/base/cursor/cursor.cc ('k') | no next file » | no next file with comments »