| Index: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h
|
| diff --git a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h
|
| index bed47dfb9db43e86426a3912466e01165ea353f2..aec573073d7b6c121c87de37665a4323b29fdf31 100644
|
| --- a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h
|
| +++ b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h
|
| @@ -45,9 +45,10 @@ namespace WebCore {
|
| class ExecutionContext;
|
| class WebSocketChannelClient;
|
|
|
| -class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCounted<ThreadableWebSocketChannelClientWrapper> {
|
| +class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<ThreadableWebSocketChannelClientWrapper> {
|
| public:
|
| - static PassRefPtr<ThreadableWebSocketChannelClientWrapper> create(WebSocketChannelClient*);
|
| + static PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> create(WebSocketChannelClient*);
|
| + ~ThreadableWebSocketChannelClientWrapper();
|
|
|
| // Subprotocol and extensions will be available when didConnect() callback is invoked.
|
| String subprotocol() const;
|
| @@ -68,18 +69,20 @@ public:
|
| void suspend();
|
| void resume();
|
|
|
| + void trace(Visitor*) { }
|
| +
|
| private:
|
| ThreadableWebSocketChannelClientWrapper(WebSocketChannelClient*);
|
|
|
| void processPendingTasks();
|
|
|
| - 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>);
|
| + 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>);
|
|
|
| WebSocketChannelClient* m_client;
|
| // ThreadSafeRefCounted must not have String member variables.
|
|
|