Remove MediaSourcePrivate/SourceBufferPrivate

Source/modules/mediasource/WebKitSourceBuffer.cpp

Index: Source/modules/mediasource/WebKitSourceBuffer.cpp
diff --git a/Source/modules/mediasource/WebKitSourceBuffer.cpp b/Source/modules/mediasource/WebKitSourceBuffer.cpp
index c7099a2c6e8ba660f2d79d8e33adc93a29e01675..5a9c0dc337fe072d493eb6f7210240ce54491d76 100644
--- a/Source/modules/mediasource/WebKitSourceBuffer.cpp
+++ b/Source/modules/mediasource/WebKitSourceBuffer.cpp
@@ -34,24 +34,28 @@
 #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);
 }
@@ -71,7 +75,11 @@ PassRefPtr<TimeRanges> WebKitSourceBuffer::buffered(ExceptionState& es) const
     }
 
     // 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
@@ -96,7 +104,7 @@ void WebKitSourceBuffer::setTimestampOffset(double offset, ExceptionState& es)
 
     // 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;
     }
@@ -130,8 +138,8 @@ void WebKitSourceBuffer::append(PassRefPtr<Uint8Array> data, ExceptionState& es)
     // 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)
@@ -147,7 +155,7 @@ void WebKitSourceBuffer::abort(ExceptionState& es)
     }
 
     // 4. Run the reset parser state algorithm.
-    m_private->abort();
+    m_webSourceBuffer->abort();
 }
 
 void WebKitSourceBuffer::removedFromMediaSource()
@@ -155,7 +163,7 @@ void WebKitSourceBuffer::removedFromMediaSource()
     if (isRemoved())
         return;
 
-    m_private->removedFromMediaSource();
+    m_webSourceBuffer->removedFromMediaSource();
     m_source.clear();
 }