Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects.

Source/modules/mediasource/WebKitSourceBuffer.cpp

 /*
  * Copyright (C) 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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "modules/mediasource/SourceBuffer.h"
+#include "modules/mediasource/WebKitSourceBuffer.h"
 
 #include "core/html/TimeRanges.h"
 #include "core/platform/graphics/SourceBufferPrivate.h"
-#include "modules/mediasource/MediaSource.h"
+#include "modules/mediasource/WebKitMediaSource.h"
 #include "wtf/Uint8Array.h"
 
 namespace WebCore {
 
-PassRefPtr<SourceBuffer> SourceBuffer::create(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, PassRefPtr<MediaSource> source)
+PassRefPtr<WebKitSourceBuffer> WebKitSourceBuffer::create(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, PassRefPtr<WebKitMediaSource> source)
 {
-    return adoptRef(new SourceBuffer(sourceBufferPrivate, source));
+    return adoptRef(new WebKitSourceBuffer(sourceBufferPrivate, source));
 }
 
-SourceBuffer::SourceBuffer(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, PassRefPtr<MediaSource> source)
+WebKitSourceBuffer::WebKitSourceBuffer(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, PassRefPtr<WebKitMediaSource> source)
     : m_private(sourceBufferPrivate)
     , m_source(source)
     , m_timestampOffset(0)
 {
     ASSERT(m_private);
     ASSERT(m_source);
 }
 
-SourceBuffer::~SourceBuffer()
+WebKitSourceBuffer::~WebKitSourceBuffer()
 {
 }
 
-PassRefPtr<TimeRanges> SourceBuffer::buffered(ExceptionCode& ec) const
+PassRefPtr<TimeRanges> WebKitSourceBuffer::buffered(ExceptionCode& ec) const
 {
     // Section 3.1 buffered attribute steps.
     // 1. If this object has been removed from the sourceBuffers attribute of the parent media source then throw an
     //    INVALID_STATE_ERR exception and abort these steps.
     if (isRemoved()) {
         ec = INVALID_STATE_ERR;
         return 0;
     }
 
     // 2. Return a new static normalized TimeRanges object for the media segments buffered.
     return m_private->buffered();
 }
 
-double SourceBuffer::timestampOffset() const
+double WebKitSourceBuffer::timestampOffset() const
 {
     return m_timestampOffset;
 }
 
-void SourceBuffer::setTimestampOffset(double offset, ExceptionCode& ec)
+void WebKitSourceBuffer::setTimestampOffset(double offset, ExceptionCode& ec)
 {
     // Section 3.1 timestampOffset attribute setter steps.
     // 1. If this object has been removed from the sourceBuffers attribute of the parent media source then throw an
     //    INVALID_STATE_ERR exception and abort these steps.
     if (isRemoved()) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     // 4. If the readyState attribute of the parent media source is in the "ended" state then run the following steps:
-    if (isEnded()) {
-        // 4.1 Set the readyState attribute of the parent media source to "open"
-        // 4.2 Queue a task to fire a simple event named sourceopen at the parent media source.
-        m_source->setReadyState(MediaSource::openKeyword());
-    }
+    // 4.1 Set the readyState attribute of the parent media source to "open"
+    // 4.2 Queue a task to fire a simple event named sourceopen at the parent media source.
+    openIfInEndedState();
 
     // 5. If this object is waiting for the end of a media segment to be appended, then throw an INVALID_STATE_ERR
     // and abort these steps.
     if (!m_private->setTimestampOffset(offset)) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     // 6. Update the attribute to the new value.
     m_timestampOffset = offset;
 }
 
-void SourceBuffer::append(PassRefPtr<Uint8Array> data, ExceptionCode& ec)
+void WebKitSourceBuffer::append(PassRefPtr<Uint8Array> data, ExceptionCode& ec)
 {
     // SourceBuffer.append() steps from October 1st version of the Media Source Extensions spec.
     // https://dvcs.w3.org/hg/html-media/raw-file/7bab66368f2c/media-source/media-source.html#dom-append
 
     // 2. If data is null then throw an INVALID_ACCESS_ERR exception and abort these steps.
     if (!data) {
         ec = INVALID_ACCESS_ERR;
         return;
     }
 
     // 3. If this object has been removed from the sourceBuffers attribute of media source then throw
     //    an INVALID_STATE_ERR exception and abort these steps.
     if (isRemoved()) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     // 5. If the readyState attribute of media source is in the "ended" state then run the following steps:
-    if (isEnded()) {
-        // 5.1. Set the readyState attribute of media source to "open"
-        // 5.2. Queue a task to fire a simple event named sourceopen at media source.
-        m_source->setReadyState(MediaSource::openKeyword());
-    }
+    // 5.1. Set the readyState attribute of media source to "open"
+    // 5.2. Queue a task to fire a simple event named sourceopen at media source.
+    openIfInEndedState();
 
     // Steps 6 & beyond are handled by the private implementation.
     m_private->append(data->data(), data->length());
 }
 
-void SourceBuffer::abort(ExceptionCode& ec)
+void WebKitSourceBuffer::abort(ExceptionCode& ec)
 {
     // Section 3.2 abort() method steps.
     // 1. If this object has been removed from the sourceBuffers attribute of the parent media source
     //    then throw an INVALID_STATE_ERR exception and abort these steps.
     // 2. If the readyState attribute of the parent media source is not in the "open" state
     //    then throw an INVALID_STATE_ERR exception and abort these steps.
     if (isRemoved() || !isOpen()) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     // 4. Run the reset parser state algorithm.
     m_private->abort();
 }
 
-void SourceBuffer::removedFromMediaSource()
+void WebKitSourceBuffer::removedFromMediaSource()
 {
     if (isRemoved())
         return;
 
     m_private->removedFromMediaSource();
     m_source.clear();
 }
 
-bool SourceBuffer::isRemoved() const
+bool WebKitSourceBuffer::isRemoved() const
 {
     return !m_source;
 }
 
-bool SourceBuffer::isOpen() const
+bool WebKitSourceBuffer::isOpen() const
 {
     ASSERT(m_source);
-    return m_source->readyState() == MediaSource::openKeyword();
+    return m_source->readyState() == WebKitMediaSource::openKeyword();
 }
 
-bool SourceBuffer::isEnded() const
+void WebKitSourceBuffer::openIfInEndedState()
 {
     ASSERT(m_source);
-    return m_source->readyState() == MediaSource::endedKeyword();
+    if (m_source->readyState() != WebKitMediaSource::endedKeyword())
+        return;
+
+    m_source->setReadyState(WebKitMediaSource::openKeyword());
 }
 
 } // namespace WebCore