diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/loader/MixedContentChecker.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/loader/MixedContentChecker.h')
| -rw-r--r-- | Source/WebCore/loader/MixedContentChecker.h | 23 |
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 - |