content/common/cursors/webcursor_ozone.cc - Issue 312393002: ozone: Move the factory interfaces into a common target.

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: content/common/cursors/webcursor_ozone.cc

Issue 312393002: ozone: Move the factory interfaces into a common target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge-r278697 Created 6 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

« no previous file with comments | « content/browser/compositor/software_output_device_ozone_unittest.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "content/common/cursors/webcursor.h"	5 #include "content/common/cursors/webcursor.h"

6	6

7 #include "third_party/WebKit/public/platform/WebCursorInfo.h"	7 #include "third_party/WebKit/public/platform/WebCursorInfo.h"

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

9 #include "ui/base/cursor/cursor_util.h"	9 #include "ui/base/cursor/cursor_util.h"

10 #include "ui/base/cursor/ozone/cursor_factory_ozone.h"	10 #include "ui/ozone/public/cursor_factory_ozone.h"

11	11

12 namespace content {	12 namespace content {

13	13

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

15 if (platform_cursor_)	15 if (platform_cursor_)

16 return platform_cursor_;	16 return platform_cursor_;

17	17

18 SkBitmap bitmap;	18 SkBitmap bitmap;

19 ImageFromCustomData(&bitmap);	19 ImageFromCustomData(&bitmap);

20 gfx::Point hotspot = hotspot_;	20 gfx::Point hotspot = hotspot_;

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 if (platform_cursor_)	68 if (platform_cursor_)

69 ui::CursorFactoryOzone::GetInstance()->UnrefImageCursor(platform_cursor_);	69 ui::CursorFactoryOzone::GetInstance()->UnrefImageCursor(platform_cursor_);

70 platform_cursor_ = other.platform_cursor_;	70 platform_cursor_ = other.platform_cursor_;

71 if (platform_cursor_)	71 if (platform_cursor_)

72 ui::CursorFactoryOzone::GetInstance()->RefImageCursor(platform_cursor_);	72 ui::CursorFactoryOzone::GetInstance()->RefImageCursor(platform_cursor_);

73	73

74 device_scale_factor_ = other.device_scale_factor_;	74 device_scale_factor_ = other.device_scale_factor_;

75 }	75 }

76	76

77 } // namespace content	77 } // namespace content

OLD	NEW