Bug 1437832 - Part 4: Remove unused function from PeerConnectionImpl r?jib draft
authorByron Campen [:bwc] <docfaraday@gmail.com>
Tue, 13 Feb 2018 14:40:49 -0600
changeset 754902 16fc64c2535b999b220cdf6de241b402c917ddf3
parent 754901 bccbf46a52dd7a1156172389d5e930144a560f85
push id99037
push userbcampen@mozilla.com
push dateWed, 14 Feb 2018 14:55:46 +0000
reviewersjib
bugs1437832
milestone60.0a1
Bug 1437832 - Part 4: Remove unused function from PeerConnectionImpl r?jib MozReview-Commit-ID: DJPLOWdm2IA
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -2316,51 +2316,16 @@ PeerConnectionImpl::DisablePacketDump(un
   MutexAutoLock lock(mPacketDumpFlagsMutex);
   if (level < packetDumpFlags->size()) {
     (*packetDumpFlags)[level] &= ~flag;
   }
 
   return NS_OK;
 }
 
-NS_IMETHODIMP
-PeerConnectionImpl::RemoveTrack(MediaStreamTrack& aTrack) {
-  PC_AUTO_ENTER_API_CALL(true);
-
-  std::vector<RefPtr<TransceiverImpl>>& transceivers =
-    mMedia->GetTransceivers();
-
-  nsresult rv = NS_ERROR_INVALID_ARG;
-
-  for (RefPtr<TransceiverImpl>& transceiver : transceivers) {
-    if (transceiver->HasSendTrack(&aTrack)) {
-      // TODO(bug 1401983): Move DTMF stuff to TransceiverImpl
-      for (size_t i = 0; i < mDTMFStates.Length(); ++i) {
-        if (mDTMFStates[i]->mTransceiver.get() == transceiver.get()) {
-          mDTMFStates[i]->mSendTimer->Cancel();
-          mDTMFStates.RemoveElementAt(i);
-          break;
-        }
-      }
-
-      rv = transceiver->UpdateSendTrack(nullptr);
-      break;
-    }
-  }
-
-  if (NS_FAILED(rv)) {
-    CSFLogError(LOGTAG, "Error updating send track on transceiver");
-    return rv;
-  }
-
-  aTrack.RemovePrincipalChangeObserver(this);
-
-  return NS_OK;
-}
-
 static int GetDTMFToneCode(uint16_t c)
 {
   const char* DTMF_TONECODES = "0123456789*#ABCD";
 
   if (c == ',') {
     // , is a special character indicating a 2 second delay
     return -1;
   }
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
@@ -388,22 +388,16 @@ public:
 
   NS_IMETHODIMP CloseStreams();
 
   void CloseStreams(ErrorResult &rv)
   {
     rv = CloseStreams();
   }
 
-  NS_IMETHODIMP_TO_ERRORRESULT(RemoveTrack, ErrorResult &rv,
-                               mozilla::dom::MediaStreamTrack& aTrack)
-  {
-    rv = RemoveTrack(aTrack);
-  }
-
   already_AddRefed<TransceiverImpl> CreateTransceiverImpl(
       const nsAString& aKind,
       dom::MediaStreamTrack* aSendTrack,
       ErrorResult& rv);
 
   OwningNonNull<dom::MediaStreamTrack> CreateReceiveTrack(
       SdpMediaSection::MediaType type);