Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / loader / MixedContentChecker.h

diff --git a/src/third_party/WebKit/Source/core/loader/MixedContentChecker.h b/src/third_party/WebKit/Source/core/loader/MixedContentChecker.h
index 17e3b97..1c61615 100644 (file)
--- a/src/third_party/WebKit/Source/core/loader/MixedContentChecker.h
+++ b/src/third_party/WebKit/Source/core/loader/MixedContentChecker.h
@@ -31,19 +31,24 @@
 #ifndef MixedContentChecker_h
 #define MixedContentChecker_h
 
+#include "platform/heap/Handle.h"
+#include "public/platform/WebURLRequest.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class LocalFrame;
 class FrameLoaderClient;
+class LocalFrame;
 class KURL;
 class SecurityOrigin;
 
-class MixedContentChecker {
+class MixedContentChecker FINAL {
     WTF_MAKE_NONCOPYABLE(MixedContentChecker);
+    DISALLOW_ALLOCATION();
 public:
-    MixedContentChecker(LocalFrame*);
+    explicit MixedContentChecker(LocalFrame*);
+
+    static bool shouldBlockFetch(LocalFrame*, const ResourceRequest&, const KURL&);
 
     bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
     {
@@ -60,6 +65,10 @@ public:
     bool canFrameInsecureContent(SecurityOrigin*, const KURL&) const;
     static bool isMixedContent(SecurityOrigin*, const KURL&);
 
+    static void checkMixedPrivatePublic(LocalFrame*, const AtomicString& resourceIPAddress);
+
+    void trace(Visitor*);
+
 private:
     enum MixedContentType {
         Display,
@@ -68,6 +77,17 @@ private:
         Submission
     };
 
+    enum ContextType {
+        ContextTypeBlockable,
+        ContextTypeOptionallyBlockable,
+        ContextTypeShouldBeBlockable,
+        ContextTypeBlockableUnlessLax
+    };
+
+    static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
+    static const char* typeNameFromContext(WebURLRequest::RequestContext);
+    static void logToConsole(LocalFrame*, const KURL&, WebURLRequest::RequestContext, bool allowed);
+
     // FIXME: This should probably have a separate client from FrameLoader.
     FrameLoaderClient* client() const;
 
@@ -77,7 +97,7 @@ private:
 
     void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
 
-    LocalFrame* m_frame;
+    RawPtrWillBeMember<LocalFrame> m_frame;
 };
 
 } // namespace blink