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

Unified Diff: content/browser/frame_host/navigation_request.cc

Issue 2813243002: network service: pass PlzNavigate resulting data via mojo data pipe (Closed)
Patch Set: ahem Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/navigation_request.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index ab3135bbc74f9df44173788376c21f34941c9e05..4036937d35a7121727d7308a8b702d132d10d4f5 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -508,6 +508,7 @@ void NavigationRequest::OnRequestRedirected(
void NavigationRequest::OnResponseStarted(
const scoped_refptr<ResourceResponse>& response,
std::unique_ptr<StreamHandle> body,
+ mojo::ScopedDataPipeConsumerHandle consumer_handle,
const SSLStatus& ssl_status,
std::unique_ptr<NavigationData> navigation_data,
const GlobalRequestID& request_id,
@@ -580,6 +581,7 @@ void NavigationRequest::OnResponseStarted(
// Store the response and the StreamHandle until checks have been processed.
response_ = response;
body_ = std::move(body);
+ handle_ = std::move(consumer_handle);
// Check if the navigation should be allowed to proceed.
navigation_handle_->WillProcessResponse(
@@ -840,8 +842,8 @@ void NavigationRequest::CommitNavigation() {
DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
render_frame_host->CommitNavigation(response_.get(), std::move(body_),
- common_params_, request_params_,
- is_view_source_);
+ std::move(handle_), common_params_,
+ request_params_, is_view_source_);
frame_tree_node_->ResetNavigationRequest(true, true);
}
« no previous file with comments | « content/browser/frame_host/navigation_request.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698