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

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

Issue 298893008: Add WebSocket unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 7 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
« no previous file with comments | « Source/modules/modules.gypi ('k') | Source/modules/websockets/WebSocket.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/WebSocket.h
diff --git a/Source/modules/websockets/WebSocket.h b/Source/modules/websockets/WebSocket.h
index a4277eab9537f407618608038261e43e38a95f6f..8fd7bf97c1f20f319d370081cc0979ad4b20b3b0 100644
--- a/Source/modules/websockets/WebSocket.h
+++ b/Source/modules/websockets/WebSocket.h
@@ -51,11 +51,11 @@ namespace WebCore {
class Blob;
class ExceptionState;
-class WebSocket FINAL : public RefCountedWillBeRefCountedGarbageCollected<WebSocket>, public ScriptWrappable, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
+class WebSocket : public RefCountedWillBeRefCountedGarbageCollected<WebSocket>, public ScriptWrappable, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
REFCOUNTED_EVENT_TARGET(WebSocket);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebSocket);
public:
- static const char* subProtocolSeperator();
+ static const char* subprotocolSeperator();
// WebSocket instances must be used with a wrapper since this class's
// lifetime management is designed assuming the V8 holds a ref on it while
// hasPendingActivity() returns true.
@@ -126,6 +126,11 @@ public:
virtual void trace(Visitor*) OVERRIDE;
+ static bool isValidSubprotocolString(const String&);
+
+protected:
+ explicit WebSocket(ExecutionContext*);
+
private:
// FIXME: This should inherit WebCore::EventQueue.
class EventQueue FINAL : public RefCountedWillBeGarbageCollectedFinalized<EventQueue> {
@@ -177,7 +182,12 @@ private:
WebSocketSendTypeMax,
};
- explicit WebSocket(ExecutionContext*);
+ // This function is virtual for unittests.
+ // FIXME: Move WebSocketChannel::create here.
+ virtual PassRefPtrWillBeRawPtr<WebSocketChannel> createChannel(ExecutionContext* context, WebSocketChannelClient* client)
+ {
+ return WebSocketChannel::create(context, client);
+ }
// Adds a console message with JSMessageSource and ErrorMessageLevel.
void logError(const String& message);
« no previous file with comments | « Source/modules/modules.gypi ('k') | Source/modules/websockets/WebSocket.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698