third_party/WebKit/Source/core/loader/DocumentLoader.h - Issue 2068443002: Revert of Move 'frame-src' CSP checks into FrameFetchContext.

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/DocumentLoader.h

Issue 2068443002: Revert of Move 'frame-src' CSP checks into FrameFetchContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: run revert on local machine to resolve conflicts Created 4 years, 6 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/LayoutTests/http/tests/security/upgrade-insecure-requests/iframe-upgrade-csp.https.html ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/DocumentLoader.h

diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.h b/third_party/WebKit/Source/core/loader/DocumentLoader.h

index c76a1a81e06b24727140a758f958a11571103d42..acdd1efa89be2e1478ee0b4a42da30983f8a5cf2 100644

--- a/third_party/WebKit/Source/core/loader/DocumentLoader.h

+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.h

@@ -112,7 +112,7 @@ public:

NavigationType getNavigationType() const { return m_navigationType; }

void setNavigationType(NavigationType navigationType) { m_navigationType = navigationType; }

- void startLoadingMainResource(ContentSecurityPolicyDisposition);

+ void startLoadingMainResource();

void acceptDataFromThreadedReceiver(const char* data, int dataLength, int encodedDataLength);

DocumentLoadTiming& timing() { return m_documentLoadTiming; }

@@ -177,7 +177,6 @@ private:

String debugName() const override { return "DocumentLoader"; }

bool maybeLoadEmpty();

- void loadUnique();

bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);