Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 15:26:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1110478 - Remove obsolete peerConnectionImpl.connectDataConnection. r=smaug, r=jesup

Browse Source
This commit is contained in:
Jan-Ivar Bruaroey 2014-12-12 13:00:42 -05:00
parent 57bb068631
commit 4760e3d471
4 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/media/PeerConnection.js
View File

@ -1085,21 +1085,6 @@ RTCPeerConnection.prototype = {
dict.id != undefined ? dict.id : 0xFFFF
);
return channel;
},
connectDataConnection: function(localport, remoteport, numstreams) {
if (numstreams == undefined || numstreams <= 0) {
numstreams = 16;
}
this._queueOrRun({
func: this._connectDataConnection,
args: [localport, remoteport, numstreams],
wait: false
});
},
_connectDataConnection: function(localport, remoteport, numstreams) {
this._impl.connectDataConnection(localport, remoteport, numstreams);
}
};

3
dom/webidl/PeerConnectionImpl.webidl
View File

@ -86,7 +86,4 @@ interface PeerConnectionImpl {
unsigned short type, boolean outOfOrderAllowed,
unsigned short maxTime, unsigned short maxNum,
boolean externalNegotiated, unsigned short stream);
[Throws]
void connectDataConnection(unsigned short localport,
unsigned short remoteport, unsigned short numstreams);
};

11
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -951,17 +951,6 @@ PeerConnectionImpl::CreateFakeMediaStream(uint32_t aHint, DOMMediaStream** aRetv
return NS_OK;
}
// Stubbing this call out for now.
// We can remove it when we are confident of datachannels being started
// correctly on SDP negotiation (bug 852908)
NS_IMETHODIMP
PeerConnectionImpl::ConnectDataConnection(uint16_t aLocalport,
uint16_t aRemoteport,
uint16_t aNumstreams)
{
return NS_OK; // InitializeDataChannel(aLocalport, aRemoteport, aNumstreams);
}
// Data channels won't work without a window, so in order for the C++ unit
// tests to work (it doesn't have a window available) we ifdef the following
// two implementations.

8
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
View File

@ -525,14 +525,6 @@ public:
nsresult InitializeDataChannel();
NS_IMETHODIMP_TO_ERRORRESULT(ConnectDataConnection, ErrorResult &rv,
uint16_t aLocalport,
uint16_t aRemoteport,
uint16_t aNumstreams)
{
rv = ConnectDataConnection(aLocalport, aRemoteport, aNumstreams);
}
NS_IMETHODIMP_TO_ERRORRESULT_RETREF(nsDOMDataChannel,
CreateDataChannel, ErrorResult &rv,
const nsAString& aLabel,