Backed out changeset 07708c9fc5ef (bug 883010) because of test failures

Landed on a CLOSED TREE

content/media/MediaStreamGraph.cpp

@@ -1015,11 +1015,7 @@ MediaStreamGraphImpl::RunThread()
     }
     messageQueue.Clear();
 
-    // Only update the stream order if needed, since it can be expensive.
-    if (mStreamOrderDirty) {
-      UpdateStreamOrder();
-      mStreamOrderDirty = false;
-    }
+    UpdateStreamOrder();
 
     // Find the sampling rate that we need to use for non-realtime graphs.
     TrackRate sampleRate = IdealAudioRate();
@@ -2155,7 +2151,6 @@ MediaStreamGraphImpl::MediaStreamGraphImpl(bool aRealtime)
   , mPostedRunInStableState(false)
   , mRealtime(aRealtime)
   , mNonRealtimeProcessing(false)
-  , mStreamOrderDirty(false)
 {
 #ifdef PR_LOGGING
   if (!gMediaStreamGraphLog) {
@@ -2285,11 +2280,4 @@ MediaStreamGraph::StartNonRealtimeProcessing(uint32_t aTicksToProcess)
   graph->EnsureRunInStableState();
 }
 
-void
-ProcessedMediaStream::AddInput(MediaInputPort* aPort)
-{
-  mInputs.AppendElement(aPort);
-  GraphImpl()->SetStreamOrderDirty();
-}
-
 }

content/media/MediaStreamGraph.h

@@ -271,11 +271,6 @@ public:
     , mNotifiedBlocked(false)
     , mHasCurrentData(false)
     , mNotifiedHasCurrentData(false)
-    , mHasBeenOrdered(false)
-    , mIsOnOrderingStack(false)
-    , mIsConsumed(false)
-    , mInBlockingSet(false)
-    , mBlockInThisPhase(false)
     , mWrapper(aWrapper)
     , mMainThreadCurrentTime(0)
     , mMainThreadFinished(false)
@@ -863,7 +858,10 @@ public:
   friend class MediaStreamGraphImpl;
 
   // Do not call these from outside MediaStreamGraph.cpp!
-  virtual void AddInput(MediaInputPort* aPort);
+  virtual void AddInput(MediaInputPort* aPort)
+  {
+    mInputs.AppendElement(aPort);
+  }
   virtual void RemoveInput(MediaInputPort* aPort)
   {
     mInputs.RemoveElement(aPort);

content/media/MediaStreamGraphImpl.h

@@ -356,13 +356,6 @@ public:
    * Remove aPort from the graph and release it.
    */
   void DestroyPort(MediaInputPort* aPort);
-  /**
-   * Mark the media stream order as dirty.
-   */
-  void SetStreamOrderDirty()
-  {
-    mStreamOrderDirty = true;
-  }
 
   // Data members
 
@@ -543,11 +536,6 @@ public:
    * value is only accessed on the main thread.
    */
   bool mNonRealtimeProcessing;
-  /**
-   * True when a change has happened which requires us to recompute the stream
-   * blocking order.
-   */
-  bool mStreamOrderDirty;
 };
 
 }