Bug 1412231 - Don't crash when running AudioContext operation messages that are not Closed during a force-shutdown. r?karlt draft
authorPaul Adenot <paul@paul.cx>
Mon, 30 Oct 2017 11:17:51 +0100
changeset 688608 d7e92fc5b3f3b6ff76c7e40ed2f4bf11031afa84
parent 688337 d3910b7628b8066d3f30d58b17b5824b05768854
child 738123 f0a76ed3712c36ebca20a3146ca9f05608de083c
push id86807
push userpaul@paul.cx
push dateMon, 30 Oct 2017 10:20:42 +0000
reviewerskarlt
bugs1412231
milestone58.0a1
Bug 1412231 - Don't crash when running AudioContext operation messages that are not Closed during a force-shutdown. r?karlt MozReview-Commit-ID: E7RuhQ7pQfW
dom/media/MediaStreamGraph.cpp
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -4042,17 +4042,18 @@ MediaStreamGraph::ApplyAudioContextOpera
     }
     void Run() override
     {
       mStream->GraphImpl()->ApplyAudioContextOperationImpl(mStream,
         mStreams, mAudioContextOperation, mPromise);
     }
     void RunDuringShutdown() override
     {
-      MOZ_ASSERT(mAudioContextOperation == AudioContextOperation::Close,
+      MOZ_ASSERT(mAudioContextOperation == AudioContextOperation::Close ||
+                 mStream->GraphImpl()->mForceShutDown,
                  "We should be reviving the graph?");
     }
 
   private:
     // We don't need strong references here for the same reason ControlMessage
     // doesn't.
     nsTArray<MediaStream*> mStreams;
     AudioContextOperation mAudioContextOperation;