diff options
Diffstat (limited to 'WebCore/websockets/WebSocket.h')
| -rw-r--r-- | WebCore/websockets/WebSocket.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/WebCore/websockets/WebSocket.h b/WebCore/websockets/WebSocket.h index 9ecbed7..18e2b25 100644 --- a/WebCore/websockets/WebSocket.h +++ b/WebCore/websockets/WebSocket.h @@ -46,7 +46,7 @@ namespace WebCore { class String; - class WebSocketChannel; + class ThreadableWebSocketChannel; class WebSocket : public RefCounted<WebSocket>, public EventTarget, public ActiveDOMObject, public WebSocketChannelClient { public: @@ -83,20 +83,12 @@ namespace WebCore { virtual ScriptExecutionContext* scriptExecutionContext() const; - // ActiveDOMObject - // virtual bool hasPendingActivity() const; - // virtual void contextDestroyed(); - // virtual bool canSuspend() const; - // virtual void suspend(); - // virtual void resume(); - // virtual void stop(); - using RefCounted<WebSocket>::ref; using RefCounted<WebSocket>::deref; // WebSocketChannelClient virtual void didConnect(); - virtual void didReceiveMessage(const String& msg); + virtual void didReceiveMessage(const String& message); virtual void didClose(); private: @@ -111,7 +103,7 @@ namespace WebCore { void dispatchMessageEvent(Event*); void dispatchCloseEvent(Event*); - RefPtr<WebSocketChannel> m_channel; + RefPtr<ThreadableWebSocketChannel> m_channel; State m_state; KURL m_url; @@ -119,8 +111,8 @@ namespace WebCore { EventTargetData m_eventTargetData; }; -} // namespace WebCore +} // namespace WebCore -#endif // ENABLE(WEB_SOCKETS) +#endif // ENABLE(WEB_SOCKETS) -#endif // WebSocket_h +#endif // WebSocket_h |