Remove MediaSourcePrivate/SourceBufferPrivate

Source/modules/mediasource/MediaSourceBase.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 18 matching lines @@
  */
 
 #include "config.h"
 #include "modules/mediasource/MediaSourceBase.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/Event.h"
 #include "core/events/GenericEventQueue.h"
-#include "core/platform/graphics/SourceBufferPrivate.h"
+#include "core/html/TimeRanges.h"
 #include "modules/mediasource/MediaSourceRegistry.h"
 #include "platform/Logging.h"
 #include "platform/TraceEvent.h"
+#include "public/platform/WebMediaSource.h"
+#include "public/platform/WebSourceBuffer.h"
 #include "wtf/text/WTFString.h"
 
+using blink::WebMediaSource;
+using blink::WebSourceBuffer;
+
 namespace WebCore {
 
 MediaSourceBase::MediaSourceBase(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_readyState(closedKeyword())
     , m_asyncEventQueue(GenericEventQueue::create(this))
     , m_attachedElement(0)
 {
 }
 
@@ skipping 12 matching lines @@
     DEFINE_STATIC_LOCAL(const AtomicString, closed, ("closed", AtomicString::ConstructFromLiteral));
     return closed;
 }
 
 const AtomicString& MediaSourceBase::endedKeyword()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, ended, ("ended", AtomicString::ConstructFromLiteral));
     return ended;
 }
 
-void MediaSourceBase::setPrivateAndOpen(PassOwnPtr<MediaSourcePrivate> mediaSourcePrivate)
+void MediaSourceBase::setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource> webMediaSource)
 {
     TRACE_EVENT_ASYNC_END0("media", "MediaSourceBase::attachToElement", this);
-    ASSERT(mediaSourcePrivate);
-    ASSERT(!m_private);
+    ASSERT(webMediaSource);
+    ASSERT(!m_webMediaSource);
     ASSERT(m_attachedElement);
-    m_private = mediaSourcePrivate;
+    m_webMediaSource = webMediaSource;
     setReadyState(openKeyword());
 }
 
 void MediaSourceBase::addedToRegistry()
 {
     setPendingActivity(this);
 }
 
 void MediaSourceBase::removedFromRegistry()
 {
     unsetPendingActivity(this);
 }
 
 double MediaSourceBase::duration() const
 {
-    return isClosed() ? std::numeric_limits<float>::quiet_NaN() : m_private->duration();
+    return isClosed() ? std::numeric_limits<float>::quiet_NaN() : m_webMediaSource->duration();
 }
 
 PassRefPtr<TimeRanges> MediaSourceBase::buffered() const
 {
     // Implements MediaSource algorithm for HTMLMediaElement.buffered.
     // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#htmlmediaelement-extensions
     Vector<RefPtr<TimeRanges> > ranges = activeRanges();
 
     // 1. If activeSourceBuffers.length equals 0 then return an empty TimeRanges object and abort these steps.
     if (ranges.isEmpty())
@@ skipping 40 matching lines @@
         return;
     }
     if (!isOpen()) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     // Synchronously process duration change algorithm to enforce any required
     // seek is started prior to returning.
     m_attachedElement->durationChanged(duration);
