third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Unified Diff: third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.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

« no previous file with comments | « third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h ('k') | third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

index e976165f6ac7a6c6f3d8844207b35cdd3fe0e3ff..0a911f619d79063884dfe5cb5c4bd4b8209e7f53 100644

--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

@@ -29,11 +29,10 @@

#include "modules/webaudio/AudioNodeOutput.h"

#include "platform/Logging.h"

#include "wtf/Locker.h"

-#include <memory>

namespace blink {

-MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, std::unique_ptr<AudioSourceProvider> audioSourceProvider)

+MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)

: AudioHandler(NodeTypeMediaStreamAudioSource, node, node.context()->sampleRate())

, m_mediaStream(mediaStream)

, m_audioTrack(audioTrack)

@@ -47,7 +46,7 @@ MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, Me

initialize();

}

-PassRefPtr<MediaStreamAudioSourceHandler> MediaStreamAudioSourceHandler::create(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, std::unique_ptr<AudioSourceProvider> audioSourceProvider)

+PassRefPtr<MediaStreamAudioSourceHandler> MediaStreamAudioSourceHandler::create(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)

{

return adoptRef(new MediaStreamAudioSourceHandler(node, mediaStream, audioTrack, std::move(audioSourceProvider)));

}

@@ -111,7 +110,7 @@ void MediaStreamAudioSourceHandler::process(size_t numberOfFrames)

// ----------------------------------------------------------------

-MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, std::unique_ptr<AudioSourceProvider> audioSourceProvider)

+MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)

: AudioSourceNode(context)

{

setHandler(MediaStreamAudioSourceHandler::create(*this, mediaStream, audioTrack, std::move(audioSourceProvider)));

@@ -136,7 +135,7 @@ MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AbstractAudioCont

// Use the first audio track in the media stream.

MediaStreamTrack* audioTrack = audioTracks[0];

- std::unique_ptr<AudioSourceProvider> provider = audioTrack->createWebAudioSource();

+ OwnPtr<AudioSourceProvider> provider = audioTrack->createWebAudioSource();

MediaStreamAudioSourceNode* node = new MediaStreamAudioSourceNode(context, mediaStream, audioTrack, std::move(provider));