diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-11-19 09:58:03 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-11-19 09:58:03 +0100 |
commit | 879e2ea7d15510ec5f94d6d7a005b157b115f69f (patch) | |
tree | 73aedd0bffe7ab39387229a9417aa50cecbbf0aa /src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h | |
parent | 8fc2eec5b3282665f76f1e0313a03608bf4e7bc1 (diff) | |
parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) |
Merge remote branch 'origin/4.6' into lighthouse
Conflicts:
configure
src/plugins/graphicssystems/graphicssystems.pro
Diffstat (limited to 'src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h b/src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h index 75f41f6dce..ad38163a12 100644 --- a/src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h +++ b/src/3rdparty/webkit/WebCore/websockets/WebSocketChannel.h @@ -47,7 +47,7 @@ namespace WebCore { class WebSocketChannel : public RefCounted<WebSocketChannel>, public SocketStreamHandleClient { public: - static PassRefPtr<WebSocketChannel> create(ScriptExecutionContext* context, WebSocketChannelClient* client, const KURL& url, const String& protocol) { return new WebSocketChannel(context, client, url, protocol); } + static PassRefPtr<WebSocketChannel> create(ScriptExecutionContext* context, WebSocketChannelClient* client, const KURL& url, const String& protocol) { return adoptRef(new WebSocketChannel(context, client, url, protocol)); } virtual ~WebSocketChannel(); virtual void connect(); @@ -57,6 +57,8 @@ namespace WebCore { virtual void close(); + virtual void disconnect(); + virtual void willOpenStream(SocketStreamHandle*, const KURL&); virtual void willSendData(SocketStreamHandle*, const char*, int); virtual void didOpen(SocketStreamHandle*); |