third_party/WebKit/Source/web/WebLocalFrameImpl.cpp - Issue 1710283003: OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP.

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/web/WebLocalFrameImpl.cpp

Issue 1710283003: OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 10 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/test/data/frame-ancestors-none.html.mock-http-headers ('K') | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/public/web/WebFrameClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

index 9c745023a8341d069a13aacd951f104faa4e2ffa..c81d87cc5905aa13d3cfe97cb398470a33b8aae9 100644

--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -1989,6 +1989,12 @@ void WebLocalFrameImpl::loadData(const WebData& data, const WebString& mimeType,

static_cast<HistoryLoadType>(webHistoryLoadType));

}

+void WebLocalFrameImpl::cancelLoadAfterXFrameOptionsOrCSPDenied()

+ ASSERT(frame());

+ frame()->cancelLoadAfterXFrameOptionsOrCSPDenied();

bool WebLocalFrameImpl::isLoading() const

{

if (!frame() || !frame()->document())