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

Side by Side Diff: webkit/glue/glue_util.cc

Issue 155172: Start using WebCursorInfo from the WebKit API. WebCursorInfo is a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « webkit/glue/glue_util.h ('k') | webkit/glue/plugins/webplugin_delegate_impl.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 (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // TODO(darin): This file will be deleted once we complete the move to 5 // TODO(darin): This file will be deleted once we complete the move to
6 // webkit/api 6 // webkit/api
7 7
8 // In this file, we pretend to be part of the WebKit implementation. 8 // In this file, we pretend to be part of the WebKit implementation.
9 // This is just a temporary hack while glue is still being moved into 9 // This is just a temporary hack while glue is still being moved into
10 // webkit/api. 10 // webkit/api.
(...skipping 14 matching lines...) Expand all
25 #include "PlatformString.h" 25 #include "PlatformString.h"
26 #include "ResourceError.h" 26 #include "ResourceError.h"
27 27
28 #undef LOG 28 #undef LOG
29 #include "base/compiler_specific.h" 29 #include "base/compiler_specific.h"
30 #include "base/gfx/rect.h" 30 #include "base/gfx/rect.h"
31 #include "base/string_piece.h" 31 #include "base/string_piece.h"
32 #include "base/string_util.h" 32 #include "base/string_util.h"
33 #include "base/sys_string_conversions.h" 33 #include "base/sys_string_conversions.h"
34 #include "googleurl/src/gurl.h" 34 #include "googleurl/src/gurl.h"
35 #include "webkit/api/public/WebCursorInfo.h"
35 #include "webkit/api/public/WebDragData.h" 36 #include "webkit/api/public/WebDragData.h"
36 #include "webkit/api/public/WebForm.h" 37 #include "webkit/api/public/WebForm.h"
37 #include "webkit/api/public/WebHistoryItem.h" 38 #include "webkit/api/public/WebHistoryItem.h"
38 #include "webkit/api/public/WebPoint.h" 39 #include "webkit/api/public/WebPoint.h"
39 #include "webkit/api/public/WebRect.h" 40 #include "webkit/api/public/WebRect.h"
40 #include "webkit/api/public/WebSize.h" 41 #include "webkit/api/public/WebSize.h"
41 #include "webkit/api/public/WebString.h" 42 #include "webkit/api/public/WebString.h"
42 #include "webkit/api/public/WebURL.h" 43 #include "webkit/api/public/WebURL.h"
43 #include "webkit/api/public/WebURLError.h" 44 #include "webkit/api/public/WebURLError.h"
44 #include "webkit/api/public/WebURLRequest.h" 45 #include "webkit/api/public/WebURLRequest.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 // Size conversions ------------------------------------------------------------ 224 // Size conversions ------------------------------------------------------------
224 225
225 WebCore::IntSize WebSizeToIntSize(const WebKit::WebSize& size) { 226 WebCore::IntSize WebSizeToIntSize(const WebKit::WebSize& size) {
226 return size; 227 return size;
227 } 228 }
228 229
229 WebKit::WebSize IntSizeToWebSize(const WebCore::IntSize& size) { 230 WebKit::WebSize IntSizeToWebSize(const WebCore::IntSize& size) {
230 return size; 231 return size;
231 } 232 }
232 233
234 // Cursor conversions ----------------------------------------------------------
235
236 WebKit::WebCursorInfo CursorToWebCursorInfo(const WebCore::Cursor& cursor) {
237 return WebKit::WebCursorInfo(cursor);
238 }
239
233 // DragData conversions -------------------------------------------------------- 240 // DragData conversions --------------------------------------------------------
234 241
235 WebKit::WebDragData ChromiumDataObjectToWebDragData( 242 WebKit::WebDragData ChromiumDataObjectToWebDragData(
236 const PassRefPtr<WebCore::ChromiumDataObject>& data) { 243 const PassRefPtr<WebCore::ChromiumDataObject>& data) {
237 return data; 244 return data;
238 } 245 }
239 246
240 PassRefPtr<WebCore::ChromiumDataObject> WebDragDataToChromiumDataObject( 247 PassRefPtr<WebCore::ChromiumDataObject> WebDragDataToChromiumDataObject(
241 const WebKit::WebDragData& data) { 248 const WebKit::WebDragData& data) {
242 return data; 249 return data;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 WebKit::WebURLResponse* response) { 303 WebKit::WebURLResponse* response) {
297 return &response->toMutableResourceResponse(); 304 return &response->toMutableResourceResponse();
298 } 305 }
299 306
300 const WebCore::ResourceResponse* WebURLResponseToResourceResponse( 307 const WebCore::ResourceResponse* WebURLResponseToResourceResponse(
301 const WebKit::WebURLResponse* response) { 308 const WebKit::WebURLResponse* response) {
302 return &response->toResourceResponse(); 309 return &response->toResourceResponse();
303 } 310 }
304 311
305 } // namespace webkit_glue 312 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/glue_util.h ('k') | webkit/glue/plugins/webplugin_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698