Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(751)

Unified Diff: third_party/WebKit/Source/modules/mediasource/SourceBuffer.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
diff --git a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
index 2d3875287011b20775c6a6d57ccc93b2b88bbf5c..5add19dff48d8a5284479b754ee72dff2b73b765 100644
--- a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
+++ b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
@@ -40,7 +40,6 @@
#include "platform/weborigin/KURL.h"
#include "public/platform/WebSourceBufferClient.h"
#include "wtf/text/WTFString.h"
-#include <memory>
namespace blink {
@@ -66,7 +65,7 @@ class SourceBuffer final
DEFINE_WRAPPERTYPEINFO();
USING_PRE_FINALIZER(SourceBuffer, dispose);
public:
- static SourceBuffer* create(std::unique_ptr<WebSourceBuffer>, MediaSource*, GenericEventQueue*);
+ static SourceBuffer* create(PassOwnPtr<WebSourceBuffer>, MediaSource*, GenericEventQueue*);
static const AtomicString& segmentsKeyword();
static const AtomicString& sequenceKeyword();
@@ -116,7 +115,7 @@ public:
DECLARE_VIRTUAL_TRACE();
private:
- SourceBuffer(std::unique_ptr<WebSourceBuffer>, MediaSource*, GenericEventQueue*);
+ SourceBuffer(PassOwnPtr<WebSourceBuffer>, MediaSource*, GenericEventQueue*);
void dispose();
bool isRemoved() const;
@@ -143,7 +142,7 @@ private:
void didFinishLoading() override;
void didFail(FileError::ErrorCode) override;
- std::unique_ptr<WebSourceBuffer> m_webSourceBuffer;
+ OwnPtr<WebSourceBuffer> m_webSourceBuffer;
Member<MediaSource> m_source;
Member<TrackDefaultList> m_trackDefaults;
Member<GenericEventQueue> m_asyncEventQueue;
@@ -169,7 +168,7 @@ private:
unsigned long long m_streamMaxSize;
Member<AsyncMethodRunner<SourceBuffer>> m_appendStreamAsyncPartRunner;
Member<Stream> m_stream;
- std::unique_ptr<FileReaderLoader> m_loader;
+ OwnPtr<FileReaderLoader> m_loader;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698