Index: Source/modules/mediastream/RTCPeerConnection.h |
diff --git a/Source/modules/mediastream/RTCPeerConnection.h b/Source/modules/mediastream/RTCPeerConnection.h |
index d3241a6db501311dfc8219a3c5087f44c463781a..bf040004b0b42800cbc8daa0bbb574c116439bfa 100644 |
--- a/Source/modules/mediastream/RTCPeerConnection.h |
+++ b/Source/modules/mediastream/RTCPeerConnection.h |
@@ -36,7 +36,6 @@ |
#include "modules/EventTargetModules.h" |
#include "modules/mediastream/MediaStream.h" |
#include "modules/mediastream/RTCIceCandidate.h" |
-#include "modules/mediastream/RTCVoidRequestImpl.h" |
#include "platform/AsyncMethodRunner.h" |
#include "public/platform/WebMediaConstraints.h" |
#include "public/platform/WebRTCPeerConnectionHandler.h" |
@@ -72,10 +71,10 @@ |
void createAnswer(RTCSessionDescriptionCallback*, RTCErrorCallback*, const Dictionary&, ExceptionState&); |
void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCallback*, ExceptionState&); |
- RTCSessionDescription* localDescription(); |
+ RTCSessionDescription* localDescription(ExceptionState&); |
void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCallback*, ExceptionState&); |
- RTCSessionDescription* remoteDescription(); |
+ RTCSessionDescription* remoteDescription(ExceptionState&); |
String signalingState() const; |
@@ -111,7 +110,6 @@ |
// We allow getStats after close, but not other calls or callbacks. |
bool shouldFireDefaultCallbacks() { return !m_closed && !m_stopped; } |
bool shouldFireGetStatsCallback() { return !m_stopped; } |
- void requestSucceeded(RTCVoidRequestImpl::RequestType); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(negotiationneeded); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(icecandidate); |
@@ -166,14 +164,6 @@ |
void closeInternal(); |
- void commitPendingLocalSessionDescription(); |
- void commitPendingRemoteSessionDescription(); |
- |
- Member<RTCSessionDescription> m_localDescription; |
- Member<RTCSessionDescription> m_remoteDescription; |
- Member<RTCSessionDescription> m_pendingLocalDescription; |
- Member<RTCSessionDescription> m_pendingRemoteDescription; |
- |
SignalingState m_signalingState; |
ICEGatheringState m_iceGatheringState; |
ICEConnectionState m_iceConnectionState; |