Title: [229548] trunk
Revision
229548
Author
you...@apple.com
Date
2018-03-12 14:16:35 -0700 (Mon, 12 Mar 2018)

Log Message

RTCPeerConnection's close method should update signalingState
https://bugs.webkit.org/show_bug.cgi?id=174314
<rdar://problem/33267977>

Reviewed by Eric Carlson.

LayoutTests/imported/w3c:

* web-platform-tests/webrtc/RTCPeerConnection-createDataChannel-expected.txt:

Source/WebCore:

Covered by rebased test.
Add closed as signalingState enum value.
Set peer connection signaling state to closed once close is called.

* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::doClose):
* Modules/mediastream/RTCSignalingState.idl:
* platform/mediastream/RTCSignalingState.h:

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (229547 => 229548)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2018-03-12 21:06:42 UTC (rev 229547)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2018-03-12 21:16:35 UTC (rev 229548)
@@ -1,3 +1,13 @@
+2018-03-12  Youenn Fablet  <you...@apple.com>
+
+        RTCPeerConnection's close method should update signalingState
+        https://bugs.webkit.org/show_bug.cgi?id=174314
+        <rdar://problem/33267977>
+
+        Reviewed by Eric Carlson.
+
+        * web-platform-tests/webrtc/RTCPeerConnection-createDataChannel-expected.txt:
+
 2018-03-12  Chris Dumez  <cdu...@apple.com>
 
         Re-sync dom web-platform-tests

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-createDataChannel-expected.txt (229547 => 229548)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-createDataChannel-expected.txt	2018-03-12 21:06:42 UTC (rev 229547)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-createDataChannel-expected.txt	2018-03-12 21:16:35 UTC (rev 229548)
@@ -1,6 +1,6 @@
 
 PASS createDataChannel with no argument should throw TypeError 
-FAIL createDataChannel with closed connection should throw InvalidStateError assert_equals: signaling state expected "closed" but got "stable"
+PASS createDataChannel with closed connection should throw InvalidStateError 
 FAIL createDataChannel attribute default values assert_equals: expected (string) "low" but got (undefined) undefined
 FAIL createDataChannel with provided parameters should initialize attributes to provided values Type error
 PASS createDataChannel with label "foo" should succeed 

Modified: trunk/Source/WebCore/ChangeLog (229547 => 229548)


--- trunk/Source/WebCore/ChangeLog	2018-03-12 21:06:42 UTC (rev 229547)
+++ trunk/Source/WebCore/ChangeLog	2018-03-12 21:16:35 UTC (rev 229548)
@@ -1,3 +1,20 @@
+2018-03-12  Youenn Fablet  <you...@apple.com>
+
+        RTCPeerConnection's close method should update signalingState
+        https://bugs.webkit.org/show_bug.cgi?id=174314
+        <rdar://problem/33267977>
+
+        Reviewed by Eric Carlson.
+
+        Covered by rebased test.
+        Add closed as signalingState enum value.
+        Set peer connection signaling state to closed once close is called.
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::doClose):
+        * Modules/mediastream/RTCSignalingState.idl:
+        * platform/mediastream/RTCSignalingState.h:
+
 2018-03-12  Mark Lam  <mark....@apple.com>
 
         Make a NativeFunction into a class to support pointer profiling.

Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (229547 => 229548)


--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp	2018-03-12 21:06:42 UTC (rev 229547)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp	2018-03-12 21:16:35 UTC (rev 229548)
@@ -394,6 +394,7 @@
 
     m_connectionState = RTCPeerConnectionState::Closed;
     m_iceConnectionState = RTCIceConnectionState::Closed;
+    m_signalingState = RTCSignalingState::Closed;
 
     for (auto& transceiver : m_transceiverSet->list()) {
         transceiver->stop();

Modified: trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.idl (229547 => 229548)


--- trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.idl	2018-03-12 21:06:42 UTC (rev 229547)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.idl	2018-03-12 21:16:35 UTC (rev 229548)
@@ -31,5 +31,6 @@
     "have-local-offer",
     "have-remote-offer",
     "have-local-pranswer",
-    "have-remote-pranswer"
+    "have-remote-pranswer",
+    "closed"
 };

Modified: trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h (229547 => 229548)


--- trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h	2018-03-12 21:06:42 UTC (rev 229547)
+++ trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h	2018-03-12 21:16:35 UTC (rev 229548)
@@ -34,6 +34,7 @@
     HaveRemoteOffer,
     HaveLocalPranswer,
     HaveRemotePranswer,
+    Closed,
 };
 
 String convertEnumerationToString(RTCSignalingState); // in JSCRTCSignalingState.cpp
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to