| Index: third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
|
| diff --git a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
|
| index a8df49bbf15fcd04aece638890cdf5893fc5e406..68bf0130825aca52c1514c9da39c2498f8c0b0b4 100644
|
| --- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
|
| +++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
|
| @@ -123,14 +123,12 @@ private:
|
| Vector<char> data;
|
| };
|
|
|
| - class BlobLoader;
|
| -
|
| DocumentWebSocketChannel(Document*, WebSocketChannelClient*, const String&, unsigned, WebSocketHandle*);
|
| void sendInternal(WebSocketHandle::MessageType, const char* data, size_t totalSize, uint64_t* consumedBufferedAmount);
|
| + void sendBlob(const BlobDataHandle&);
|
| void processSendQueue();
|
| void flowControlIfNecessary();
|
| void failAsError(const String& reason) { fail(reason, ErrorMessageLevel, m_sourceURLAtConstruction, m_lineNumberAtConstruction); }
|
| - void abortAsyncOperations();
|
| void handleDidClose(bool wasClean, unsigned short code, const String& reason);
|
| Document* document();
|
|
|
| @@ -143,10 +141,7 @@ private:
|
| void didClose(WebSocketHandle*, bool wasClean, unsigned short code, const WebString& reason) override;
|
| void didReceiveFlowControl(WebSocketHandle*, int64_t quota) override;
|
| void didStartClosingHandshake(WebSocketHandle*) override;
|
| -
|
| - // Methods for BlobLoader.
|
| - void didFinishLoadingBlob(PassRefPtr<DOMArrayBuffer>);
|
| - void didFailLoadingBlob(FileError::ErrorCode);
|
| + void didCompleteSendingBlob(WebSocketHandle*) override;
|
|
|
| // m_handle is a handle of the connection.
|
| // m_handle == 0 means this channel is closed.
|
| @@ -158,7 +153,8 @@ private:
|
| KURL m_url;
|
| // m_identifier > 0 means calling scriptContextExecution() returns a Document.
|
| unsigned long m_identifier;
|
| - Member<BlobLoader> m_blobLoader;
|
| + bool m_blobLoadingMode;
|
| + uint64_t m_blobDataPending;
|
| Deque<OwnPtr<Message>> m_messages;
|
| Vector<char> m_receivingMessageData;
|
|
|
|
|