Backed out changeset 525b62ea9132 (bug 1125472)
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 27 Jan 2015 22:00:17 -0500
changeset 239543 3df250d0364b199d79861856753dabc3bf6cdda1
parent 239542 e16804bd0547eb66d997f626bc65b2ae69f75023
child 239544 bcbff95e6d21431403f15d95190b1681dca0598c
push id500
push userjoshua.m.grant@gmail.com
push dateThu, 29 Jan 2015 01:48:36 +0000
bugs1125472
milestone38.0a1
backs out525b62ea9132fb9d6deb35db1d0e45569184b50a
Backed out changeset 525b62ea9132 (bug 1125472)
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2936,18 +2936,17 @@ MediaDecoderStateMachine::FlushDecoding(
     // decoding operations and run any pending callbacks. This is
     // important, as we don't want any pending tasks posted to the task
     // queue by the reader to deliver any samples after we've posted the
     // reader Shutdown() task below, as the sample-delivery tasks will
     // keep video frames alive until after we've called Reader::Shutdown(),
     // and shutdown on B2G will fail as there are outstanding video frames
     // alive.
     ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
-    DecodeTaskQueue()->Dispatch(task);
-    DecodeTaskQueue()->AwaitIdle();
+    DecodeTaskQueue()->FlushAndDispatch(task);
   }
 
   // We must reset playback so that all references to frames queued
   // in the state machine are dropped, else subsequent calls to Shutdown()
   // or ReleaseMediaResources() can fail on B2G.
   ResetPlayback();
 }