Source/modules/websockets/WorkerThreadableWebSocketChannel.h - Issue 23992003: blob hacking webcore style

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

Issue 23992003: blob hacking webcore style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 3 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

« Source/modules/websockets/NewWebSocketChannelImpl.h ('K') | « Source/modules/websockets/WebSocketChannel.h ('k') | Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp » ('j') | public/platform/WebBlobData.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.h

diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h

index 9a40638222a31ea159ed21aff7e06cfae231497f..e762baf510996dc02f8dd25b3c0d79494e8f80f3 100644

--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h

+++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h

@@ -46,6 +46,7 @@

namespace WebCore {

+class BlobDataHandle;

class KURL;

class ScriptExecutionContext;

class ThreadableWebSocketChannelClientWrapper;

@@ -68,7 +69,7 @@ public:

virtual String extensions() OVERRIDE;

virtual WebSocketChannel::SendResult send(const String& message) OVERRIDE;

virtual WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;

- virtual WebSocketChannel::SendResult send(const Blob&) OVERRIDE;

+ virtual WebSocketChannel::SendResult send(PassRefPtr<BlobDataHandle>) OVERRIDE;

virtual unsigned long bufferedAmount() const OVERRIDE;

virtual void close(int code, const String& reason) OVERRIDE;

virtual void fail(const String& reason, MessageLevel, const String&, unsigned) OVERRIDE;

@@ -92,7 +93,7 @@ public:

void connect(const KURL&, const String& protocol);

void send(const String& message);

void send(const ArrayBuffer&);

- void send(const Blob&);

+ void send(PassRefPtr<BlobDataHandle>);

void bufferedAmount();

void close(int code, const String& reason);

void fail(const String& reason, MessageLevel, const String& sourceURL, unsigned lineNumber);

@@ -141,7 +142,7 @@ private:

void connect(const KURL&, const String& protocol);

WebSocketChannel::SendResult send(const String& message);

WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength);

- WebSocketChannel::SendResult send(const Blob&);

+ WebSocketChannel::SendResult send(PassRefPtr<BlobDataHandle>);

unsigned long bufferedAmount();

void close(int code, const String& reason);

void fail(const String& reason, MessageLevel, const String& sourceURL, unsigned lineNumber);

@@ -181,7 +182,7 @@ private:

static void mainThreadConnect(ScriptExecutionContext*, Peer*, const KURL&, const String& protocol);

static void mainThreadSend(ScriptExecutionContext*, Peer*, const String& message);

static void mainThreadSendArrayBuffer(ScriptExecutionContext*, Peer*, PassOwnPtr<Vector<char> >);

- static void mainThreadSendBlob(ScriptExecutionContext*, Peer*, const KURL&, const String& type, long long size);

+ static void mainThreadSendBlob(ScriptExecutionContext*, Peer*, PassRefPtr<BlobDataHandle>);

static void mainThreadBufferedAmount(ScriptExecutionContext*, Peer*);

static void mainThreadClose(ScriptExecutionContext*, Peer*, int code, const String& reason);

static void mainThreadFail(ScriptExecutionContext*, Peer*, const String& reason, MessageLevel, const String& sourceURL, unsigned lineNumber);