| Index: Source/core/loader/MixedContentChecker.h
|
| diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h
|
| index 69c396bbd5899b735b000383177be71ad44e4bfe..c30a59e6af49f7eb84faf253c5a79c5019cc513a 100644
|
| --- a/Source/core/loader/MixedContentChecker.h
|
| +++ b/Source/core/loader/MixedContentChecker.h
|
| @@ -32,7 +32,6 @@
|
| #define MixedContentChecker_h
|
|
|
| #include "platform/heap/Handle.h"
|
| -#include "platform/network/ResourceRequest.h"
|
| #include "public/platform/WebURLRequest.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -49,12 +48,7 @@ class MixedContentChecker final {
|
| public:
|
| explicit MixedContentChecker(LocalFrame*);
|
|
|
| - 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&);
|
| - static bool checkFormAction(LocalFrame*, const KURL&);
|
| + static bool shouldBlockFetch(LocalFrame*, const ResourceRequest&, const KURL&);
|
|
|
| bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
|
| {
|
| @@ -66,6 +60,7 @@ public:
|
| return canRunInsecureContentInternal(securityOrigin, url, MixedContentChecker::Execution);
|
| }
|
|
|
| + bool canSubmitToInsecureForm(SecurityOrigin*, const KURL&) const;
|
| bool canConnectInsecureWebSocket(SecurityOrigin*, const KURL&) const;
|
| bool canFrameInsecureContent(SecurityOrigin*, const KURL&) const;
|
| static bool isMixedContent(SecurityOrigin*, const KURL&);
|
| @@ -89,8 +84,6 @@ 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);
|
|
|