Bug 820550 - Signaling - stop checking API state in CloseInt r=ekr
authorEthan Hugg <ethanhugg@gmail.com>
Wed, 12 Dec 2012 09:39:51 -0800
changeset 115814 a9864b72730b6ce228b93815ff393063baf0f48e
parent 115813 cd712828cb475635cd849de33cad6a15f499b6ed
child 115815 d8c8bebfed40852b963a8062ea9fdd456ad0e860
push id24028
push useremorley@mozilla.com
push dateThu, 13 Dec 2012 15:56:02 +0000
treeherderautoland@9db79b97abbb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersekr
bugs820550
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 820550 - Signaling - stop checking API state in CloseInt r=ekr
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -273,17 +273,17 @@ PeerConnectionImpl::MakeRemoteSource(nsD
 
 nsresult
 PeerConnectionImpl::CreateRemoteSourceStreamInfo(uint32_t aHint, RemoteSourceStreamInfo** aInfo)
 {
   MOZ_ASSERT(aInfo);
   PC_AUTO_ENTER_API_CALL_NO_CHECK();
 
   nsIDOMMediaStream* stream;
-  
+
   nsresult res = MakeMediaStream(aHint, &stream);
   if (NS_FAILED(res)) {
     return res;
   }
 
   nsDOMMediaStream* comstream = static_cast<nsDOMMediaStream*>(stream);
   static_cast<mozilla::SourceMediaStream*>(comstream->GetStream())->SetPullEnabled(true);
 
@@ -924,17 +924,17 @@ PeerConnectionImpl::Close(bool aIsSynchr
 
   return CloseInt(aIsSynchronous);
 }
 
 
 nsresult
 PeerConnectionImpl::CloseInt(bool aIsSynchronous)
 {
-  PC_AUTO_ENTER_API_CALL(true);
+  PC_AUTO_ENTER_API_CALL_NO_CHECK();
 
   if (mCall != nullptr)
     mCall->endCall();
 #ifdef MOZILLA_INTERNAL_API
   if (mDataConnection)
     mDataConnection->CloseAll();
 #endif