Changeset 155954 in webkit

Timestamp:

Sep 17, 2013 7:52:37 AM (11 years ago)

Author:

eric.carlson@apple.com

Message:

MediaStream API: Adding an async RTCPeerConnection::addIceCandidate
​https://bugs.webkit.org/show_bug.cgi?id=121403

Source/WebCore:

Merged from ​https://chromium.googlesource.com/chromium/blink/+/5bd81fda88d48dd2780832246e7d1ab973ee7a1d

Reviewed by Darin Adler.

No new tests, updated RTCPeerConnection-ice.html.

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::addIceCandidate): Add success and error callbacks.

• Modules/mediastream/RTCPeerConnection.h:
• Modules/mediastream/RTCPeerConnection.idl:

• platform/mediastream/RTCPeerConnectionHandler.h: Changed addIceCandidate signature.

• platform/mediastream/RTCVoidRequest.h: Removed ExtraData, it is unnecessary.

LayoutTests:

Reviewed by Darin Adler.

• fast/mediastream/RTCPeerConnection-ice-expected.txt:
• fast/mediastream/RTCPeerConnection-ice.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-ice-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-ice.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (modified) (1 diff)
• Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h (modified) (1 diff)
• Source/WebCore/platform/mediastream/RTCVoidRequest.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-17  Eric Carlson  <eric.carlson@apple.com>
+
+        MediaStream API: Adding an async RTCPeerConnection::addIceCandidate
+        https://bugs.webkit.org/show_bug.cgi?id=121403
+
+        Reviewed by Darin Adler.
+
+        * fast/mediastream/RTCPeerConnection-ice-expected.txt:
+        * fast/mediastream/RTCPeerConnection-ice.html:
+
 2013-09-17  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-ice-expected.txt

@@ -6 +6 @@
 PASS pc = new webkitRTCPeerConnection(null, null); did not throw exception.
 PASS iceConnectionState is completed
-PASS onIceCandidate was called.
-PASS event.candidate.candidate is "nano nano"
+PASS pc.addIceCandidate(null, null, null); threw exception TypeError: Type error.
+PASS pc.addIceCandidate(iceCandidate, null, null); threw exception TypeError: Type error.
+PASS pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, null); threw exception TypeError: Type error.
+PASS pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, addIceCandidateFailure); did not throw exception.
+PASS addIceCandidateSuccess was called.
 PASS iceConnectionState is closed.
 PASS successfullyParsed is true

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html

@@ -9 +9 @@
 
 var pc = null;
+var iceCandidate = null;
 
 function onIceChange2()
@@ -18 +19 @@
 }
 
-function onIceCandidate(event)
+function addIceCandidateSuccess()
 {
-    testPassed("onIceCandidate was called.");
-    shouldBe('event.candidate.candidate', '"nano nano"');
-
+    testPassed("addIceCandidateSuccess was called.");
     pc.oniceconnectionstatechange = onIceChange2;
     pc.close();
+}
+
+function addIceCandidateFailure()
+{
+    testFailed("addIceCandidateFailue was called.");
+    finishJSTest();
 }
 
@@ -31 +36 @@
     if (pc.iceConnectionState === "completed") {
         testPassed("iceConnectionState is completed");
-        pc.onicecandidate = onIceCandidate;
-        pc.addIceCandidate(new RTCIceCandidate({candidate:"nano nano"}));
+        iceCandidate = new RTCIceCandidate({candidate:"nano nano"});
+        shouldThrow('pc.addIceCandidate(null, null, null);');
+        shouldThrow('pc.addIceCandidate(iceCandidate, null, null);');
+        shouldThrow('pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, null);');
+        shouldNotThrow('pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, addIceCandidateFailure);');
     }
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-17  Eric Carlson  <eric.carlson@apple.com>
+
+        MediaStream API: Adding an async RTCPeerConnection::addIceCandidate
+        https://bugs.webkit.org/show_bug.cgi?id=121403
+
+        Merged from https://chromium.googlesource.com/chromium/blink/+/5bd81fda88d48dd2780832246e7d1ab973ee7a1d
+
+        Reviewed by Darin Adler.
+
+        No new tests, updated RTCPeerConnection-ice.html.
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::addIceCandidate): Add success and error callbacks.
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/RTCPeerConnection.idl:
+
+        * platform/mediastream/RTCPeerConnectionHandler.h: Changed addIceCandidate signature.
+
+        * platform/mediastream/RTCVoidRequest.h: Removed ExtraData, it is unnecessary.
+
 2013-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

@@ -285 +285 @@
 }
 
-void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, ExceptionCode& ec)
-{
-    if (m_signalingState == SignalingStateClosed) {
-        ec = INVALID_STATE_ERR;
-        return;
-    }
-
-    if (!iceCandidate) {
-        ec = TYPE_MISMATCH_ERR;
-        return;
-    }
-
-    bool valid = m_peerHandler->addIceCandidate(iceCandidate->descriptor());
-    if (!valid)
+void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, ExceptionCode& ec)
+{
+    if (m_signalingState == SignalingStateClosed) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+
+    if (!iceCandidate || !successCallback || !errorCallback) {
+        ec = TYPE_MISMATCH_ERR;
+        return;
+    }
+
+    RefPtr<RTCVoidRequestImpl> request = RTCVoidRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback);
+
+    bool implemented = m_peerHandler->addIceCandidate(request.release(), iceCandidate->descriptor());
+    if (!implemented)
         ec = SYNTAX_ERR;
 }

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

@@ -78 +78 @@
     void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
 
-    void addIceCandidate(RTCIceCandidate*, ExceptionCode&);
+    void addIceCandidate(RTCIceCandidate*, PassRefPtr<VoidCallback>, PassRefPtr<RTCErrorCallback>, ExceptionCode&);
 
     String iceGatheringState() const;

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

@@ -52 +52 @@
     [RaisesException] void updateIce(optional Dictionary configuration, optional Dictionary mediaConstraints);
 
-    [RaisesException] void addIceCandidate(RTCIceCandidate candidate);
+    [RaisesException] void addIceCandidate(RTCIceCandidate candidate, VoidCallback successCallback, RTCErrorCallback failureCallback);
 
     readonly attribute DOMString iceGatheringState;

trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h

@@ -82 +82 @@
     virtual PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() = 0;
     virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) = 0;
-    virtual bool addIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) = 0;
+    virtual bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) = 0;
     virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) = 0;
     virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) = 0;

trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h

@@ -43 +43 @@
 class RTCVoidRequest : public RefCounted<RTCVoidRequest> {
 public:
-    class ExtraData : public RefCounted<ExtraData> {
-    public:
-        virtual ~ExtraData() { }
-    };
-
     virtual ~RTCVoidRequest() { }
 
@@ -53 +48 @@
     virtual void requestFailed(const String& error) = 0;
 
-    PassRefPtr<ExtraData> extraData() const { return m_extraData; }
-    void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; }
-
 protected:
     RTCVoidRequest() { }
-
-private:
-    RefPtr<ExtraData> m_extraData;
 };