diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/websockets | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/websockets')
| -rw-r--r-- | Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/websockets/WebSocket.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h b/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h index 4099615..683ee84 100644 --- a/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h +++ b/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h @@ -42,7 +42,7 @@ namespace WebCore { -class ThreadableWebSocketChannelClientWrapper : public ThreadSafeShared<ThreadableWebSocketChannelClientWrapper> { +class ThreadableWebSocketChannelClientWrapper : public ThreadSafeRefCounted<ThreadableWebSocketChannelClientWrapper> { public: static PassRefPtr<ThreadableWebSocketChannelClientWrapper> create(WebSocketChannelClient* client) { diff --git a/Source/WebCore/websockets/WebSocket.cpp b/Source/WebCore/websockets/WebSocket.cpp index e15d079..5dfd48b 100644 --- a/Source/WebCore/websockets/WebSocket.cpp +++ b/Source/WebCore/websockets/WebSocket.cpp @@ -283,7 +283,10 @@ void WebSocket::didClose(unsigned long unhandledBufferedAmount) m_bufferedAmountAfterClose += unhandledBufferedAmount; ASSERT(scriptExecutionContext()); dispatchEvent(Event::create(eventNames().closeEvent, false, false)); - m_channel = 0; + if (m_channel) { + m_channel->disconnect(); + m_channel = 0; + } if (hasPendingActivity()) ActiveDOMObject::unsetPendingActivity(this); } |