| Index: content/renderer/media/user_media_client_impl.cc
|
| diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
|
| index 10122a048a4468a368fd10747996b159811a8868..568c95b58f1ff69fc44f4b9374648a8abfb17d60 100644
|
| --- a/content/renderer/media/user_media_client_impl.cc
|
| +++ b/content/renderer/media/user_media_client_impl.cc
|
| @@ -673,8 +673,8 @@ void UserMediaClientImpl::CreateVideoTracks(
|
| blink::WebMediaStreamSource::TypeVideo,
|
| constraints,
|
| &webkit_source);
|
| - (*webkit_tracks)[i] =
|
| - request->CreateAndStartVideoTrack(webkit_source, constraints);
|
| + (*webkit_tracks)[i].initialize(webkit_source);
|
| + request->StartVideoTrack((*webkit_tracks)[i], constraints);
|
| }
|
| }
|
|
|
| @@ -1110,21 +1110,23 @@ void UserMediaClientImpl::UserMediaRequestInfo::StartAudioTrack(
|
| OnTrackStarted(native_source, MEDIA_DEVICE_TRACK_START_FAILURE, "");
|
| }
|
|
|
| -blink::WebMediaStreamTrack
|
| -UserMediaClientImpl::UserMediaRequestInfo::CreateAndStartVideoTrack(
|
| - const blink::WebMediaStreamSource& source,
|
| +void UserMediaClientImpl::UserMediaRequestInfo::StartVideoTrack(
|
| + const blink::WebMediaStreamTrack& track,
|
| const blink::WebMediaConstraints& constraints) {
|
| - DCHECK(source.getType() == blink::WebMediaStreamSource::TypeVideo);
|
| + DCHECK(track.source().getType() == blink::WebMediaStreamSource::TypeVideo);
|
| MediaStreamVideoSource* native_source =
|
| - MediaStreamVideoSource::GetVideoSource(source);
|
| + MediaStreamVideoSource::GetVideoSource(track.source());
|
| +
|
| DCHECK(native_source);
|
| - sources_.push_back(source);
|
| + sources_.push_back(track.source());
|
| sources_waiting_for_callback_.push_back(native_source);
|
| - return MediaStreamVideoTrack::CreateVideoTrack(
|
| - native_source, constraints, base::Bind(
|
| - &UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted,
|
| - AsWeakPtr()),
|
| - true);
|
| + if (native_source->ConnectToTrack(track)) {
|
| + native_source->ApplyConstraints(track, constraints, base::Bind(
|
| + &UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted,
|
| + AsWeakPtr()));
|
| + } else {
|
| + OnTrackStarted(native_source, MEDIA_DEVICE_TRACK_START_FAILURE, "");
|
| + }
|
| }
|
|
|
| void UserMediaClientImpl::UserMediaRequestInfo::CallbackOnTracksStarted(
|
|
|