webkit/common/cursors/webcursor_aurax11.cc - Issue 15971005: Move the WebCursor sources from webkit/glue to webkit/common/cursors.

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: webkit/common/cursors/webcursor_aurax11.cc

Issue 15971005: Move the WebCursor sources from webkit/glue to webkit/common/cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 6 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:

View unified diff | Download patch | Annotate | Revision Log

« content/browser/accessibility/browser_accessibility_win.cc ('K') | « webkit/common/cursors/webcursor_aurawin.cc ('k') | webkit/common/cursors/webcursor_gtk.cc » ('j') | webkit/common/webkit_common.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "webkit/glue/webcursor.h"	5 #include "webkit/common/cursors/webcursor.h"

6	6

7 #include <X11/Xcursor/Xcursor.h>	7 #include <X11/Xcursor/Xcursor.h>

8 #include <X11/Xlib.h>	8 #include <X11/Xlib.h>

9 #include <X11/cursorfont.h>	9 #include <X11/cursorfont.h>

10	10

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "skia/ext/image_operations.h"	12 #include "skia/ext/image_operations.h"

13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"	13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"

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

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

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84	84

85 void WebCursor::CopyPlatformData(const WebCursor& other) {	85 void WebCursor::CopyPlatformData(const WebCursor& other) {

86 if (platform_cursor_)	86 if (platform_cursor_)

87 ui::UnrefCustomXCursor(platform_cursor_);	87 ui::UnrefCustomXCursor(platform_cursor_);

88 platform_cursor_ = other.platform_cursor_;	88 platform_cursor_ = other.platform_cursor_;

89 if (platform_cursor_)	89 if (platform_cursor_)

90 ui::RefCustomXCursor(platform_cursor_);	90 ui::RefCustomXCursor(platform_cursor_);

91	91

92 device_scale_factor_ = other.device_scale_factor_;	92 device_scale_factor_ = other.device_scale_factor_;

93 }	93 }

OLD	NEW