MediaStream should fire ended event when all tracks are ended

Source/modules/websockets/WebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 57 matching lines @@
 namespace WebCore {
 
 const double TCPMaximumSegmentLifetime = 2 * 60.0;
 
 WebSocketChannel::WebSocketChannel(Document* document, WebSocketChannelClient* client)
     : m_document(document)
     , m_client(client)
     , m_resumeTimer(this, &WebSocketChannel::resumeTimerFired)
     , m_suspended(false)
     , m_closing(false)
+    , m_failed(false)
     , m_receivedClosingHandshake(false)
     , m_closingTimer(this, &WebSocketChannel::closingTimerFired)
     , m_closed(false)
     , m_shouldDiscardReceivedData(false)
     , m_unhandledBufferedAmount(0)
     , m_identifier(0)
     , m_hasContinuousFrame(false)
     , m_closeEventCode(CloseEventCodeAbnormalClosure)
     , m_outgoingFrameQueueStatus(OutgoingFrameQueueOpen)
     , m_blobLoaderStatus(BlobLoaderNotStarted)
@@ skipping 112 matching lines @@
 
     // Hybi-10 specification explicitly states we must not continue to handle incoming data
     // once the WebSocket connection is failed (section 7.1.7).
     RefPtr<WebSocketChannel> protect(this); // The client can close the channel, potentially removing the last reference.
     m_shouldDiscardReceivedData = true;
     if (!m_buffer.isEmpty())
         skipBuffer(m_buffer.size()); // Save memory.
     m_deflateFramer.didFail();
     m_hasContinuousFrame = false;
     m_continuousFrameData.clear();
-    m_client->didReceiveMessageError();
+    if (!m_failed) {
+        m_failed = true;
+        m_client->didReceiveMessageError();
+    }
 
     if (m_handle && !m_closed)
         m_handle->disconnect(); // Will call didClose().
 }
 
 void WebSocketChannel::disconnect()
 {
     LOG(Network, "WebSocketChannel %p disconnect()", this);
     if (m_identifier && m_document)
         InspectorInstrumentation::didCloseWebSocket(m_document, m_identifier);
@@ skipping 94 matching lines @@
 
 void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount)
 {
     if (m_client)
         m_client->didUpdateBufferedAmount(bufferedAmount);
 }
 
 void WebSocketChannel::didFailSocketStream(SocketStreamHandle* handle, const SocketStreamError& error)
 {
     LOG(Network, "WebSocketChannel %p didFailSocketStream()", this);
-    ASSERT(handle == m_handle || !m_handle);
-    if (m_document) {
-        String message;
-        if (error.isNull())
-            message = "WebSocket network error";
-        else if (error.localizedDescription().isNull())
-            message = "WebSocket network error: error code " + String::number(error.errorCode());
-        else
-            message = "WebSocket network error: " + error.localizedDescription();
-        InspectorInstrumentation::didReceiveWebSocketFrameError(m_document, m_identifier, message);
-        m_document->addConsoleMessage(NetworkMessageSource, ErrorMessageLevel, message);
+    ASSERT_UNUSED(handle, handle == m_handle || !m_handle);
+    m_shouldDiscardReceivedData = true;
+    String message;
+    if (error.isNull())
+        message = "WebSocket network error";
+    else if (error.localizedDescription().isNull())
+        message = "WebSocket network error: error code " + String::number(error.errorCode());
+    else
+        message = "WebSocket network error: error code " + String::number(error.errorCode()) + ", " + error.localizedDescription();
+    String failingURL = error.failingURL();
+    ASSERT(failingURL.isNull() || m_handshake->url().string() == failingURL);
+    if (failingURL.isNull())
+        failingURL = m_handshake->url().string();
+    LOG(Network, "Error Message: %s, FailURL: %s", message.utf8().data(), failingURL.utf8().data());
+    RefPtr<WebSocketChannel> protect(this);
+    if (m_client && !m_closing && !m_failed) {
+        m_failed = true;
+        m_client->didReceiveMessageError();
     }
-    m_shouldDiscardReceivedData = true;
-    handle->disconnect();
+    if (m_handle && !m_closed)
+        m_handle->disconnect();
 }
 
 void WebSocketChannel::didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&)
 {
 }
 
 void WebSocketChannel::didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&)
 {
 }
 
@@ skipping 442 matching lines @@
         return false;
     }
 
     Vector<char> frameData;
     frame.makeFrameData(frameData);
 
     return m_handle->send(frameData.data(), frameData.size());
 }
 
 }  // namespace WebCore