third_party/WebKit/Source/core/loader/MixedContentChecker.cpp - Issue 2002003002: Generate CSP violation reports for 'block-all-mixed-content'

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/MixedContentChecker.cpp

Issue 2002003002: Generate CSP violation reports for 'block-all-mixed-content' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« third_party/WebKit/LayoutTests/http/tests/security/mixedContent/strict-mode-image-blocked.https.html ('K') | « third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b08f428013066e152ccc018b0e019b69c25e2559..1d2013a0a43f0d0e5cc0552acb6c0ce84500cdf5 100644

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

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

@@ -315,6 +315,8 @@ bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, WebURLRequest::Req

return false;

MixedContentChecker::count(mixedFrame, requestContext);

+ if (ContentSecurityPolicy* policy = frame->securityContext()->contentSecurityPolicy())

+ policy->reportMixedContent(url);

Settings* settings = mixedFrame->settings();

// Use the current local frame's client; the embedder doesn't

@@ -405,6 +407,8 @@ bool MixedContentChecker::shouldBlockWebSocket(LocalFrame* frame, const KURL& ur

UseCounter::count(mixedFrame, UseCounter::MixedContentPresent);

UseCounter::count(mixedFrame, UseCounter::MixedContentWebSocket);

+ if (ContentSecurityPolicy* policy = frame->securityContext()->contentSecurityPolicy())

+ policy->reportMixedContent(url);

Settings* settings = mixedFrame->settings();

// Use the current local frame's client; the embedder doesn't