Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Unified Diff: Source/core/loader/MixedContentChecker.h

Issue 311033003: Implementing mixed content for forms posting to insecure location from secure ones (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed reviewers comments, added counter for mixed content and made warning messages more develo… Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/MixedContentChecker.h
diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h
index b4eb49a7585b5678ddcab791421c72a1f848fd1f..917f76fe3d87ec230af843b2070f2db61999509e 100644
--- a/Source/core/loader/MixedContentChecker.h
+++ b/Source/core/loader/MixedContentChecker.h
@@ -45,7 +45,15 @@ class MixedContentChecker {
public:
MixedContentChecker(LocalFrame*);
- bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const;
+ bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
+ {
+ return canDisplayInsecureContentInternal(securityOrigin, url, false);
+ }
+ bool canSubmitToInsecureForm(SecurityOrigin* securityOrigin, const KURL& url) const
+ {
+ return canDisplayInsecureContentInternal(securityOrigin, url, true);
+ }
+
jww 2014/06/05 23:00:49 Seems like you added an extra space here.
bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
{
return canRunInsecureContentInternal(securityOrigin, url, false);
@@ -60,9 +68,11 @@ private:
// FIXME: This should probably have a separate client from FrameLoader.
FrameLoaderClient* client() const;
+ bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, bool isForm) const;
+
bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, bool isWebSocket) const;
- void logWarning(bool allowed, const String& action, const KURL&) const;
+ void logWarning(bool allowed, const String& action1, const String& action2, const KURL&) const;
LocalFrame* m_frame;
};

Powered by Google App Engine
This is Rietveld 408576698