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

Unified Diff: content/renderer/media/media_stream_impl.cc

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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: content/renderer/media/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index 7f2de52a99c618c06be7924fbf3b8c81793046e8..20277b8dc7bd1a7d8c721780efe4ae55aca8006f 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -101,7 +101,7 @@ webrtc::MediaStreamInterface* GetNativeMediaStream(
static_cast<content::MediaStreamExtraData*>(descriptor.extraData());
if (!extra_data)
return NULL;
- return extra_data->stream();
+ return extra_data->stream().get();
}
} // namespace
@@ -258,10 +258,10 @@ MediaStreamImpl::GetAudioRenderer(const GURL& url) {
if (extra_data->is_local()) {
// Create the local audio renderer if the stream contains audio tracks.
- return CreateLocalAudioRenderer(extra_data->stream());
+ return CreateLocalAudioRenderer(extra_data->stream().get());
}
- webrtc::MediaStreamInterface* stream = extra_data->stream();
+ webrtc::MediaStreamInterface* stream = extra_data->stream().get();
if (!stream || stream->GetAudioTracks().empty())
return NULL;
@@ -271,10 +271,10 @@ MediaStreamImpl::GetAudioRenderer(const GURL& url) {
// Share the existing renderer if any, otherwise create a new one.
scoped_refptr<WebRtcAudioRenderer> renderer(audio_device->renderer());
- if (!renderer) {
- renderer = CreateRemoteAudioRenderer(extra_data->stream());
+ if (!renderer.get()) {
+ renderer = CreateRemoteAudioRenderer(extra_data->stream().get());
- if (renderer && !audio_device->SetAudioRenderer(renderer))
+ if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get()))
renderer = NULL;
}
return renderer;
@@ -549,7 +549,7 @@ MediaStreamImpl::CreateLocalAudioRenderer(
scoped_refptr<WebRtcAudioCapturer> source =
dependency_factory_->GetWebRtcAudioDevice()->capturer();
- if (!source) {
+ if (!source.get()) {
return NULL;
}

Powered by Google App Engine
This is Rietveld 408576698