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

Unified Diff: Source/modules/websockets/WorkerThreadableWebSocketChannel.h

Issue 222153002: Disallow connecting an insecure WebSocket from a secure page. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 8 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/WorkerThreadableWebSocketChannel.h
diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h
index 8d949f1ad5440fe5baa5db56bd7d2f5cda024ddc..dd509bf7f9449f0a06b664f6b43c6d9653fe9821 100644
--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h
+++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h
@@ -71,7 +71,7 @@ public:
virtual ~WorkerThreadableWebSocketChannel();
// WebSocketChannel functions.
- virtual void connect(const KURL&, const String& protocol) OVERRIDE;
+ virtual bool connect(const KURL&, const String& protocol) OVERRIDE;
virtual String subprotocol() OVERRIDE;
virtual String extensions() OVERRIDE;
virtual WebSocketChannel::SendResult send(const String& message) OVERRIDE;
@@ -147,7 +147,7 @@ private:
// sourceURLAtConnection and lineNumberAtConnection parameters may
// be shown when the connection fails.
void initialize(const String& sourceURLAtConnection, unsigned lineNumberAtConnection);
- void connect(const KURL&, const String& protocol);
+ bool connect(const KURL&, const String& protocol);
WebSocketChannel::SendResult send(const String& message);
WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength);
WebSocketChannel::SendResult send(PassRefPtr<BlobDataHandle>);
« no previous file with comments | « Source/modules/websockets/WebSocketChannel.h ('k') | Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698