Index: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h |
diff --git a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h |
index 6e9406feaf23f1aaa0e2f49091866056bde18518..68b5bdaf82863605440ea702018a6e50441c051a 100644 |
--- a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h |
+++ b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h |
@@ -31,24 +31,18 @@ |
#ifndef ThreadableWebSocketChannelClientWrapper_h |
#define ThreadableWebSocketChannelClientWrapper_h |
-#include "core/dom/ExecutionContextTask.h" |
-#include "modules/websockets/WebSocketChannel.h" |
#include "modules/websockets/WebSocketChannelClient.h" |
+#include "platform/heap/Handle.h" |
#include "wtf/Forward.h" |
-#include "wtf/OwnPtr.h" |
#include "wtf/PassOwnPtr.h" |
#include "wtf/ThreadSafeRefCounted.h" |
#include "wtf/Vector.h" |
namespace WebCore { |
-class ExecutionContext; |
-class WebSocketChannelClient; |
- |
-class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<ThreadableWebSocketChannelClientWrapper> { |
+class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCountedWillBeGarbageCollected<ThreadableWebSocketChannelClientWrapper> { |
public: |
static PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> create(WebSocketChannelClient*); |
- ~ThreadableWebSocketChannelClientWrapper(); |
void clearClient(); |
@@ -60,27 +54,12 @@ public: |
void didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason); |
void didReceiveMessageError(); |
- void suspend(); |
- void resume(); |
- |
void trace(Visitor*) { } |
private: |
ThreadableWebSocketChannelClientWrapper(WebSocketChannelClient*); |
- void processPendingTasks(); |
- |
- static void didConnectCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, const String& subprotocol, const String& extensions); |
- 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; |
- bool m_suspended; |
- Vector<OwnPtr<ExecutionContextTask> > m_pendingTasks; |
}; |
} // namespace WebCore |