| Index: Source/modules/websockets/NewWebSocketChannelImpl.h
|
| diff --git a/Source/modules/websockets/NewWebSocketChannelImpl.h b/Source/modules/websockets/NewWebSocketChannelImpl.h
|
| index b65ff6ef1412c4e580e49622a78fbdb236b7f2f0..0eb218dc09b07ad9ae0d794a58d6a898aed75828 100644
|
| --- a/Source/modules/websockets/NewWebSocketChannelImpl.h
|
| +++ b/Source/modules/websockets/NewWebSocketChannelImpl.h
|
| @@ -63,7 +63,7 @@ public:
|
| {
|
| return adoptRef(new NewWebSocketChannelImpl(context, client, sourceURL, lineNumber));
|
| }
|
| - virtual ~NewWebSocketChannelImpl() { }
|
| + virtual ~NewWebSocketChannelImpl();
|
|
|
| // WebSocketChannel functions.
|
| virtual void connect(const KURL&, const String& protocol) OVERRIDE;
|
| @@ -92,6 +92,7 @@ private:
|
| MessageTypeBlob,
|
| MessageTypeArrayBuffer,
|
| };
|
| +
|
| struct Message {
|
| explicit Message(const String&);
|
| explicit Message(const Blob&);
|
| @@ -107,6 +108,8 @@ private:
|
| Vector<char> data;
|
| };
|
|
|
| + class Resumer;
|
| +
|
| NewWebSocketChannelImpl(ScriptExecutionContext*, WebSocketChannelClient*, const String&, unsigned);
|
| void sendInternal();
|
| void flowControlIfNecessary();
|
| @@ -118,8 +121,10 @@ private:
|
| virtual void didClose(WebKit::WebSocketHandle*, unsigned short code, const WebKit::WebString& reason) OVERRIDE;
|
| virtual void didReceiveFlowControl(WebKit::WebSocketHandle*, int64_t quota) OVERRIDE { m_sendingQuota += quota; }
|
|
|
| + void handleDidConnect();
|
| void handleTextMessage(Vector<char>*);
|
| void handleBinaryMessage(Vector<char>*);
|
| + void handleDidReceiveMessageError();
|
| void handleDidClose(unsigned short code, const String& reason);
|
|
|
| // WebSocketChannel functions.
|
| @@ -138,6 +143,7 @@ private:
|
| // expects that disconnect() is called before the deletion.
|
| WebSocketChannelClient* m_client;
|
| KURL m_url;
|
| + OwnPtr<Resumer> m_resumer;
|
| Deque<Message> m_messages;
|
| Vector<char> m_receivingMessageData;
|
|
|
|
|