summaryrefslogtreecommitdiff
path: root/Source/WebCore/loader/MixedContentChecker.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/loader/MixedContentChecker.h')
-rw-r--r--Source/WebCore/loader/MixedContentChecker.h23
1 files changed, 15 insertions, 8 deletions
diff --git a/Source/WebCore/loader/MixedContentChecker.h b/Source/WebCore/loader/MixedContentChecker.h
index bff9c795f..a26a85797 100644
--- a/Source/WebCore/loader/MixedContentChecker.h
+++ b/Source/WebCore/loader/MixedContentChecker.h
@@ -28,8 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MixedContentChecker_h
-#define MixedContentChecker_h
+#pragma once
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
@@ -44,11 +43,22 @@ class SecurityOrigin;
class MixedContentChecker {
WTF_MAKE_NONCOPYABLE(MixedContentChecker);
public:
+ enum class ContentType {
+ Active,
+ ActiveCanWarn,
+ };
+
MixedContentChecker(Frame&);
- bool canDisplayInsecureContent(SecurityOrigin*, const URL&) const;
- bool canRunInsecureContent(SecurityOrigin*, const URL&) const;
- static bool isMixedContent(SecurityOrigin*, const URL&);
+ enum class AlwaysDisplayInNonStrictMode {
+ No,
+ Yes,
+ };
+
+ bool canDisplayInsecureContent(SecurityOrigin&, ContentType, const URL&, AlwaysDisplayInNonStrictMode = AlwaysDisplayInNonStrictMode::No) const;
+ bool canRunInsecureContent(SecurityOrigin&, const URL&) const;
+ void checkFormForMixedContent(SecurityOrigin&, const URL&) const;
+ static bool isMixedContent(SecurityOrigin&, const URL&);
private:
// FIXME: This should probably have a separate client from FrameLoader.
@@ -60,6 +70,3 @@ private:
};
} // namespace WebCore
-
-#endif // MixedContentChecker_h
-