webkit/common/cursors/webcursor_aurax11.cc - Issue 68683009: Rewrite include paths for Blink public/ headers that have moved

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 68683009: Rewrite include paths for Blink public/ headers that have moved (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « webkit/common/cursors/webcursor_aurawin.cc ('k') | webkit/common/cursors/webcursor_gtk.cc » ('j') | no next file with comments »

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/common/cursors/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 "third_party/WebKit/public/web/WebCursorInfo.h"	12 #include "third_party/WebKit/public/platform/WebCursorInfo.h"

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

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

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

16	16

17 const ui::PlatformCursor WebCursor::GetPlatformCursor() {	17 const ui::PlatformCursor WebCursor::GetPlatformCursor() {

18 if (platform_cursor_)	18 if (platform_cursor_)

19 return platform_cursor_;	19 return platform_cursor_;

20	20

21 if (custom_data_.size() == 0)	21 if (custom_data_.size() == 0)

22 return 0;	22 return 0;

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76	76

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

78 if (platform_cursor_)	78 if (platform_cursor_)

79 ui::UnrefCustomXCursor(platform_cursor_);	79 ui::UnrefCustomXCursor(platform_cursor_);

80 platform_cursor_ = other.platform_cursor_;	80 platform_cursor_ = other.platform_cursor_;

81 if (platform_cursor_)	81 if (platform_cursor_)

82 ui::RefCustomXCursor(platform_cursor_);	82 ui::RefCustomXCursor(platform_cursor_);

83	83

84 device_scale_factor_ = other.device_scale_factor_;	84 device_scale_factor_ = other.device_scale_factor_;

85 }	85 }

OLD	NEW