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

Unified Diff: Source/modules/websockets/MainThreadWebSocketChannel.cpp

Issue 348853009: Refactor mixed content checks against the top frame into MixedContentChecker. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: WSS. 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/modules/websockets/MainThreadWebSocketChannel.cpp
diff --git a/Source/modules/websockets/MainThreadWebSocketChannel.cpp b/Source/modules/websockets/MainThreadWebSocketChannel.cpp
index ed7adbdfb02a9d6de2518971728ff3db4aca3c4c..2d2b76a658776388112c4ae178c44a02964160df 100644
--- a/Source/modules/websockets/MainThreadWebSocketChannel.cpp
+++ b/Source/modules/websockets/MainThreadWebSocketChannel.cpp
@@ -97,9 +97,6 @@ bool MainThreadWebSocketChannel::connect(const KURL& url, const String& protocol
if (m_document->frame() && !m_document->frame()->loader().mixedContentChecker()->canConnectInsecureWebSocket(m_document->securityOrigin(), url))
return false;
- Frame* top = m_document->frame()->tree().top();
- if (top != m_document->frame() && !toLocalFrame(top)->loader().mixedContentChecker()->canConnectInsecureWebSocket(toLocalFrame(top)->document()->securityOrigin(), url))
- return false;
if (MixedContentChecker::isMixedContent(m_document->securityOrigin(), url)) {
Mike West 2014/06/30 12:24:37 This is here in case the user has flipped the abou
String message = "Connecting to a non-secure WebSocket server from a secure origin is deprecated.";
m_document->addConsoleMessage(JSMessageSource, WarningMessageLevel, message);

Powered by Google App Engine
This is Rietveld 408576698