third_party/WebKit/Source/core/loader/FrameFetchContext.cpp - Issue 1550723003: Adapt MixedContentChecker for remote frames

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

Issue 1550723003: Adapt MixedContentChecker for remote frames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix test assertion Created 4 years, 11 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-in-frame-blocked.https-expected.txt ('K') | « third_party/WebKit/Source/core/frame/DOMWindow.cpp ('k') | third_party/WebKit/Source/core/loader/MixedContentChecker.h » ('j') | third_party/WebKit/Source/core/loader/MixedContentChecker.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 27d73c65b884d366ba098736c80de34c6a78dd87..48159db2a03fa20a9c800534baeae50024e727e1 100644

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

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

@@ -559,7 +559,7 @@ ResourceRequestBlockedReason FrameFetchContext::canRequestInternal(Resource::Typ

// They'll still get a warning in the console about CSP blocking the load.

MixedContentChecker::ReportingStatus mixedContentReporting = forPreload ?

MixedContentChecker::SuppressReport : MixedContentChecker::SendReport;

- if (MixedContentChecker::shouldBlockFetch(MixedContentChecker::effectiveFrameForFrameType(frame(), resourceRequest.frameType()), resourceRequest, url, mixedContentReporting))

+ if (MixedContentChecker::shouldBlockFetch(frame(), resourceRequest, url, mixedContentReporting))

return ResourceRequestBlockedReasonMixedContent;

return ResourceRequestBlockedReasonNone;