Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp

Issue 13776002: MediaStream should fire ended event when all tracks are ended (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: The patch is migrated from WebKit #bug 87336 Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
diff --git a/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp b/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
index 59e4181abf0addfec01b09129ab119e30e6be980..8cde1598640efb1dec27efd8077317b7632e8b2b 100644
--- a/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
+++ b/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#include "SocketStreamError.h"
#include "SocketStreamHandle.h"
#include "SocketStreamHandleInternal.h"
@@ -37,6 +38,7 @@
#include "SocketStreamHandleClient.h"
#include <public/Platform.h>
#include <public/WebData.h>
+#include <public/WebSocketStreamError.h>
#include <public/WebSocketStreamHandle.h>
#include <wtf/PassOwnPtr.h>
@@ -153,11 +155,8 @@ void SocketStreamHandleInternal::didFail(WebKit::WebSocketStreamHandle* socketHa
LOG(Network, "SocketStreamHandleInternal %p didFail()", this);
if (m_handle && m_socket) {
ASSERT(socketHandle == m_socket.get());
- m_socket.clear();
- SocketStreamHandle* h = m_handle;
- m_handle = 0;
- if (h->m_client)
- h->m_client->didCloseSocketStream(h); // didFail(h, err);
+ if (m_handle->m_client)
+ m_handle->m_client->didFailSocketStream(m_handle, *(PassRefPtr<SocketStreamError>(err)));
}
}
« no previous file with comments | « Source/WebCore/platform/network/chromium/SocketStreamError.h ('k') | Source/modules/websockets/WebSocketChannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698