Bug 868406. Shut down MediaStreamGraph's thread. r=jesup
authorRobert O'Callahan <robert@ocallahan.org>
Sun, 05 May 2013 18:20:11 +1200
changeset 141823 be3cef4b69e356da561383b76fe094c8933fc653
parent 141822 f110d0270f8e2757325d35f31567cf15a3e6b069
child 141824 c2de391c032f0e462d2d30c7238028ea13a90fb4
child 141835 e5972785237bd6a2afee5c3c4e25327471da702f
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs868406
milestone23.0a1
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
Bug 868406. Shut down MediaStreamGraph's thread. r=jesup
content/media/MediaStreamGraph.cpp
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -1134,16 +1134,18 @@ private:
 class MediaStreamGraphShutDownRunnable : public nsRunnable {
 public:
   MediaStreamGraphShutDownRunnable(MediaStreamGraphImpl* aGraph) : mGraph(aGraph) {}
   NS_IMETHOD Run()
   {
     NS_ASSERTION(mGraph->mDetectedNotRunning,
                  "We should know the graph thread control loop isn't running!");
 
+    mGraph->ShutdownThreads();
+
     // mGraph's thread is not running so it's OK to do whatever here
     if (mGraph->IsEmpty()) {
       // mGraph is no longer needed, so delete it. If the graph is not empty
       // then we must be in a forced shutdown and some later AppendMessage will
       // detect that the manager has been emptied, and delete it.
       delete mGraph;
     } else {
       for (uint32_t i = 0; i < mGraph->mStreams.Length(); ++i) {