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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1315023004: PlzNavigate: Add parameters to navigation structures for ServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: LOCATION Created 5 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 339d818953fafa5f75e9d3819d5bcdec2c2aae70..551545eb266cc147cb0d83ef246234a110e9dd27 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4926,12 +4926,30 @@ void RenderFrameImpl::BeginNavigation(blink::WebURLRequest* request) {
if (data_source && render_view_->history_list_length_ > 0) {
should_replace_current_entry = data_source->replacesCurrentHistoryItem();
}
+
+ // These values are assumed on the browser side for navigations. These checks
+ // ensure the renderer has the correct values.
+ DCHECK_EQ(FETCH_REQUEST_MODE_SAME_ORIGIN,
+ GetFetchRequestModeForWebURLRequest(*request));
+ DCHECK_EQ(FETCH_CREDENTIALS_MODE_INCLUDE,
+ GetFetchCredentialsModeForWebURLRequest(*request));
+ DCHECK(GetFetchRedirectModeForWebURLRequest(*request) ==
+ FetchRedirectMode::MANUAL_MODE);
+ DCHECK_IMPLIES(!frame_->parent(),
+ GetRequestContextFrameTypeForWebURLRequest(*request) ==
+ REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
+ DCHECK_IMPLIES(frame_->parent(),
+ GetRequestContextFrameTypeForWebURLRequest(*request) ==
+ REQUEST_CONTEXT_FRAME_TYPE_NESTED);
+
Send(new FrameHostMsg_BeginNavigation(
routing_id_,
MakeCommonNavigationParams(request, should_replace_current_entry),
BeginNavigationParams(
request->httpMethod().latin1(), GetWebURLRequestHeaders(*request),
- GetLoadFlagsForWebURLRequest(*request), request->hasUserGesture()),
+ GetLoadFlagsForWebURLRequest(*request), request->hasUserGesture(),
+ request->skipServiceWorker(),
+ GetRequestContextTypeForWebURLRequest(*request)),
GetRequestBodyForWebURLRequest(*request)));
}

Powered by Google App Engine
This is Rietveld 408576698