Bug 1512280 - Fix some nits and shorten MediaManager::GetUserMedia(). r=achronop

Differential Revision: https://phabricator.services.mozilla.com/D13858

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jan-Ivar Bruaroey 2018-12-12 02:23:57 +00:00
Родитель aba79e9edc
Коммит 2fc3a23b7c
1 изменённых файлов: 1 добавлений и 5 удалений

Просмотреть файл

@ -2368,7 +2368,6 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
Preferences::GetBool("media.navigator.permission.disabled", false);
bool isHTTPS = false;
bool isHandlingUserInput = EventStateManager::IsHandlingUserInput();
;
docURI->SchemeIs("https", &isHTTPS);
nsCString host;
nsresult rv = docURI->GetHost(host);
@ -2433,7 +2432,6 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
const bool resistFingerprinting =
nsContentUtils::ResistFingerprinting(aCallerType);
if (resistFingerprinting) {
ReduceConstraint(c.mVideo);
ReduceConstraint(c.mAudio);
@ -2590,7 +2588,7 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
AddWindowID(windowID, windowListener);
}
RefPtr<SourceListener> sourceListener = new SourceListener();
auto sourceListener = MakeRefPtr<SourceListener>();
windowListener->Register(sourceListener);
if (!privileged) {
@ -2719,7 +2717,6 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
LOG(
("GetUserMedia: post enumeration promise success callback "
"starting"));
// Ensure that our windowID is still good.
auto* globalWindow =
nsGlobalWindowInner::GetInnerWindowWithId(windowID);
@ -2733,7 +2730,6 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
MakeRefPtr<MediaMgrError>(MediaMgrError::Name::AbortError),
__func__);
}
// Apply any constraints. This modifies the passed-in list.
return self->SelectSettings(c, isChrome, aDevices)
->Then(