| Index: Source/modules/mediasource/WebKitMediaSource.cpp
|
| diff --git a/Source/modules/mediasource/WebKitMediaSource.cpp b/Source/modules/mediasource/WebKitMediaSource.cpp
|
| index c7d458a3a81a49438b68871b38dfab7a982ce472..84680573d1add7336a92340f562226bcbb71eb3a 100644
|
| --- a/Source/modules/mediasource/WebKitMediaSource.cpp
|
| +++ b/Source/modules/mediasource/WebKitMediaSource.cpp
|
| @@ -35,12 +35,14 @@
|
| #include "bindings/v8/ExceptionStatePlaceholder.h"
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/html/TimeRanges.h"
|
| -#include "core/platform/graphics/SourceBufferPrivate.h"
|
| #include "modules/mediasource/MediaSourceRegistry.h"
|
| #include "platform/ContentType.h"
|
| #include "platform/MIMETypeRegistry.h"
|
| +#include "public/platform/WebSourceBuffer.h"
|
| #include "wtf/Uint8Array.h"
|
|
|
| +using blink::WebSourceBuffer;
|
| +
|
| namespace WebCore {
|
|
|
| PassRefPtr<WebKitMediaSource> WebKitMediaSource::create(ExecutionContext* context)
|
| @@ -96,11 +98,11 @@ WebKitSourceBuffer* WebKitMediaSource::addSourceBuffer(const String& type, Excep
|
| // 5. Create a new SourceBuffer object and associated resources.
|
| ContentType contentType(type);
|
| Vector<String> codecs = contentType.codecs();
|
| - OwnPtr<SourceBufferPrivate> sourceBufferPrivate = createSourceBufferPrivate(contentType.type(), codecs, es);
|
| - if (!sourceBufferPrivate)
|
| + OwnPtr<WebSourceBuffer> webSourceBuffer = createWebSourceBuffer(contentType.type(), codecs, es);
|
| + if (!webSourceBuffer)
|
| return 0;
|
|
|
| - RefPtr<WebKitSourceBuffer> buffer = WebKitSourceBuffer::create(sourceBufferPrivate.release(), this);
|
| + RefPtr<WebKitSourceBuffer> buffer = WebKitSourceBuffer::create(webSourceBuffer.release(), this);
|
| // 6. Add the new object to sourceBuffers and fire a addsourcebuffer on that object.
|
| m_sourceBuffers->add(buffer);
|
| m_activeSourceBuffers->add(buffer);
|
|
|