| Index: Source/core/loader/MixedContentChecker.h
|
| diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h
|
| index 17e3b975ce2128714ef4d25f8e92aeaef4bd2cc3..14330f6645182ad391c91243bb411eb5db82668e 100644
|
| --- a/Source/core/loader/MixedContentChecker.h
|
| +++ b/Source/core/loader/MixedContentChecker.h
|
| @@ -31,6 +31,7 @@
|
| #ifndef MixedContentChecker_h
|
| #define MixedContentChecker_h
|
|
|
| +#include "public/platform/WebURLRequest.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| namespace blink {
|
| @@ -39,11 +40,14 @@ class LocalFrame;
|
| class FrameLoaderClient;
|
| class KURL;
|
| class SecurityOrigin;
|
| +class ResourceRequest;
|
|
|
| class MixedContentChecker {
|
| WTF_MAKE_NONCOPYABLE(MixedContentChecker);
|
| public:
|
| - MixedContentChecker(LocalFrame*);
|
| + explicit MixedContentChecker(LocalFrame*);
|
| +
|
| + static bool shouldBlockFetch(LocalFrame*, const ResourceRequest&, const KURL&);
|
|
|
| bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
|
| {
|
| @@ -68,6 +72,15 @@ private:
|
| Submission
|
| };
|
|
|
| + enum ContextType {
|
| + ContextTypeBlockable,
|
| + ContextTypeOptionallyBlockable,
|
| + ContextTypeShouldBeBlockable,
|
| + ContextTypeBlockableUnlessLax
|
| + };
|
| +
|
| + static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
|
| +
|
| // FIXME: This should probably have a separate client from FrameLoader.
|
| FrameLoaderClient* client() const;
|
|
|
|
|