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) |