Commit cb9a4b5a authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Hold onto UserMediaRequest strongly in UserMediaProcessor

... when dispatching callbacks that pass UserMediaRequest instances.

This CL switch from using WrapWeakPersistent to WrapPersistent in
UserMediaProcessor code, when dispatcking callback calls passing
UserMediaRequest as parameters.

This is a follow up of https://crrev.com/c/2064748.

BUG=1054999, 704136
R=guidou@chromium.org

Change-Id: I5696b1efdae769382d61d9dfb2652ccdcd3f3a55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070228
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Auto-Submit: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#744270}
parent 11a9b47a
...@@ -617,7 +617,7 @@ void UserMediaProcessor::SetupAudioInput() { ...@@ -617,7 +617,7 @@ void UserMediaProcessor::SetupAudioInput() {
GetMediaDevicesDispatcher()->GetAudioInputCapabilities( GetMediaDevicesDispatcher()->GetAudioInputCapabilities(
WTF::Bind(&UserMediaProcessor::SelectAudioDeviceSettings, WTF::Bind(&UserMediaProcessor::SelectAudioDeviceSettings,
WrapWeakPersistent(this), WrapWeakPersistent(this),
WrapWeakPersistent(current_request_info_->web_request()))); WrapPersistent(current_request_info_->web_request())));
} else { } else {
if (!blink::IsAudioInputMediaType(audio_controls.stream_type)) { if (!blink::IsAudioInputMediaType(audio_controls.stream_type)) {
String failed_constraint_name = String failed_constraint_name =
...@@ -774,7 +774,7 @@ void UserMediaProcessor::SetupVideoInput() { ...@@ -774,7 +774,7 @@ void UserMediaProcessor::SetupVideoInput() {
GetMediaDevicesDispatcher()->GetVideoInputCapabilities( GetMediaDevicesDispatcher()->GetVideoInputCapabilities(
WTF::Bind(&UserMediaProcessor::SelectVideoDeviceSettings, WTF::Bind(&UserMediaProcessor::SelectVideoDeviceSettings,
WrapWeakPersistent(this), WrapWeakPersistent(this),
WrapWeakPersistent(current_request_info_->web_request()))); WrapPersistent(current_request_info_->web_request())));
} else { } else {
if (!blink::IsVideoInputMediaType(video_controls.stream_type)) { if (!blink::IsVideoInputMediaType(video_controls.stream_type)) {
String failed_constraint_name = String failed_constraint_name =
...@@ -986,8 +986,8 @@ void UserMediaProcessor::OnStreamGenerated( ...@@ -986,8 +986,8 @@ void UserMediaProcessor::OnStreamGenerated(
video_device_id, video_device_id,
WTF::Bind(&UserMediaProcessor::GotAllVideoInputFormatsForDevice, WTF::Bind(&UserMediaProcessor::GotAllVideoInputFormatsForDevice,
WrapWeakPersistent(this), WrapWeakPersistent(this),
WrapWeakPersistent(current_request_info_->web_request()), WrapPersistent(current_request_info_->web_request()), label,
label, video_device_id)); video_device_id));
} }
} }
...@@ -1481,7 +1481,7 @@ void UserMediaProcessor::GetUserMediaRequestSucceeded( ...@@ -1481,7 +1481,7 @@ void UserMediaProcessor::GetUserMediaRequestSucceeded(
FROM_HERE, FROM_HERE,
WTF::Bind(&UserMediaProcessor::DelayedGetUserMediaRequestSucceeded, WTF::Bind(&UserMediaProcessor::DelayedGetUserMediaRequestSucceeded,
WrapWeakPersistent(this), current_request_info_->request_id(), WrapWeakPersistent(this), current_request_info_->request_id(),
stream, WrapWeakPersistent(web_request))); stream, WrapPersistent(web_request)));
} }
void UserMediaProcessor::DelayedGetUserMediaRequestSucceeded( void UserMediaProcessor::DelayedGetUserMediaRequestSucceeded(
...@@ -1515,8 +1515,8 @@ void UserMediaProcessor::GetUserMediaRequestFailed( ...@@ -1515,8 +1515,8 @@ void UserMediaProcessor::GetUserMediaRequestFailed(
FROM_HERE, FROM_HERE,
WTF::Bind(&UserMediaProcessor::DelayedGetUserMediaRequestFailed, WTF::Bind(&UserMediaProcessor::DelayedGetUserMediaRequestFailed,
WrapWeakPersistent(this), current_request_info_->request_id(), WrapWeakPersistent(this), current_request_info_->request_id(),
WrapWeakPersistent(current_request_info_->web_request()), WrapPersistent(current_request_info_->web_request()), result,
result, constraint_name)); constraint_name));
} }
void UserMediaProcessor::DelayedGetUserMediaRequestFailed( void UserMediaProcessor::DelayedGetUserMediaRequestFailed(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment