Backed out changeset 97499b2f5612 (bug 1471800) as requested by cpearce.
authorCosmin Sabou <csabou@mozilla.com>
Thu, 28 Jun 2018 13:53:42 +0300
changeset 479270 63ee095b5f310815b95c492ae41f9175a0f7504b
parent 479269 2b6a9750e786953525d11e2bc881a2db3ed36e09
child 479271 6bcf0177fc94c7fc4da19057699de0b12a3c3d7a
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1471800
milestone63.0a1
backs out97499b2f5612744210e16bd9e3525d18b2211da2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 97499b2f5612 (bug 1471800) as requested by cpearce.
dom/html/HTMLMediaElement.cpp
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -6046,17 +6046,17 @@ HTMLMediaElement::ChangeReadyState(nsMed
   if (oldState < HAVE_CURRENT_DATA && mReadyState >= HAVE_CURRENT_DATA &&
       !mLoadedDataFired) {
     DispatchAsyncEvent(NS_LITERAL_STRING("loadeddata"));
     mLoadedDataFired = true;
   }
 
   if (oldState < HAVE_FUTURE_DATA && mReadyState >= HAVE_FUTURE_DATA) {
     DispatchAsyncEvent(NS_LITERAL_STRING("canplay"));
-    if (!mPaused && !mPausedForInactiveDocumentOrChannel) {
+    if (!mPaused) {
       if (mDecoder) {
         mDecoder->Play();
       }
       NotifyAboutPlaying();
     }
   }
 
   CheckAutoplayDataReady();
@@ -6173,17 +6173,16 @@ HTMLMediaElement::CheckAutoplayDataReady
   UpdateSrcMediaStreamPlaying();
   UpdateAudioChannelPlayingState();
 
   if (mDecoder) {
     SetPlayedOrSeeked(true);
     if (mCurrentPlayRangeStart == -1.0) {
       mCurrentPlayRangeStart = CurrentTime();
     }
-    MOZ_ASSERT(!mPausedForInactiveDocumentOrChannel);
     mDecoder->Play();
   } else if (mSrcStream) {
     SetPlayedOrSeeked(true);
   }
 
   // For blocked media, the event would be pending until it is resumed.
   DispatchAsyncEvent(NS_LITERAL_STRING("play"));