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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2128503002: Set 'ResourceRequest::requestorOrigin' in Blink. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yay Created 4 years, 5 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 db7242bce67a9b0995cde3fe8a29c56a4d2fa453..3fc8e560284a0be1c8d9c3124f2874c91adbe199 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3927,16 +3927,10 @@ void RenderFrameImpl::willSendRequest(
request.setFirstPartyForCookies(frame->document().firstPartyForCookies());
}
- // Set the requestor origin to the same origin as the frame's document if it
- // hasn't yet been set.
- //
- // TODO(mkwst): It would be cleaner to adjust blink::ResourceRequest to
- // initialize itself with a `nullptr` initiator so that this can be a simple
- // `isNull()` check.
- if (request.requestorOrigin().isUnique() &&
- !frame->document().getSecurityOrigin().isUnique()) {
- request.setRequestorOrigin(frame->document().getSecurityOrigin());
- }
+ // Unless we're navigating to a browser-generated error page, requests must
+ // have initiators.
+ DCHECK(!request.requestorOrigin().isNull() ||
+ request.url() == GURL(kUnreachableWebDataURL));
WebDataSource* provisional_data_source = frame->provisionalDataSource();
WebDataSource* data_source =

Powered by Google App Engine
This is Rietveld 408576698