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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1693563002: PROTOTYPE: PlzNavigate: use a Mojo data pipe to stream navigation data to the renderer. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Browser sends URLRequest id to the renderer and renderer uses intermediary buffer for data: none he… Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/navigation_url_loader_unittest.cc ('k') | content/child/mojo_pipe_received_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index b2a1e051ae98f8b344aef0a5cf4b4723bdc13a8b..eabf1d01f87319cbd71ffe385fbf51d91ee357d0 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1379,8 +1379,11 @@ void ResourceDispatcherHostImpl::BeginRequest(
bool is_navigation_stream_request =
IsBrowserSideNavigationEnabled() &&
IsResourceTypeFrame(request_data.resource_type);
+ // TODO(carlosk): We have to work something out later to confirm this request
+ // is indeed for a navigation streaming through Mojo.
if (is_navigation_stream_request &&
- !request_data.resource_body_stream_url.SchemeIs(url::kBlobScheme)) {
+ (!request_data.resource_body_stream_url.SchemeIs(url::kBlobScheme) ||
+ request_data.resource_body_stream_url.is_empty())) {
bad_message::ReceivedBadMessage(filter_, bad_message::RDH_INVALID_URL);
return;
}
@@ -1711,7 +1714,9 @@ scoped_ptr<ResourceHandler> ResourceDispatcherHostImpl::AddStandardHandlers(
// initial request.
if (IsBrowserSideNavigationEnabled() && IsResourceTypeFrame(resource_type) &&
child_id != -1) {
- DCHECK(request->url().SchemeIs(url::kBlobScheme));
+ // TODO(carlosk): We have to work something out later to confirm this
+ // request is indeed for a navigation streaming through Mojo.
+ // DCHECK(request->url().SchemeIs(url::kBlobScheme));
return handler;
}
« no previous file with comments | « content/browser/loader/navigation_url_loader_unittest.cc ('k') | content/child/mojo_pipe_received_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698