From 69540d4cad255fc007093a889eab45aece6308f7 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 12 Aug 2015 11:29:35 +1200
Subject: [PATCH] bug 1197043 rename Add/RemoveStream to
 Add/RemoveStreamGraphThread r=padenot

--HG--
extra : rebase_source : ea3528d528a557f152347bdd8c05c1e84a3da76e
---
 dom/media/MediaStreamGraph.cpp   | 10 +++++-----
 dom/media/MediaStreamGraphImpl.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 130ab7d1e788..9d8c87bef6d2 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -86,7 +86,7 @@ MediaStreamGraphImpl::FinishStream(MediaStream* aStream)
 static const GraphTime START_TIME_DELAYED = -1;
 
 void
-MediaStreamGraphImpl::AddStream(MediaStream* aStream)
+MediaStreamGraphImpl::AddStreamGraphThread(MediaStream* aStream)
 {
   // Check if we're adding a stream to a suspended context, in which case, we
   // add it to mSuspendedStreams, and delay setting mBufferStartTime
@@ -113,7 +113,7 @@ MediaStreamGraphImpl::AddStream(MediaStream* aStream)
 }
 
 void
-MediaStreamGraphImpl::RemoveStream(MediaStream* aStream)
+MediaStreamGraphImpl::RemoveStreamGraphThread(MediaStream* aStream)
 {
   // Remove references in mStreamUpdates before we allow aStream to die.
   // Pending updates are not needed (since the main thread has already given
@@ -1641,7 +1641,7 @@ public:
   explicit CreateMessage(MediaStream* aStream) : ControlMessage(aStream) {}
   virtual void Run() override
   {
-    mStream->GraphImpl()->AddStream(mStream);
+    mStream->GraphImpl()->AddStreamGraphThread(mStream);
   }
   virtual void RunDuringShutdown() override
   {
@@ -2055,7 +2055,7 @@ MediaStream::Destroy()
       mStream->RemoveAllListenersImpl();
       auto graph = mStream->GraphImpl();
       mStream->DestroyImpl();
-      graph->RemoveStream(mStream);
+      graph->RemoveStreamGraphThread(mStream);
     }
     virtual void RunDuringShutdown()
     { Run(); }
@@ -2854,7 +2854,7 @@ ProcessedMediaStream::DestroyImpl()
   MediaStream::DestroyImpl();
   // The stream order is only important if there are connections, in which
   // case MediaInputPort::Disconnect() called SetStreamOrderDirty().
-  // MediaStreamGraphImpl::RemoveStream() will also call
+  // MediaStreamGraphImpl::RemoveStreamGraphThread() will also call
   // SetStreamOrderDirty(), for other reasons.
 }
 
diff --git a/dom/media/MediaStreamGraphImpl.h b/dom/media/MediaStreamGraphImpl.h
index 16abc3889d38..a16a51e182ba 100644
--- a/dom/media/MediaStreamGraphImpl.h
+++ b/dom/media/MediaStreamGraphImpl.h
@@ -424,12 +424,12 @@ public:
   /**
    * Add aStream to the graph and initializes its graph-specific state.
    */
-  void AddStream(MediaStream* aStream);
+  void AddStreamGraphThread(MediaStream* aStream);
   /**
    * Remove aStream from the graph. Ensures that pending messages about the
    * stream back to the main thread are flushed.
    */
-  void RemoveStream(MediaStream* aStream);
+  void RemoveStreamGraphThread(MediaStream* aStream);
   /**
    * Remove aPort from the graph and release it.
    */