| Index: Source/core/loader/MixedContentChecker.h
|
| diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h
|
| index 1c61615bcd3665aa7974feb1c190d91e8a8e4b2b..1d1079ee036e8e32eba27ac07e799a8b7a9475e0 100644
|
| --- a/Source/core/loader/MixedContentChecker.h
|
| +++ b/Source/core/loader/MixedContentChecker.h
|
| @@ -32,6 +32,7 @@
|
| #define MixedContentChecker_h
|
|
|
| #include "platform/heap/Handle.h"
|
| +#include "platform/network/ResourceRequest.h"
|
| #include "public/platform/WebURLRequest.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -48,7 +49,11 @@ class MixedContentChecker FINAL {
|
| public:
|
| explicit MixedContentChecker(LocalFrame*);
|
|
|
| - static bool shouldBlockFetch(LocalFrame*, const ResourceRequest&, const KURL&);
|
| + static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& request, const KURL& url)
|
| + {
|
| + return shouldBlockFetch(frame, request.requestContext(), request.frameType(), url);
|
| + }
|
| + static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&);
|
|
|
| bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
|
| {
|
| @@ -84,6 +89,8 @@ private:
|
| ContextTypeBlockableUnlessLax
|
| };
|
|
|
| + static LocalFrame* inWhichFrameIsThisContentMixed(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&);
|
| +
|
| static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
|
| static const char* typeNameFromContext(WebURLRequest::RequestContext);
|
| static void logToConsole(LocalFrame*, const KURL&, WebURLRequest::RequestContext, bool allowed);
|
|
|