Remove MediaSourcePrivate/SourceBufferPrivate

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 16 matching lines @@
  * (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/WebKitSourceBuffer.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/html/TimeRanges.h"
-#include "core/platform/graphics/SourceBufferPrivate.h"
 #include "modules/mediasource/WebKitMediaSource.h"
 #include "platform/TraceEvent.h"
+#include "public/platform/WebSourceBuffer.h"
+#include "public/platform/WebTimeRange.h"
 #include "wtf/Uint8Array.h"
 
+using blink::WebSourceBuffer;
+using blink::WebTimeRanges;
+
 namespace WebCore {
 
-PassRefPtr<WebKitSourceBuffer> WebKitSourceBuffer::create(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, PassRefPtr<WebKitMediaSource> source)
+PassRefPtr<WebKitSourceBuffer> WebKitSourceBuffer::create(PassOwnPtr<WebSourceBuffer> webSourceBuffer, PassRefPtr<WebKitMediaSource> source)
 {
-    return adoptRef(new WebKitSourceBuffer(sourceBufferPrivate, source));
+    return adoptRef(new WebKitSourceBuffer(webSourceBuffer, source));
 }
 
-WebKitSourceBuffer::WebKitSourceBuffer(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, PassRefPtr<WebKitMediaSource> source)
-    : m_private(sourceBufferPrivate)
+WebKitSourceBuffer::WebKitSourceBuffer(PassOwnPtr<WebSourceBuffer> webSourceBuffer, PassRefPtr<WebKitMediaSource> source)
+    : m_webSourceBuffer(webSourceBuffer)
     , m_source(source)
     , m_timestampOffset(0)
 {
-    ASSERT(m_private);
+    ASSERT(m_webSourceBuffer);
     ASSERT(m_source);
     ScriptWrappable::init(this);
 }
 
 WebKitSourceBuffer::~WebKitSourceBuffer()
 {
 }
 
 PassRefPtr<TimeRanges> WebKitSourceBuffer::buffered(ExceptionState& es) 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
     //    InvalidStateError exception and abort these steps.
     if (isRemoved()) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return 0;
     }
 
     // 2. Return a new static normalized TimeRanges object for the media segments buffered.
-    return m_private->buffered();
+    WebTimeRanges webRanges = m_webSourceBuffer->buffered();

[acolwell GONE FROM CHROMIUM, 2013/11/11 18:06:55]

WDYT about creating a constructor on TimeRanges that takes a const
WebTimeRanges& so we don't have to duplicate this code.

[philipj_slow, 2013/11/12 09:43:51]

Yes, I thought about that as well. Done.

+    RefPtr<TimeRanges> ranges = TimeRanges::create();
+    for (size_t i = 0; i < webRanges.size(); ++i)
+        ranges->add(webRanges[i].start, webRanges[i].end);
+    return ranges.release();
 }
 
 double WebKitSourceBuffer::timestampOffset() const
 {
     return m_timestampOffset;
 }
 
 void WebKitSourceBuffer::setTimestampOffset(double offset, ExceptionState& es)
 {
     // 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
     //    InvalidStateError exception and abort these steps.
     if (isRemoved()) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     // 4. If the readyState attribute of the parent media source is in the "ended" state then run the following steps:
     // 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->openIfInEndedState();
 
     // 5. If this object is waiting for the end of a media segment to be appended, then throw an InvalidStateError
     // and abort these steps.
-    if (!m_private->setTimestampOffset(offset)) {
+    if (!m_webSourceBuffer->setTimestampOffset(offset)) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     // 6. Update the attribute to the new value.
     m_timestampOffset = offset;
 }
 
 void WebKitSourceBuffer::append(PassRefPtr<Uint8Array> data, ExceptionState& es)
 {
@@ skipping 13 matching lines @@
     if (isRemoved()) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     // 5. If the readyState attribute of media source is in the "ended" state then run the following steps:
     // 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->openIfInEndedState();
 
-    // Steps 6 & beyond are handled by the private implementation.
-    m_private->append(data->data(), data->length());
+    // Steps 6 & beyond are handled by m_webSourceBuffer.
+    m_webSourceBuffer->append(data->data(), data->length());
 }
 
 void WebKitSourceBuffer::abort(ExceptionState& es)
 {
     // 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 InvalidStateError exception and abort these steps.
     // 2. If the readyState attribute of the parent media source is not in the "open" state
     //    then throw an InvalidStateError exception and abort these steps.
     if (isRemoved() || !m_source->isOpen()) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     // 4. Run the reset parser state algorithm.
-    m_private->abort();
+    m_webSourceBuffer->abort();
 }
 
 void WebKitSourceBuffer::removedFromMediaSource()
 {
     if (isRemoved())
         return;
 
-    m_private->removedFromMediaSource();
+    m_webSourceBuffer->removedFromMediaSource();
     m_source.clear();
 }
 
 bool WebKitSourceBuffer::isRemoved() const
 {
     return !m_source;
 }
 
 } // namespace WebCore