third_party/WebKit/Source/core/loader/MixedContentChecker.cpp - Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink.

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 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)

Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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:

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 639a7fd273737b48434ac3b0496d3774e76f56d4..1b46299fa7ce7f7c464ed899fee268b553f18f51 100644

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

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

@@ -217,7 +217,8 @@ bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, WebURLRequest::Req

switch (contextType) {

case WebMixedContent::ContextType::OptionallyBlockable:

- allowed = !strictMode && client->allowDisplayingInsecureContent(settings && settings->allowDisplayOfInsecureContent(), url);

+ client->passiveInsecureContentFound(url);

+ allowed = !strictMode;

if (allowed)

client->didDisplayInsecureContent();

break;