trunk/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h - Issue 309503013: Revert 174956 "Oilpan: Move ThreadableWebSocketChannelClientWrap..."

Unified Diff: trunk/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

Issue 309503013: Revert 174956 "Oilpan: Move ThreadableWebSocketChannelClientWrap..." (Closed) Base URL: svn://svn.chromium.org/blink/

Patch Set: 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 | « trunk/Source/core/dom/CrossThreadTask.h ('k') | trunk/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

===================================================================

--- trunk/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h (revision 175241)

+++ trunk/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h (working copy)

@@ -45,10 +45,9 @@

class ExecutionContext;

class WebSocketChannelClient;

-class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<ThreadableWebSocketChannelClientWrapper> {

+class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCounted<ThreadableWebSocketChannelClientWrapper> {

public:

- static PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> create(WebSocketChannelClient*);

- ~ThreadableWebSocketChannelClientWrapper();

+ static PassRefPtr<ThreadableWebSocketChannelClientWrapper> create(WebSocketChannelClient*);

// Subprotocol and extensions will be available when didConnect() callback is invoked.

String subprotocol() const;

@@ -69,20 +68,18 @@

void suspend();

void resume();

- void trace(Visitor*) { }

private:

ThreadableWebSocketChannelClientWrapper(WebSocketChannelClient*);

void processPendingTasks();

- static void didConnectCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);

- static void didReceiveMessageCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, const String& message);

- static void didReceiveBinaryDataCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, PassOwnPtr<Vector<char> >);

- static void didUpdateBufferedAmountCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long bufferedAmount);

- static void didStartClosingHandshakeCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);

- static void didCloseCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);

- static void didReceiveMessageErrorCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);

+ static void didConnectCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);

+ static void didReceiveMessageCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& message);

+ static void didReceiveBinaryDataCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassOwnPtr<Vector<char> >);

+ static void didUpdateBufferedAmountCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long bufferedAmount);

+ static void didStartClosingHandshakeCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);

+ static void didCloseCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);

+ static void didReceiveMessageErrorCallback(ExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);

WebSocketChannelClient* m_client;

// ThreadSafeRefCounted must not have String member variables.