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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2855763002: network service: Plumbing to get URLLoaderFactory to renderer on nav commit (Closed)
Patch Set: fixes 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/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ec495b9e0488e054be820d3e978b260280385dea..fc8a7952ff308041ecfcecb8ac207abe851fff4b 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5238,7 +5238,7 @@ void RenderFrameImpl::FocusedNodeChangedForAccessibility(const WebNode& node) {
void RenderFrameImpl::OnCommitNavigation(
const ResourceResponseHead& response,
const GURL& stream_url,
- mojo::DataPipeConsumerHandle handle,
+ const FrameMsg_CommitDataNetworkService_Params& commit_data,
const CommonNavigationParams& common_params,
const RequestNavigationParams& request_params) {
CHECK(IsBrowserSideNavigationEnabled());
@@ -5247,12 +5247,19 @@ void RenderFrameImpl::OnCommitNavigation(
std::unique_ptr<StreamOverrideParameters> stream_override(
new StreamOverrideParameters());
stream_override->stream_url = stream_url;
- stream_override->consumer_handle = mojo::ScopedDataPipeConsumerHandle(handle);
+ stream_override->consumer_handle =
+ mojo::ScopedDataPipeConsumerHandle(commit_data.handle);
stream_override->response = response;
stream_override->redirects = request_params.redirects;
stream_override->redirect_responses = request_params.redirect_response;
stream_override->redirect_infos = request_params.redirect_infos;
+ if (commit_data.url_loader_factory.is_valid()) {
+ // Chrome doesn't use interface versioning.
+ url_loader_factory_.Bind(mojom::URLLoaderFactoryPtrInfo(
+ mojo::ScopedMessagePipeHandle(commit_data.url_loader_factory), 0u));
+ }
+
// If the request was initiated in the context of a user gesture then make
// sure that the navigation also executes in the context of a user gesture.
std::unique_ptr<blink::WebScopedUserGesture> gesture(
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698