Bug 589626 Commit merge of backout of 87ffcfb83db3 a=backout

content/html/content/src/nsHTMLMediaElement.cpp

@@ -2087,18 +2087,6 @@ void nsHTMLMediaElement::UpdateReadyStateForData(NextFrameStatus aNextFrame)
     return;
   }
 
-  if (mDecoder->GetCurrentStream()->IsSuspendedByCache() &&
-      !mDecoder->IsEnded())
-  {
-    // The download has been suspended by the media cache, and we've not
-    // completed playback of the resource, so go into HAVE_ENOUGH_DATA state.
-    // This ensures we always fire canplaythrough and other play events,
-    // particularly when we suspend the download before the download rate
-    // has been reliably established.
-    ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA);
-    return;
-  }
-
   // Now see if we should set HAVE_ENOUGH_DATA.
   // If it's something we don't know the size of, then we can't
   // make a real estimate, so we go straight to HAVE_ENOUGH_DATA once

content/media/nsBuiltinDecoder.cpp

@@ -556,7 +556,6 @@ void nsBuiltinDecoder::NotifySuspendedStatusChanged()
     // now so we consume data and hopefully free up cache space
     mElement->NotifyAutoplayDataReady();
   }
-  UpdateReadyStateForData();
 }
 
 void nsBuiltinDecoder::NotifyBytesDownloaded()

content/media/test/test_audio2.html

@@ -17,7 +17,7 @@ var manager = new MediaTestManager;
 
 function startTest(test, token) {
   if (!tmpAudio.canPlayType(test.type))
-    return;
+    continue;
   manager.started(token);
   var a1 = new Audio(test.name);
   is(a1.getAttribute("preload"), "auto", "Preload automatically set to auto");

content/media/test/test_timeupdate3.html

@@ -49,7 +49,6 @@ SimpleTest.waitForExplicitFinish();
 <video id='v'
        src='seek.ogv'
        onloadedmetadata='return startTest();'
-       onerror='event.stopPropagation();'
        onseeking='return startSeek();'
        ontimeupdate='return timeUpdated();'></video>
 </body>