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/child/blink_platform_impl.h" | 5 #include "content/child/blink_platform_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "content/child/notifications/notification_dispatcher.h" | 36 #include "content/child/notifications/notification_dispatcher.h" |
37 #include "content/child/notifications/notification_manager.h" | 37 #include "content/child/notifications/notification_manager.h" |
38 #include "content/child/permissions/permission_dispatcher.h" | 38 #include "content/child/permissions/permission_dispatcher.h" |
39 #include "content/child/permissions/permission_dispatcher_thread_proxy.h" | 39 #include "content/child/permissions/permission_dispatcher_thread_proxy.h" |
40 #include "content/child/push_messaging/push_dispatcher.h" | 40 #include "content/child/push_messaging/push_dispatcher.h" |
41 #include "content/child/push_messaging/push_provider.h" | 41 #include "content/child/push_messaging/push_provider.h" |
42 #include "content/child/thread_safe_sender.h" | 42 #include "content/child/thread_safe_sender.h" |
43 #include "content/child/web_discardable_memory_impl.h" | 43 #include "content/child/web_discardable_memory_impl.h" |
44 #include "content/child/web_gesture_curve_impl.h" | 44 #include "content/child/web_gesture_curve_impl.h" |
45 #include "content/child/web_url_loader_impl.h" | 45 #include "content/child/web_url_loader_impl.h" |
| 46 #include "content/child/web_url_request_util.h" |
46 #include "content/child/websocket_bridge.h" | 47 #include "content/child/websocket_bridge.h" |
47 #include "content/child/webthread_impl.h" | 48 #include "content/child/webthread_impl.h" |
48 #include "content/child/worker_task_runner.h" | 49 #include "content/child/worker_task_runner.h" |
49 #include "content/public/common/content_client.h" | 50 #include "content/public/common/content_client.h" |
50 #include "net/base/data_url.h" | 51 #include "net/base/data_url.h" |
51 #include "net/base/mime_util.h" | 52 #include "net/base/mime_util.h" |
52 #include "net/base/net_errors.h" | 53 #include "net/base/net_errors.h" |
53 #include "net/base/net_util.h" | 54 #include "net/base/net_util.h" |
54 #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h" | 55 #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h" |
55 #include "third_party/WebKit/public/platform/WebData.h" | 56 #include "third_party/WebKit/public/platform/WebData.h" |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 && net::IsSupportedMimeType(mime_type)) { | 487 && net::IsSupportedMimeType(mime_type)) { |
487 mimetype_out = WebString::fromUTF8(mime_type); | 488 mimetype_out = WebString::fromUTF8(mime_type); |
488 charset_out = WebString::fromUTF8(char_set); | 489 charset_out = WebString::fromUTF8(char_set); |
489 return data; | 490 return data; |
490 } | 491 } |
491 return WebData(); | 492 return WebData(); |
492 } | 493 } |
493 | 494 |
494 WebURLError BlinkPlatformImpl::cancelledError( | 495 WebURLError BlinkPlatformImpl::cancelledError( |
495 const WebURL& unreachableURL) const { | 496 const WebURL& unreachableURL) const { |
496 return WebURLLoaderImpl::CreateError(unreachableURL, false, net::ERR_ABORTED); | 497 return CreateWebURLError(unreachableURL, false, net::ERR_ABORTED); |
497 } | 498 } |
498 | 499 |
499 bool BlinkPlatformImpl::isReservedIPAddress( | 500 bool BlinkPlatformImpl::isReservedIPAddress( |
500 const blink::WebString& host) const { | 501 const blink::WebString& host) const { |
501 net::IPAddressNumber address; | 502 net::IPAddressNumber address; |
502 if (!net::ParseURLHostnameToNumber(host.utf8(), &address)) | 503 if (!net::ParseURLHostnameToNumber(host.utf8(), &address)) |
503 return false; | 504 return false; |
504 return net::IsIPAddressReserved(address); | 505 return net::IsIPAddressReserved(address); |
505 } | 506 } |
506 | 507 |
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1255 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( | 1256 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( |
1256 static_cast<ui::DomCode>(dom_code))); | 1257 static_cast<ui::DomCode>(dom_code))); |
1257 } | 1258 } |
1258 | 1259 |
1259 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { | 1260 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { |
1260 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( | 1261 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( |
1261 code.utf8().data())); | 1262 code.utf8().data())); |
1262 } | 1263 } |
1263 | 1264 |
1264 } // namespace content | 1265 } // namespace content |
OLD | NEW |