Index: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h |
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h |
index b641e08ed4ce7fb3077badc0c6a64c88fc948390..bf644c92809b720968e4398b6df988d15e848474 100644 |
--- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h |
+++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h |
@@ -50,9 +50,11 @@ class RTCConfiguration; |
class RTCDTMFSender; |
class RTCDataChannel; |
class RTCErrorCallback; |
+class RTCIceCandidateInitOrRTCIceCandidate; |
class RTCOfferOptions; |
class RTCSessionDescription; |
class RTCSessionDescriptionCallback; |
+class RTCSessionDescriptionInit; |
class RTCStatsCallback; |
yhirano
2016/02/10 18:13:23
+class ScriptState;
Guido Urdaneta
2016/02/10 20:21:28
Done.
|
class VoidCallback; |
@@ -72,10 +74,12 @@ public: |
void createAnswer(ExecutionContext*, RTCSessionDescriptionCallback*, RTCErrorCallback*, const Dictionary&, ExceptionState&); |
- void setLocalDescription(ExecutionContext*, RTCSessionDescription*, VoidCallback*, RTCErrorCallback*, ExceptionState&); |
+ ScriptPromise setLocalDescription(ScriptState*, const RTCSessionDescriptionInit&); |
+ ScriptPromise setLocalDescription(ExecutionContext*, RTCSessionDescription*, VoidCallback*, RTCErrorCallback*); |
RTCSessionDescription* localDescription(); |
- void setRemoteDescription(ExecutionContext*, RTCSessionDescription*, VoidCallback*, RTCErrorCallback*, ExceptionState&); |
+ ScriptPromise setRemoteDescription(ScriptState*, const RTCSessionDescriptionInit&); |
+ ScriptPromise setRemoteDescription(ExecutionContext*, RTCSessionDescription*, VoidCallback*, RTCErrorCallback*); |
RTCSessionDescription* remoteDescription(); |
String signalingState() const; |
@@ -86,10 +90,8 @@ public: |
// http://w3c.github.io/webrtc-pc/#sec.cert-mgmt |
static ScriptPromise generateCertificate(ScriptState*, const AlgorithmIdentifier& keygenAlgorithm, ExceptionState&); |
- // DEPRECATED |
- void addIceCandidate(RTCIceCandidate*, ExceptionState&); |
- |
- void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, ExceptionState&); |
+ ScriptPromise addIceCandidate(ScriptState*, const RTCIceCandidateInitOrRTCIceCandidate&); |
+ ScriptPromise addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*); |
String iceGatheringState() const; |