content/renderer/media/webrtc/webrtc_media_stream_adapter.cc - Issue 503683003: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/webrtc*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

Issue 503683003: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/webrtc* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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 | « content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc ('k') | content/renderer/media/webrtc_audio_capturer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

index 0751238daf31c9f074956768ff0cf8d4cfe01059..3903f67201f2ab5968aa007fc7f9d0c4e1a8e487 100644

--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

@@ -64,7 +64,7 @@ void WebRtcMediaStreamAdapter::TrackRemoved(

for (ScopedVector<WebRtcVideoTrackAdapter>::iterator it =

video_adapters_.begin(); it != video_adapters_.end(); ++it) {

- if ((*it)->webrtc_video_track() == webrtc_track) {

+ if ((*it)->webrtc_video_track() == webrtc_track.get()) {

video_adapters_.erase(it);

break;

}

@@ -93,7 +93,7 @@ void WebRtcMediaStreamAdapter::CreateAudioTrack(

const blink::WebMediaStreamSource& source = track.source();

MediaStreamAudioSource* audio_source =

static_cast<MediaStreamAudioSource*>(source.extraData());

- if (audio_source && audio_source->GetAudioCapturer())

+ if (audio_source && audio_source->GetAudioCapturer().get())

audio_source->GetAudioCapturer()->EnablePeerConnectionMode();

webrtc_media_stream_->AddTrack(native_track->GetAudioAdapter());