Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1119)

Side by Side Diff: content/renderer/cursor_utils.cc

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/cursor_utils.h ('k') | content/renderer/date_time_formatter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/cursor_utils.h" 5 #include "content/renderer/cursor_utils.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "third_party/WebKit/public/web/WebCursorInfo.h" 8 #include "third_party/WebKit/public/web/WebCursorInfo.h"
9 #include "webkit/common/cursors/webcursor.h" 9 #include "webkit/common/cursors/webcursor.h"
10 10
11 using WebKit::WebCursorInfo; 11 using blink::WebCursorInfo;
12 12
13 namespace content { 13 namespace content {
14 14
15 bool GetWebKitCursorInfo(const WebCursor& cursor, 15 bool GetWebKitCursorInfo(const WebCursor& cursor,
16 WebCursorInfo* webkit_cursor_info) { 16 WebCursorInfo* webkit_cursor_info) {
17 WebCursor::CursorInfo cursor_info; 17 WebCursor::CursorInfo cursor_info;
18 cursor.GetCursorInfo(&cursor_info); 18 cursor.GetCursorInfo(&cursor_info);
19 19
20 webkit_cursor_info->type = cursor_info.type; 20 webkit_cursor_info->type = cursor_info.type;
21 webkit_cursor_info->hotSpot = cursor_info.hotspot; 21 webkit_cursor_info->hotSpot = cursor_info.hotspot;
(...skipping 13 matching lines...) Expand all
35 web_cursor_info.image_scale_factor = webkit_cursor_info.imageScaleFactor; 35 web_cursor_info.image_scale_factor = webkit_cursor_info.imageScaleFactor;
36 web_cursor_info.hotspot = webkit_cursor_info.hotSpot; 36 web_cursor_info.hotspot = webkit_cursor_info.hotSpot;
37 web_cursor_info.custom_image = webkit_cursor_info.customImage.getSkBitmap(); 37 web_cursor_info.custom_image = webkit_cursor_info.customImage.getSkBitmap();
38 #if defined(OS_WIN) 38 #if defined(OS_WIN)
39 web_cursor_info.external_handle = webkit_cursor_info.externalHandle; 39 web_cursor_info.external_handle = webkit_cursor_info.externalHandle;
40 #endif 40 #endif
41 cursor->InitFromCursorInfo(web_cursor_info); 41 cursor->InitFromCursorInfo(web_cursor_info);
42 } 42 }
43 43
44 } // namespce content 44 } // namespce content
OLDNEW
« no previous file with comments | « content/renderer/cursor_utils.h ('k') | content/renderer/date_time_formatter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698