Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.h |
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h |
index 27ed56c145e9aed043a7c747782a41086ce52e5a..eb0dd96d966afac310dfd3031f6dbc3679d9b185 100644 |
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h |
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h |
@@ -125,7 +125,8 @@ public: |
// WebSocketChannelClient functions. |
void didConnect(const String& subprotocol, const String& extensions) override; |
void didReceiveTextMessage(const String& message) override; |
- void didReceiveBinaryMessage(PassOwnPtr<Vector<char>>) override; |
+ void didReceiveArrayBuffer(PassOwnPtr<Vector<char>>) override; |
+ void didReceiveBlob(PassRefPtr<BlobDataHandle>) override; |
void didError() override; |
void didConsumeBufferedAmount(uint64_t) override; |
void didStartClosingHandshake() override; |
@@ -196,6 +197,13 @@ private: |
WebSocketReceiveTypeMax, |
}; |
+ enum BinaryType { |
+ BinaryTypeBlob, |
+ BinaryTypeArrayBuffer |
+ }; |
+ |
+ static WebSocketChannel::BinaryType toChannelBinaryType(BinaryType); |
+ |
// This function is virtual for unittests. |
// FIXME: Move WebSocketChannel::create here. |
virtual WebSocketChannel* createChannel(ExecutionContext* context, WebSocketChannelClient* client) |
@@ -218,11 +226,6 @@ private: |
void releaseChannel(); |
- enum BinaryType { |
- BinaryTypeBlob, |
- BinaryTypeArrayBuffer |
- }; |
- |
Member<WebSocketChannel> m_channel; |
State m_state; |