corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 4 changesets (bug 1322505) for frequent timeouts in browser_block_autoplay_media_pausedAfterPlay.js

Browse Source 
Backed out changeset dad8acbe41e9 (bug 1322505)
Backed out changeset 861f01ee0e6e (bug 1322505)
Backed out changeset ddf90342d71d (bug 1322505)
Backed out changeset 049ab1a92da6 (bug 1322505)
This commit is contained in:
Phil Ringnalda
2017-01-19 21:57:46 -08:00
parent 9f497a91cb
commit b728b48d1d
7 changed files with 8 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dom/html/HTMLMediaElement.cpp
View File

@@ -654,32 +654,14 @@ public:
}
}
bool
ShouldResetSuspend() const
{
// The disposable-pause should be clear after media starts playing.
if (!mOwner->Paused() &&
mSuspended == nsISuspendedTypes::SUSPENDED_PAUSE_DISPOSABLE) {
return true;
}
// If the blocked media is paused, we don't need to resume it. We reset the
// mSuspended in order to unregister the agent.
if (mOwner->Paused() &&
mSuspended == nsISuspendedTypes::SUSPENDED_BLOCK) {
return true;
}
return false;
}
void
NotifyPlayStateChanged()
NotifyPlayStarted()
{
MOZ_ASSERT(!mIsShutDown);
if (ShouldResetSuspend()) {
SetSuspended(nsISuspendedTypes::NONE_SUSPENDED);
}
// Reset the suspend type because the media element might be paused by
// audio channel before calling play(). eg. paused by Fennec media control,
// but resumed it from page.
SetSuspended(nsISuspendedTypes::NONE_SUSPENDED);
UpdateAudioChannelPlayingState();
}
@@ -898,7 +880,7 @@ private:
if (!IsSuspended()) {
MOZ_LOG(AudioChannelService::GetAudioChannelLog(), LogLevel::Debug,
("HTMLMediaElement::AudioChannelAgentCallback, ResumeFromAudioChannel, "
"this = %p, don't need to be resumed!\n", this));
"this = %p, Error : resume without suspended!\n", this));
return;
}
@@ -2775,9 +2757,7 @@ HTMLMediaElement::Pause(ErrorResult& aRv)
// We changed mPaused and mAutoplaying which can affect AddRemoveSelfReference
AddRemoveSelfReference();
UpdateSrcMediaStreamPlaying();
if (mAudioChannelWrapper) {
mAudioChannelWrapper->NotifyPlayStateChanged();
}
UpdateAudioChannelPlayingState();
if (!oldPaused) {
FireTimeUpdate(false);
@@ -7152,7 +7132,7 @@ HTMLMediaElement::UpdateCustomPolicyAfterPlayed()
{
OpenUnsupportedMediaWithExternalAppIfNeeded();
if (mAudioChannelWrapper) {
mAudioChannelWrapper->NotifyPlayStateChanged();
mAudioChannelWrapper->NotifyPlayStarted();
}
}