Index: third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h |
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h |
index da461bcb74d3a34f34a98f0ea136599337268614..d0f448ddc81ed97ee41abe726f8427f005633b97 100644 |
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h |
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h |
@@ -29,9 +29,9 @@ |
#include "modules/webaudio/AudioSourceNode.h" |
#include "platform/audio/AudioSourceProvider.h" |
#include "platform/audio/AudioSourceProviderClient.h" |
-#include "wtf/OwnPtr.h" |
#include "wtf/PassRefPtr.h" |
#include "wtf/Threading.h" |
+#include <memory> |
namespace blink { |
@@ -39,7 +39,7 @@ class AbstractAudioContext; |
class MediaStreamAudioSourceHandler final : public AudioHandler { |
public: |
- static PassRefPtr<MediaStreamAudioSourceHandler> create(AudioNode&, MediaStream&, MediaStreamTrack*, PassOwnPtr<AudioSourceProvider>); |
+ static PassRefPtr<MediaStreamAudioSourceHandler> create(AudioNode&, MediaStream&, MediaStreamTrack*, std::unique_ptr<AudioSourceProvider>); |
~MediaStreamAudioSourceHandler() override; |
MediaStream* getMediaStream() { return m_mediaStream.get(); } |
@@ -54,7 +54,7 @@ public: |
AudioSourceProvider* getAudioSourceProvider() const { return m_audioSourceProvider.get(); } |
private: |
- MediaStreamAudioSourceHandler(AudioNode&, MediaStream&, MediaStreamTrack*, PassOwnPtr<AudioSourceProvider>); |
+ MediaStreamAudioSourceHandler(AudioNode&, MediaStream&, MediaStreamTrack*, std::unique_ptr<AudioSourceProvider>); |
// As an audio source, we will never propagate silence. |
bool propagatesSilence() const override { return false; } |
@@ -62,7 +62,7 @@ private: |
// MediaStreamAudioSourceNode. |
Persistent<MediaStream> m_mediaStream; |
Persistent<MediaStreamTrack> m_audioTrack; |
- OwnPtr<AudioSourceProvider> m_audioSourceProvider; |
+ std::unique_ptr<AudioSourceProvider> m_audioSourceProvider; |
Mutex m_processLock; |
@@ -83,7 +83,7 @@ public: |
void setFormat(size_t numberOfChannels, float sampleRate) override; |
private: |
- MediaStreamAudioSourceNode(AbstractAudioContext&, MediaStream&, MediaStreamTrack*, PassOwnPtr<AudioSourceProvider>); |
+ MediaStreamAudioSourceNode(AbstractAudioContext&, MediaStream&, MediaStreamTrack*, std::unique_ptr<AudioSourceProvider>); |
}; |
} // namespace blink |