From 20c76f3425dc3ea02bf9e635929331a5c73532bf Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Tue, 17 Sep 2013 17:14:36 +0100
Subject: [PATCH] Backed out changeset ade49a801461 (bug 881959)

---
 content/media/MediaStreamGraph.cpp | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index f316e5aeb32..123f15c8f2a 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -525,22 +525,15 @@ MediaStreamGraphImpl::UpdateStreamOrderForStream(mozilla::LinkedList<MediaStream
     }
     if (cycleFound && !delayNodePresent) {
       // If we have detected a cycle, the previous loop should exit with stream
-      // == iter, or the node is connected to itself. Go back in the cycle and
-      // mute all nodes we find, or just mute the node itself.
-      if (!iter) {
-        // The node is connected to itself.
-        iter = aStack->getLast();
+      // == iter. Go back in the cycle and mute all nodes we find.
+      MOZ_ASSERT(iter);
+      do {
+        // There can't be non-AudioNodeStream here, MediaStreamAudio{Source,
+        // Destination}Node are connected to regular MediaStreams, but they can't be
+        // in a cycle (there is no content API to do so).
+        MOZ_ASSERT(iter->AsAudioNodeStream());
         iter->AsAudioNodeStream()->Mute();
-      } else {
-        MOZ_ASSERT(iter);
-        do {
-          // There can't be non-AudioNodeStream here, MediaStreamAudio{Source,
-          // Destination}Node are connected to regular MediaStreams, but they can't be
-          // in a cycle (there is no content API to do so).
-          MOZ_ASSERT(iter->AsAudioNodeStream());
-          iter->AsAudioNodeStream()->Mute();
-        } while((iter = iter->getNext()));
-      }
+      } while((iter = iter->getNext()));
 
       // Warn the user that some of the nodes in the graph are muted, but only
       // once. This flag is reset when the graph changes.