-    m_private->setDuration(duration);
+    m_webMediaSource->setDuration(duration);
 }
 
 
 void MediaSourceBase::setReadyState(const AtomicString& state)
 {
     ASSERT(state == openKeyword() || state == closedKeyword() || state == endedKeyword());
 
     AtomicString oldState = readyState();
     LOG(Media, "MediaSourceBase::setReadyState() %p : %s -> %s", this, oldState.string().ascii().data(), state.string().ascii().data());
 
     if (state == closedKeyword()) {
-        m_private.clear();
+        m_webMediaSource.clear();
         m_attachedElement = 0;
     }
 
     if (oldState == state)
         return;
 
     m_readyState = state;
 
     onReadyStateChange(oldState, state);
 }
 
 void MediaSourceBase::endOfStream(const AtomicString& error, ExceptionState& es)
 {
     DEFINE_STATIC_LOCAL(const AtomicString, network, ("network", AtomicString::ConstructFromLiteral));
     DEFINE_STATIC_LOCAL(const AtomicString, decode, ("decode", AtomicString::ConstructFromLiteral));
 
     // 3.1 http://dvcs.w3.org/hg/html-media/raw-file/tip/media-source/media-source.html#dom-endofstream
     // 1. If the readyState attribute is not in the "open" state then throw an
     // InvalidStateError exception and abort these steps.
     if (!isOpen()) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
-    MediaSourcePrivate::EndOfStreamStatus eosStatus = MediaSourcePrivate::EosNoError;
+    WebMediaSource::EndOfStreamStatus eosStatus = WebMediaSource::EndOfStreamStatusNoError;
 
     if (error.isNull() || error.isEmpty()) {
-        eosStatus = MediaSourcePrivate::EosNoError;
+        eosStatus = WebMediaSource::EndOfStreamStatusNoError;
     } else if (error == network) {
-        eosStatus = MediaSourcePrivate::EosNetworkError;
+        eosStatus = WebMediaSource::EndOfStreamStatusNetworkError;
     } else if (error == decode) {
-        eosStatus = MediaSourcePrivate::EosDecodeError;
+        eosStatus = WebMediaSource::EndOfStreamStatusDecodeError;
     } else {
         es.throwUninformativeAndGenericDOMException(InvalidAccessError);
         return;
     }
 
     // 2. Change the readyState attribute value to "ended".
     setReadyState(endedKeyword());
-    m_private->markEndOfStream(eosStatus);
+    m_webMediaSource->markEndOfStream(eosStatus);
 }
 
 bool MediaSourceBase::isOpen() const
 {
     return readyState() == openKeyword();
 }
 
 bool MediaSourceBase::isClosed() const
 {
     return readyState() == closedKeyword();
@@ skipping 15 matching lines @@
     m_attachedElement = element;
     return true;
 }
 
 void MediaSourceBase::openIfInEndedState()
 {
     if (m_readyState != endedKeyword())
         return;
 
     setReadyState(openKeyword());
-    m_private->unmarkEndOfStream();
+    m_webMediaSource->unmarkEndOfStream();
 }
 
 bool MediaSourceBase::hasPendingActivity() const
 {
-    return m_private || m_asyncEventQueue->hasPendingEvents()
+    return m_webMediaSource || m_asyncEventQueue->hasPendingEvents()
         || ActiveDOMObject::hasPendingActivity();
 }
 
 void MediaSourceBase::stop()
 {
     m_asyncEventQueue->close();
     if (!isClosed())
         setReadyState(closedKeyword());
-    m_private.clear();
+    m_webMediaSource.clear();
 }
 
-PassOwnPtr<SourceBufferPrivate> MediaSourceBase::createSourceBufferPrivate(const String& type, const MediaSourcePrivate::CodecsArray& codecs, ExceptionState& es)
+PassOwnPtr<WebSourceBuffer> MediaSourceBase::createWebSourceBuffer(const String& type, const Vector<String>& codecs, ExceptionState& es)
 {
-    OwnPtr<SourceBufferPrivate> sourceBufferPrivate;
-    switch (m_private->addSourceBuffer(type, codecs, &sourceBufferPrivate)) {
-    case MediaSourcePrivate::Ok: {
-        return sourceBufferPrivate.release();
-    }
-    case MediaSourcePrivate::NotSupported:
+    WebSourceBuffer* webSourceBuffer = 0;
+    switch (m_webMediaSource->addSourceBuffer(type, codecs, &webSourceBuffer)) {
+    case WebMediaSource::AddStatusOk:
+        return adoptPtr(webSourceBuffer);
+    case WebMediaSource::AddStatusNotSupported:

[adamk, 2013/11/12 20:59:19]

Can you add ASSERT(!webSourceBuffer) here and...

[philipj_slow, 2013/11/12 22:13:46]

Done.

         // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
         // Step 2: If type contains a MIME type ... that is not supported with the types
         // specified for the other SourceBuffer objects in sourceBuffers, then throw
         // a NotSupportedError exception and abort these steps.
         es.throwUninformativeAndGenericDOMException(NotSupportedError);
         return nullptr;
-    case MediaSourcePrivate::ReachedIdLimit:
+    case WebMediaSource::AddStatusReachedIdLimit:

[adamk, 2013/11/12 20:59:19]

...here too? That gives us back some of the safety we lost when we got rid of
the OwnPtr

[philipj_slow, 2013/11/12 22:13:46]

Done.

         // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
         // Step 3: If the user agent can't handle any more SourceBuffer objects then throw
         // a QuotaExceededError exception and abort these steps.
         es.throwUninformativeAndGenericDOMException(QuotaExceededError);
         return nullptr;
     }
 
     ASSERT_NOT_REACHED();
     return nullptr;
 }
@@ skipping 12 matching lines @@
 {
     return ActiveDOMObject::executionContext();
 }
 
 URLRegistry& MediaSourceBase::registry() const
 {
     return MediaSourceRegistry::registry();
 }
 
 }