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

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

Issue 159471: Merge 21466 - Allow the browser to send actions back to the render for media ... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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/webview.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/glue_util.cc:r3734-4217,4606-5108,5177-5263
Merged /trunk/src/webkit/glue/glue_util.cc:r21466
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.
11 #define WEBKIT_IMPLEMENTATION 1 11 #define WEBKIT_IMPLEMENTATION 1
12 12
13 #include "config.h" 13 #include "config.h"
14 #include "webkit/glue/glue_util.h" 14 #include "webkit/glue/glue_util.h"
15 15
16 #include <string> 16 #include <string>
17 17
18 #include "ChromiumDataObject.h" 18 #include "ChromiumDataObject.h"
19 #include "CString.h" 19 #include "CString.h"
20 #include "HistoryItem.h" 20 #include "HistoryItem.h"
21 #include "HTMLFormElement.h" 21 #include "HTMLFormElement.h"
22 #include "IntPoint.h" 22 #include "IntPoint.h"
23 #include "IntRect.h" 23 #include "IntRect.h"
24 #include "KURL.h" 24 #include "KURL.h"
25 #include "Node.h"
25 #include "PlatformString.h" 26 #include "PlatformString.h"
26 #include "ResourceError.h" 27 #include "ResourceError.h"
27 28
28 #undef LOG 29 #undef LOG
29 #include "base/compiler_specific.h" 30 #include "base/compiler_specific.h"
30 #include "base/gfx/rect.h" 31 #include "base/gfx/rect.h"
31 #include "base/string_piece.h" 32 #include "base/string_piece.h"
32 #include "base/string_util.h" 33 #include "base/string_util.h"
33 #include "base/sys_string_conversions.h" 34 #include "base/sys_string_conversions.h"
34 #include "googleurl/src/gurl.h" 35 #include "googleurl/src/gurl.h"
35 #include "webkit/api/public/WebCursorInfo.h" 36 #include "webkit/api/public/WebCursorInfo.h"
36 #include "webkit/api/public/WebDragData.h" 37 #include "webkit/api/public/WebDragData.h"
37 #include "webkit/api/public/WebForm.h" 38 #include "webkit/api/public/WebForm.h"
38 #include "webkit/api/public/WebHistoryItem.h" 39 #include "webkit/api/public/WebHistoryItem.h"
40 #include "webkit/api/public/WebNode.h"
39 #include "webkit/api/public/WebPoint.h" 41 #include "webkit/api/public/WebPoint.h"
40 #include "webkit/api/public/WebRect.h" 42 #include "webkit/api/public/WebRect.h"
41 #include "webkit/api/public/WebSize.h" 43 #include "webkit/api/public/WebSize.h"
42 #include "webkit/api/public/WebString.h" 44 #include "webkit/api/public/WebString.h"
43 #include "webkit/api/public/WebURL.h" 45 #include "webkit/api/public/WebURL.h"
44 #include "webkit/api/public/WebURLError.h" 46 #include "webkit/api/public/WebURLError.h"
45 #include "webkit/api/public/WebURLRequest.h" 47 #include "webkit/api/public/WebURLRequest.h"
46 #include "webkit/api/public/WebURLResponse.h" 48 #include "webkit/api/public/WebURLResponse.h"
47 49
48 namespace webkit_glue { 50 namespace webkit_glue {
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 WebKit::WebForm HTMLFormElementToWebForm( 256 WebKit::WebForm HTMLFormElementToWebForm(
255 const WTF::PassRefPtr<WebCore::HTMLFormElement>& form) { 257 const WTF::PassRefPtr<WebCore::HTMLFormElement>& form) {
256 return form; 258 return form;
257 } 259 }
258 260
259 WTF::PassRefPtr<WebCore::HTMLFormElement> WebFormToHTMLFormElement( 261 WTF::PassRefPtr<WebCore::HTMLFormElement> WebFormToHTMLFormElement(
260 const WebKit::WebForm& form) { 262 const WebKit::WebForm& form) {
261 return form; 263 return form;
262 } 264 }
263 265
266 // WebNode conversions ---------------------------------------------------------
267 WebKit::WebNode NodeToWebNode(const WTF::PassRefPtr<WebCore::Node>& node) {
268 return node;
269 }
270 WTF::PassRefPtr<WebCore::Node> WebNodeToNode(const WebKit::WebNode& node) {
271 return node;
272 }
273
264 // WebHistoryItem conversions -------------------------------------------------- 274 // WebHistoryItem conversions --------------------------------------------------
265 275
266 WebKit::WebHistoryItem HistoryItemToWebHistoryItem( 276 WebKit::WebHistoryItem HistoryItemToWebHistoryItem(
267 const WTF::PassRefPtr<WebCore::HistoryItem>& item) { 277 const WTF::PassRefPtr<WebCore::HistoryItem>& item) {
268 return item; 278 return item;
269 } 279 }
270 280
271 WTF::PassRefPtr<WebCore::HistoryItem> WebHistoryItemToHistoryItem( 281 WTF::PassRefPtr<WebCore::HistoryItem> WebHistoryItemToHistoryItem(
272 const WebKit::WebHistoryItem& item) { 282 const WebKit::WebHistoryItem& item) {
273 return item; 283 return item;
(...skipping 29 matching lines...) Expand all
303 WebKit::WebURLResponse* response) { 313 WebKit::WebURLResponse* response) {
304 return &response->toMutableResourceResponse(); 314 return &response->toMutableResourceResponse();
305 } 315 }
306 316
307 const WebCore::ResourceResponse* WebURLResponseToResourceResponse( 317 const WebCore::ResourceResponse* WebURLResponseToResourceResponse(
308 const WebKit::WebURLResponse* response) { 318 const WebKit::WebURLResponse* response) {
309 return &response->toResourceResponse(); 319 return &response->toResourceResponse();
310 } 320 }
311 321
312 } // namespace webkit_glue 322 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/glue_util.h ('k') | webkit/glue/webview.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698