OLD | NEW |
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 "Node.h" |
26 #include "PlatformString.h" | 26 #include "PlatformString.h" |
27 #include "Range.h" | 27 #include "Range.h" |
28 #include "ResourceError.h" | 28 #include "ResourceError.h" |
| 29 #include "SecurityOrigin.h" |
29 | 30 |
30 #undef LOG | 31 #undef LOG |
31 #include "base/compiler_specific.h" | 32 #include "base/compiler_specific.h" |
32 #include "base/gfx/rect.h" | 33 #include "base/gfx/rect.h" |
33 #include "base/string_piece.h" | 34 #include "base/string_piece.h" |
34 #include "base/string_util.h" | 35 #include "base/string_util.h" |
35 #include "base/sys_string_conversions.h" | 36 #include "base/sys_string_conversions.h" |
36 #include "googleurl/src/gurl.h" | 37 #include "googleurl/src/gurl.h" |
37 #include "webkit/api/public/WebCursorInfo.h" | 38 #include "webkit/api/public/WebCursorInfo.h" |
38 #include "webkit/api/public/WebDragData.h" | 39 #include "webkit/api/public/WebDragData.h" |
39 #include "webkit/api/public/WebForm.h" | 40 #include "webkit/api/public/WebForm.h" |
40 #include "webkit/api/public/WebHistoryItem.h" | 41 #include "webkit/api/public/WebHistoryItem.h" |
41 #include "webkit/api/public/WebNode.h" | 42 #include "webkit/api/public/WebNode.h" |
42 #include "webkit/api/public/WebPoint.h" | 43 #include "webkit/api/public/WebPoint.h" |
43 #include "webkit/api/public/WebRange.h" | 44 #include "webkit/api/public/WebRange.h" |
44 #include "webkit/api/public/WebRect.h" | 45 #include "webkit/api/public/WebRect.h" |
| 46 #include "webkit/api/public/WebSecurityOrigin.h" |
45 #include "webkit/api/public/WebSize.h" | 47 #include "webkit/api/public/WebSize.h" |
46 #include "webkit/api/public/WebString.h" | 48 #include "webkit/api/public/WebString.h" |
47 #include "webkit/api/public/WebURL.h" | 49 #include "webkit/api/public/WebURL.h" |
48 #include "webkit/api/public/WebURLError.h" | 50 #include "webkit/api/public/WebURLError.h" |
49 #include "webkit/api/public/WebURLRequest.h" | 51 #include "webkit/api/public/WebURLRequest.h" |
50 #include "webkit/api/public/WebURLResponse.h" | 52 #include "webkit/api/public/WebURLResponse.h" |
51 | 53 |
52 namespace webkit_glue { | 54 namespace webkit_glue { |
53 | 55 |
54 // String conversions ---------------------------------------------------------- | 56 // String conversions ---------------------------------------------------------- |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 // WebRange conversions -------------------------------------------------------- | 292 // WebRange conversions -------------------------------------------------------- |
291 | 293 |
292 WebKit::WebRange RangeToWebRange(const WTF::PassRefPtr<WebCore::Range>& range) { | 294 WebKit::WebRange RangeToWebRange(const WTF::PassRefPtr<WebCore::Range>& range) { |
293 return range; | 295 return range; |
294 } | 296 } |
295 | 297 |
296 WTF::PassRefPtr<WebCore::Range> WebRangeToRange(const WebKit::WebRange& range) { | 298 WTF::PassRefPtr<WebCore::Range> WebRangeToRange(const WebKit::WebRange& range) { |
297 return range; | 299 return range; |
298 } | 300 } |
299 | 301 |
| 302 // WebSecurityOrigin conversions ----------------------------------------------- |
| 303 |
| 304 WebKit::WebSecurityOrigin SecurityOriginToWebSecurityOrigin( |
| 305 const WTF::PassRefPtr<WebCore::SecurityOrigin>& origin) { |
| 306 return origin; |
| 307 } |
| 308 |
300 // WebURLError conversions ----------------------------------------------------- | 309 // WebURLError conversions ----------------------------------------------------- |
301 | 310 |
302 WebKit::WebURLError ResourceErrorToWebURLError( | 311 WebKit::WebURLError ResourceErrorToWebURLError( |
303 const WebCore::ResourceError& error) { | 312 const WebCore::ResourceError& error) { |
304 return error; | 313 return error; |
305 } | 314 } |
306 | 315 |
307 WebCore::ResourceError WebURLErrorToResourceError( | 316 WebCore::ResourceError WebURLErrorToResourceError( |
308 const WebKit::WebURLError& error) { | 317 const WebKit::WebURLError& error) { |
309 return error; | 318 return error; |
(...skipping 17 matching lines...) Expand all Loading... |
327 WebKit::WebURLResponse* response) { | 336 WebKit::WebURLResponse* response) { |
328 return &response->toMutableResourceResponse(); | 337 return &response->toMutableResourceResponse(); |
329 } | 338 } |
330 | 339 |
331 const WebCore::ResourceResponse* WebURLResponseToResourceResponse( | 340 const WebCore::ResourceResponse* WebURLResponseToResourceResponse( |
332 const WebKit::WebURLResponse* response) { | 341 const WebKit::WebURLResponse* response) { |
333 return &response->toResourceResponse(); | 342 return &response->toResourceResponse(); |
334 } | 343 } |
335 | 344 |
336 } // namespace webkit_glue | 345 } // namespace webkit_glue |
OLD | NEW |