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

Unified Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp

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/platform/mediastream/MediaStreamCenter.cpp
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
index f883c8113c5c9f46a322ac0da1d55d3c51a77232..32943eef1abe882956fcd97813c84f0eb8892c63 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
@@ -40,8 +40,7 @@
#include "public/platform/WebMediaStreamCenter.h"
#include "public/platform/WebMediaStreamTrack.h"
#include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
+#include "wtf/PassOwnPtr.h"
namespace blink {
@@ -53,7 +52,7 @@ MediaStreamCenter& MediaStreamCenter::instance()
}
MediaStreamCenter::MediaStreamCenter()
- : m_private(wrapUnique(Platform::current()->createMediaStreamCenter(this)))
+ : m_private(adoptPtr(Platform::current()->createMediaStreamCenter(this)))
{
}
@@ -122,11 +121,11 @@ void MediaStreamCenter::didCreateMediaStreamTrack(MediaStreamComponent* track)
m_private->didCreateMediaStreamTrack(track);
}
-std::unique_ptr<AudioSourceProvider> MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(MediaStreamComponent* track)
+PassOwnPtr<AudioSourceProvider> MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(MediaStreamComponent* track)
{
ASSERT_UNUSED(track, track);
if (m_private)
- return MediaStreamWebAudioSource::create(wrapUnique(m_private->createWebAudioSourceFromMediaStreamTrack(track)));
+ return MediaStreamWebAudioSource::create(adoptPtr(m_private->createWebAudioSourceFromMediaStreamTrack(track)));
return nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698