Add promise-based addIceCandidate, setLocalDescription and setRemoteDescription to RTCPeerConnection

third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 32 matching lines @@
 #include "public/platform/WebRTCPeerConnectionHandler.h"
 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
 
 namespace blink {
 class ExceptionState;
 class MediaStreamTrack;
 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;
 
 class RTCPeerConnection final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<RTCPeerConnection>
     , public WebRTCPeerConnectionHandlerClient
     , public ActiveDOMObject {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(RTCPeerConnection);
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection);
 public:
     // TODO(hbos): Create with expired RTCCertificate should fail, see crbug.com/565278.
     static RTCPeerConnection* create(ExecutionContext*, const Dictionary&, const Dictionary&, ExceptionState&);
     ~RTCPeerConnection() override;
 
     void createOffer(ExecutionContext*, RTCSessionDescriptionCallback*, RTCErrorCallback*, const Dictionary&, ExceptionState&);
 
     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;
 
     void updateIce(ExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&);
 
     // Certificate management
     // 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;
 
     String iceConnectionState() const;
 
     MediaStreamVector getLocalStreams() const;
 
     MediaStreamVector getRemoteStreams() const;
 
     MediaStream* getStreamById(const String& streamId);
@@ skipping 101 matching lines @@
     Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner;
     HeapVector<Member<EventWrapper>> m_scheduledEvents;
 
     bool m_stopped;
     bool m_closed;
 };
 
 } // namespace blink
 
 #endif // RTCPeerConnection_h