MediaRecorder: make sure ondataavailable+onstop events are fired before onerror

third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/mediarecorder/MediaRecorder.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/events/Event.h"
 #include "core/fileapi/Blob.h"
 #include "core/inspector/ConsoleMessage.h"
@@ skipping 145 matching lines @@
 
   return recorder;
 }
 
 MediaRecorder::MediaRecorder(ExecutionContext* context,
                              MediaStream* stream,
                              const MediaRecorderOptions& options,
                              ExceptionState& exceptionState)
     : SuspendableObject(context),
       m_stream(stream),
-      m_streamAmountOfTracks(stream->getTracks().size()),
       m_mimeType(options.hasMimeType() ? options.mimeType() : kDefaultMimeType),
       m_stopped(true),
       m_audioBitsPerSecond(0),
       m_videoBitsPerSecond(0),
       m_state(State::Inactive),
       m_dispatchScheduledEventRunner(AsyncMethodRunner<MediaRecorder>::create(
           this,
           &MediaRecorder::dispatchScheduledEvent)) {
   DCHECK(m_stream->getTracks().size());
 
@@ skipping 148 matching lines @@
 }
 
 void MediaRecorder::writeData(const char* data,
                               size_t length,
                               bool lastInSlice,
                               double timecode) {
   if (m_stopped && !lastInSlice) {
     m_stopped = false;
     scheduleDispatchEvent(Event::create(EventTypeNames::start));
   }
-  if (m_stream && m_streamAmountOfTracks != m_stream->getTracks().size()) {
-    m_streamAmountOfTracks = m_stream->getTracks().size();
-    onError("Amount of tracks in MediaStream has changed.");
-  }
-
-  // TODO(mcasas): Act as |m_ignoredMutedMedia| instructs if |m_stream| track(s)
-  // is in muted() state.

[emircan, 2017/02/17 18:59:25]

Is this TODO still relevant or...

[mcasas, 2017/02/17 20:40:29]

No, it was removed from the Spec in 
https://github.com/w3c/mediacapture-record/issues/99

 
   if (!m_blobData) {
     m_blobData = BlobData::create();
     m_blobData->setContentType(m_mimeType);
   }
   if (data)
     m_blobData->appendBytes(data, length);
 
   if (!lastInSlice)
     return;
 
   // Cache |m_blobData->length()| before release()ng it.
   const long long blobDataLength = m_blobData->length();
   createBlobEvent(Blob::create(BlobDataHandle::create(std::move(m_blobData),
                                                       blobDataLength)),
                   timecode);
 }
 
 void MediaRecorder::onError(const WebString& message) {
-  // TODO(mcasas): Beef up the Error Event and add the |message|, see
-  // https://github.com/w3c/mediacapture-record/issues/31
+  DLOG(ERROR) << message.ascii();
+  stopRecording();
   scheduleDispatchEvent(Event::create(EventTypeNames::error));
 }
 
 void MediaRecorder::createBlobEvent(Blob* blob, double timecode) {
   scheduleDispatchEvent(
       BlobEvent::create(EventTypeNames::dataavailable, blob, timecode));
 }
 
 void MediaRecorder::stopRecording() {
   DCHECK(m_state != State::Inactive);
@@ skipping 22 matching lines @@
 
 DEFINE_TRACE(MediaRecorder) {
   visitor->trace(m_stream);
   visitor->trace(m_dispatchScheduledEventRunner);
   visitor->trace(m_scheduledEvents);
   EventTargetWithInlineData::trace(visitor);
   SuspendableObject::trace(visitor);
 }
 
 }  // namespace blink