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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2316573002: PlzNavigate: Support ResourceTiming API (Closed)
Patch Set: Rebase Created 4 years, 2 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/pepper/pepper_url_loader_host.cc ('k') | media/blink/multibuffer_data_source_unittest.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 018ceadd69b3f87b97c45c20cb4c8fce1574ac5f..84a56cd9893bb4fcd8a456ff05244924402efe15 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4868,6 +4868,8 @@ void RenderFrameImpl::OnCommitNavigation(
new StreamOverrideParameters());
stream_override->stream_url = stream_url;
stream_override->response = response;
+ stream_override->redirects = request_params.redirects;
+ stream_override->redirect_responses = request_params.redirect_response;
// 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.
@@ -5545,11 +5547,15 @@ void RenderFrameImpl::NavigateInternal(
request.setHasUserGesture(request_params.has_user_gesture);
#endif
- // PlzNavigate: Make sure that Blink's loader will not try to use browser side
- // navigation for this request (since it already went to the browser).
- if (browser_side_navigation)
+ if (browser_side_navigation) {
+ // PlzNavigate: Make sure that Blink's loader will not try to use browser
+ // side navigation for this request (since it already went to the browser).
request.setCheckForBrowserSideNavigation(false);
+ request.setNavigationStartTime(
+ ConvertToBlinkTime(common_params.navigation_start));
+ }
+
// If we are reloading, then use the history state of the current frame.
// Otherwise, if we have history state, then we need to navigate to it, which
// corresponds to a back/forward navigation event. Update the parameters
« no previous file with comments | « content/renderer/pepper/pepper_url_loader_host.cc ('k') | media/blink/multibuffer_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698