Remove SourceBuffer media tracks on detach from media element

third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

 /*
  * Copyright (C) 2013 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 159 matching lines @@
 
     // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-removeSourceBuffer-void-SourceBuffer-sourceBuffer
 
     // 1. If sourceBuffer specifies an object that is not in sourceBuffers then
     // throw a NotFoundError exception and abort these steps.
     if (!m_sourceBuffers->length() || !m_sourceBuffers->contains(buffer)) {
         logAndThrowDOMException(exceptionState, NotFoundError, "The SourceBuffer provided is not contained in this MediaSource.");
         return;
     }
 
-    // 2. If the sourceBuffer.updating attribute equals true, then run the following steps: ...
-    buffer->abortIfUpdating();
-
-    // Steps 3-8 are related to updating audioTracks, videoTracks, and textTracks which aren't implmented yet.
-    // FIXME(91649): support track selection
+    // Steps 2-8 are implemented by SourceBuffer::removedFromMediaSource.
+    buffer->removedFromMediaSource();
 
     // 9. If sourceBuffer is in activeSourceBuffers, then remove sourceBuffer from activeSourceBuffers ...
     m_activeSourceBuffers->remove(buffer);
 
     // 10. Remove sourceBuffer from sourceBuffers and fire a removesourcebuffer event
     // on that object.
     m_sourceBuffers->remove(buffer);
 
     // 11. Destroy all resources for sourceBuffer.
-    buffer->removedFromMediaSource();
+    // This should have been done already by SourceBuffer::removedFromMediaSource (steps 2-8) above.
 }
 
 void MediaSource::onReadyStateChange(const AtomicString& oldState, const AtomicString& newState)
 {
     if (isOpen()) {
         scheduleEvent(EventTypeNames::sourceopen);
         return;
     }
 
     if (oldState == openKeyword() && newState == endedKeyword()) {
         scheduleEvent(EventTypeNames::sourceended);
         return;
     }
 
     ASSERT(isClosed());
 
     m_activeSourceBuffers->clear();
 
     // Clear SourceBuffer references to this object.
     for (unsigned long i = 0; i < m_sourceBuffers->length(); ++i)
         m_sourceBuffers->item(i)->removedFromMediaSource();
     m_sourceBuffers->clear();
 
+    m_attachedElement.clear();
+
     scheduleEvent(EventTypeNames::sourceclose);
 }
 
 bool MediaSource::isUpdating() const
 {
     // Return true if any member of |m_sourceBuffers| is updating.
     for (unsigned long i = 0; i < m_sourceBuffers->length(); ++i) {
         if (m_sourceBuffers->item(i)->updating())
             return true;
     }
@@ skipping 215 matching lines @@
 
 void MediaSource::setReadyState(const AtomicString& state)
 {
     ASSERT(state == openKeyword() || state == closedKeyword() || state == endedKeyword());
 
     AtomicString oldState = readyState();
     WTF_LOG(Media, "MediaSource::setReadyState() %p : %s -> %s", this, oldState.ascii().data(), state.ascii().data());
 
     if (state == closedKeyword()) {
         m_webMediaSource.clear();
-        m_attachedElement.clear();
     }
 
     if (oldState == state)
         return;
 
     m_readyState = state;
 
     onReadyStateChange(oldState, state);
 }
 
@@ skipping 150 matching lines @@
 
     m_asyncEventQueue->enqueueEvent(event);
 }
 
 URLRegistry& MediaSource::registry() const
 {
     return MediaSourceRegistry::registry();
 }
 
 } // namespace blink