third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2025633002: Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2025633002: Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: foolip@ Created 4 years, 7 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 | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

index c1c682d307eeb3b3702af5394873188c034fe27b..9f1fb8f9711f8afa4a2a051a96cd71da65e5d01f 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -1371,10 +1371,7 @@ bool FrameLoader::shouldContinueForNavigationPolicy(const ResourceRequest& reque

Frame* parentFrame = m_frame->tree().parent();

if (parentFrame) {

ContentSecurityPolicy* parentPolicy = parentFrame->securityContext()->contentSecurityPolicy();

- ContentSecurityPolicy::RedirectStatus redirectStatus = request.followedRedirect()

- ? ContentSecurityPolicy::DidRedirect

- : ContentSecurityPolicy::DidNotRedirect;

- if (!parentPolicy->allowChildFrameFromSource(request.url(), redirectStatus)) {

+ if (!parentPolicy->allowChildFrameFromSource(request.url(), request.redirectStatus())) {

// Fire a load event, as timing attacks would otherwise reveal that the

// frame was blocked. This way, it looks like every other cross-origin

// page load.