third_party/WebKit/Source/core/loader/MixedContentChecker.cpp - Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy.

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 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block

Patch Set: Ugh. 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/Source/core/loader/FrameLoader.cpp ('k') | third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp » ('j') | 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 31664e1fa04bda0e52033672b5925736dccd83ad..5abb767f84d90b1e72f53d9809337994abf61012 100644

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

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

@@ -42,6 +42,7 @@

#include "platform/weborigin/SchemeRegistry.h"

#include "platform/weborigin/SecurityOrigin.h"

#include "public/platform/WebAddressSpace.h"

+#include "public/platform/WebInsecureRequestPolicy.h"

#include "wtf/text/StringBuilder.h"

namespace blink {

@@ -328,7 +329,7 @@ bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, WebURLRequest::Req

// If we're in strict mode, we'll automagically fail everything, and intentionally skip

// the client checks in order to prevent degrading the site's security UI.

- bool strictMode = mixedFrame->securityContext()->shouldEnforceStrictMixedContentChecking() || settings->strictMixedContentChecking();

+ bool strictMode = mixedFrame->securityContext()->getInsecureRequestPolicy() & kBlockAllMixedContent || settings->strictMixedContentChecking();

ContextType contextType = contextTypeFromContext(requestContext, mixedFrame);

@@ -420,7 +421,7 @@ bool MixedContentChecker::shouldBlockWebSocket(LocalFrame* frame, const KURL& ur

// If we're in strict mode, we'll automagically fail everything, and intentionally skip

// the client checks in order to prevent degrading the site's security UI.

- bool strictMode = mixedFrame->securityContext()->shouldEnforceStrictMixedContentChecking() || settings->strictMixedContentChecking();

+ bool strictMode = mixedFrame->securityContext()->getInsecureRequestPolicy() & kBlockAllMixedContent || settings->strictMixedContentChecking();

if (!strictMode) {

bool allowedPerSettings = settings && settings->allowRunningOfInsecureContent();

allowed = client->allowRunningInsecureContent(allowedPerSettings, securityOrigin, url);