| Index: third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp b/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
|
| index 2ab2e785551d6a83528be84b6cd53c41baaa6bd8..6ff989db99a5205db5e1e97c90d6dd2c29b5f8ce 100644
|
| --- a/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
|
| @@ -46,7 +46,9 @@
|
| #include "platform/TraceEvent.h"
|
| #include "public/platform/WebMediaSource.h"
|
| #include "public/platform/WebSourceBuffer.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/text/CString.h"
|
| +#include <memory>
|
|
|
| using blink::WebMediaSource;
|
| using blink::WebSourceBuffer;
|
| @@ -148,7 +150,7 @@ SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& e
|
| // 5. Create a new SourceBuffer object and associated resources.
|
| ContentType contentType(type);
|
| String codecs = contentType.parameter("codecs");
|
| - OwnPtr<WebSourceBuffer> webSourceBuffer = createWebSourceBuffer(contentType.type(), codecs, exceptionState);
|
| + std::unique_ptr<WebSourceBuffer> webSourceBuffer = createWebSourceBuffer(contentType.type(), codecs, exceptionState);
|
|
|
| if (!webSourceBuffer) {
|
| DCHECK(exceptionState.code() == NotSupportedError || exceptionState.code() == QuotaExceededError);
|
| @@ -285,7 +287,7 @@ DEFINE_TRACE(MediaSource)
|
| ActiveDOMObject::trace(visitor);
|
| }
|
|
|
| -void MediaSource::setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource> webMediaSource)
|
| +void MediaSource::setWebMediaSourceAndOpen(std::unique_ptr<WebMediaSource> webMediaSource)
|
| {
|
| TRACE_EVENT_ASYNC_END0("media", "MediaSource::attachToElement", this);
|
| DCHECK(webMediaSource);
|
| @@ -577,13 +579,13 @@ void MediaSource::stop()
|
| m_webMediaSource.reset();
|
| }
|
|
|
| -PassOwnPtr<WebSourceBuffer> MediaSource::createWebSourceBuffer(const String& type, const String& codecs, ExceptionState& exceptionState)
|
| +std::unique_ptr<WebSourceBuffer> MediaSource::createWebSourceBuffer(const String& type, const String& codecs, ExceptionState& exceptionState)
|
| {
|
| WebSourceBuffer* webSourceBuffer = 0;
|
|
|
| switch (m_webMediaSource->addSourceBuffer(type, codecs, &webSourceBuffer)) {
|
| case WebMediaSource::AddStatusOk:
|
| - return adoptPtr(webSourceBuffer);
|
| + return wrapUnique(webSourceBuffer);
|
| case WebMediaSource::AddStatusNotSupported:
|
| DCHECK(!webSourceBuffer);
|
| // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
|
|
|