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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 958083002: PlzNavigate: Show error pages when the navigation failed before commit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@support-data-urls
Patch Set: Updated test Created 5 years, 8 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
OLDNEW
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
36 #include "content/child/navigator_connect/navigator_connect_provider.h" 36 #include "content/child/navigator_connect/navigator_connect_provider.h"
37 #include "content/child/notifications/notification_dispatcher.h" 37 #include "content/child/notifications/notification_dispatcher.h"
38 #include "content/child/notifications/notification_manager.h" 38 #include "content/child/notifications/notification_manager.h"
39 #include "content/child/permissions/permission_dispatcher.h" 39 #include "content/child/permissions/permission_dispatcher.h"
40 #include "content/child/permissions/permission_dispatcher_thread_proxy.h" 40 #include "content/child/permissions/permission_dispatcher_thread_proxy.h"
41 #include "content/child/push_messaging/push_dispatcher.h" 41 #include "content/child/push_messaging/push_dispatcher.h"
42 #include "content/child/push_messaging/push_provider.h" 42 #include "content/child/push_messaging/push_provider.h"
43 #include "content/child/thread_safe_sender.h" 43 #include "content/child/thread_safe_sender.h"
44 #include "content/child/web_discardable_memory_impl.h" 44 #include "content/child/web_discardable_memory_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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 && net::IsSupportedMimeType(mime_type)) { 488 && net::IsSupportedMimeType(mime_type)) {
488 mimetype_out = WebString::fromUTF8(mime_type); 489 mimetype_out = WebString::fromUTF8(mime_type);
489 charset_out = WebString::fromUTF8(char_set); 490 charset_out = WebString::fromUTF8(char_set);
490 return data; 491 return data;
491 } 492 }
492 return WebData(); 493 return WebData();
493 } 494 }
494 495
495 WebURLError BlinkPlatformImpl::cancelledError( 496 WebURLError BlinkPlatformImpl::cancelledError(
496 const WebURL& unreachableURL) const { 497 const WebURL& unreachableURL) const {
497 return WebURLLoaderImpl::CreateError(unreachableURL, false, net::ERR_ABORTED); 498 return CreateWebURLError(unreachableURL, false, net::ERR_ABORTED);
498 } 499 }
499 500
500 bool BlinkPlatformImpl::isReservedIPAddress( 501 bool BlinkPlatformImpl::isReservedIPAddress(
501 const blink::WebString& host) const { 502 const blink::WebString& host) const {
502 net::IPAddressNumber address; 503 net::IPAddressNumber address;
503 if (!net::ParseURLHostnameToNumber(host.utf8(), &address)) 504 if (!net::ParseURLHostnameToNumber(host.utf8(), &address))
504 return false; 505 return false;
505 return net::IsIPAddressReserved(address); 506 return net::IsIPAddressReserved(address);
506 } 507 }
507 508
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1319 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1319 static_cast<ui::DomCode>(dom_code))); 1320 static_cast<ui::DomCode>(dom_code)));
1320 } 1321 }
1321 1322
1322 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1323 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1323 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1324 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1324 code.utf8().data())); 1325 code.utf8().data()));
1325 } 1326 }
1326 1327
1327 } // namespace content 1328 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/child/web_url_loader_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698