third_party/WebKit/Source/core/dom/DocumentInit.cpp - Issue 1617043002: Introduce AncestorThrottle, which will process 'X-Frame-Options' headers.

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/dom/DocumentInit.cpp

Issue 1617043002: Introduce AncestorThrottle, which will process 'X-Frame-Options' headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@block-response

Patch Set: DCHECK. 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

« content/public/browser/navigation_throttle.h ('K') | « third_party/WebKit/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt ('k') | third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/DocumentInit.cpp

diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/third_party/WebKit/Source/core/dom/DocumentInit.cpp

index df71028100069e2471b3b152f2cad66d4a932f10..6a8c79eaf283ef8f83ed812faf53b2704e7a6be7 100644

--- a/third_party/WebKit/Source/core/dom/DocumentInit.cpp

+++ b/third_party/WebKit/Source/core/dom/DocumentInit.cpp

@@ -98,11 +98,10 @@ SandboxFlags DocumentInit::getSandboxFlags() const

FrameLoader* loader = &frameForSecurityContext()->loader();

SandboxFlags flags = loader->effectiveSandboxFlags();

- // If the load was blocked by X-Frame-Options or CSP, force the Document's

- // origin to be unique, so that the blocked document appears to be a normal

- // cross-origin document's load per CSP spec:

+ // If the load was blocked by CSP, force the Document's origin to be unique, so that

+ // the blocked document appears to be a normal cross-origin document's load per CSP spec:

// https://www.w3.org/TR/CSP2/#directive-frame-ancestors

- if (loader->documentLoader() && loader->documentLoader()->wasBlockedAfterXFrameOptionsOrCSP())

+ if (loader->documentLoader() && loader->documentLoader()->wasBlockedAfterCSP())

flags |= SandboxOrigin;

return flags;