third_party/WebKit/Source/core/loader/MixedContentChecker.cpp - Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser.

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 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message

Patch Set: Overall code cleanup to request reviewers to PTAL. Created 4 years, 5 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

« content/browser/loader/resource_loader.cc ('K') | « third_party/WebKit/Source/core/loader/MixedContentChecker.h ('k') | third_party/WebKit/Source/core/loader/MixedContentCheckerTest.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 7e93384f0b99cea593cc969970e56594e8cf159b..a7d2854aa3be236e5ec1860b379137ab09042668 100644

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

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

@@ -182,6 +182,10 @@ void MixedContentChecker::count(Frame* frame, WebURLRequest::RequestContext requ

// static

bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, WebURLRequest::RequestContext requestContext, WebURLRequest::FrameType frameType, ResourceRequest::RedirectStatus redirectStatus, const KURL& url, MixedContentChecker::ReportingStatus reportingStatus)

{

+ // Frame-level loads are checked by the browser. No need to check them again here.

+ if (frameType != WebURLRequest::FrameTypeNone)

+ return false;

carlosk 2016/07/18 14:37:13 Can anyone confirm this is the correct filter for

Frame* effectiveFrame = effectiveFrameForFrameType(frame, frameType);

Frame* mixedFrame = inWhichFrameIsContentMixed(effectiveFrame, frameType, url);

if (!mixedFrame)