Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-30 01:59:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changesets b093ba2c7ff9 and 0acbd06d48a9 (Bug 836655) for failing unit test.

Browse Source
This commit is contained in:
L. David Baron 2013-02-18 01:15:24 -08:00
parent d920040e7b
commit 4026271a28
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/audiochannel/AudioChannelService.cpp
View File

@ -135,14 +135,6 @@ AudioChannelService::UnregisterType(AudioChannelType aType,
// In order to avoid race conditions, it's safer to notify any existing
// agent any time a new one is registered.
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// We only remove ChildID when it is in the foreground.
// If in the background, we kept ChildID for allowing it to play next song.
if (aType == AUDIO_CHANNEL_CONTENT &&
mActiveContentChildIDs.Contains(aChildID) &&
(!mActiveContentChildIDsFrozen &&
!mChannelCounters[AUDIO_CHANNEL_INT_CONTENT].Contains(aChildID))) {
mActiveContentChildIDs.RemoveElement(aChildID);
}
SendAudioChannelChangedNotification();
Notify();
}
@ -299,12 +291,8 @@ AudioChannelService::SendAudioChannelChangedNotification()
higher = AUDIO_CHANNEL_NOTIFICATION;
}
// There is only one Child can play content channel in the background.
// And need to check whether there is any content channels under playing
// now.
else if (!mActiveContentChildIDs.IsEmpty() &&
mChannelCounters[AUDIO_CHANNEL_INT_CONTENT_HIDDEN].Contains(
mActiveContentChildIDs[0])) {
// Content channels play in background if just one is active.
else if (!mActiveContentChildIDs.IsEmpty()) {
higher = AUDIO_CHANNEL_CONTENT;
}
}