Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp b/src/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
index 874f22b..af7f992 100644 (file)
--- a/src/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
+++ b/src/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
@@ -73,13 +73,14 @@ bool MixedContentChecker::canDisplayInsecureContent(SecurityOrigin* securityOrig
     return allowed;
 }
 
-bool MixedContentChecker::canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
+bool MixedContentChecker::canRunInsecureContentInternal(SecurityOrigin* securityOrigin, const KURL& url, bool isWebSocket) const
 {
     if (!isMixedContent(securityOrigin, url))
         return true;
 
     Settings* settings = m_frame->settings();
-    bool allowed = client()->allowRunningInsecureContent(settings && settings->allowRunningOfInsecureContent(), securityOrigin, url);
+    bool allowedPerSettings = settings && (settings->allowRunningOfInsecureContent() || (isWebSocket && settings->allowConnectingInsecureWebSocket()));
+    bool allowed = client()->allowRunningInsecureContent(allowedPerSettings, securityOrigin, url);
     logWarning(allowed, "ran", url);
 
     if (allowed)