Diff
Modified: trunk/LayoutTests/ChangeLog (271749 => 271750)
--- trunk/LayoutTests/ChangeLog 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/ChangeLog 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,3 +1,12 @@
+2021-01-22 Youenn Fablet <[email protected]>
+
+ Add more descriptive messages to setLocalDescription/setRemoteDescription error cases
+ https://bugs.webkit.org/show_bug.cgi?id=220857
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/RTCPeerConnection-setRemoteDescription-offer-expected.txt:
+
2021-01-22 Chris Dumez <[email protected]>
[ Big Sur ] imported/w3c/web-platform-tests/beacon/beacon-cors.sub.window.html is a flaky failure
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer-expected.txt (271749 => 271750)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -20,8 +20,8 @@
FAIL pc.signalingState should be have-remote-offer. Was stable.
*** Try setting local descriptions with bad types for the current state
-PASS promise pc.setRemoteDescription({type:'answer', sdp:remoteOffer1.sdp}); rejected with InvalidStateError: Description type incompatible with current signaling state
-PASS promise pc.setRemoteDescription({type:'pranswer', sdp:remoteOffer1.sdp}); rejected with InvalidStateError: Description type incompatible with current signaling state
+PASS promise pc.setRemoteDescription({type:'answer', sdp:remoteOffer1.sdp}); rejected with InvalidStateError: Remote description type 2 is incompatible with current signaling state 0
+PASS promise pc.setRemoteDescription({type:'pranswer', sdp:remoteOffer1.sdp}); rejected with InvalidStateError: Remote description type 1 is incompatible with current signaling state 0
*** Create (remote) offer with video (remoteOffer2)
*** Done, start testing with remoteOffer2
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,3 +1,19 @@
+2021-01-22 Youenn Fablet <[email protected]>
+
+ Add more descriptive messages to setLocalDescription/setRemoteDescription error cases
+ https://bugs.webkit.org/show_bug.cgi?id=220857
+
+ Reviewed by Eric Carlson.
+
+ * web-platform-tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-operations.https-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-rollback-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback-expected.txt:
+
2021-01-22 Ziran Sun <[email protected]>
[css-grid] Relayout grid items when definiteness changes.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,3 +1,3 @@
-FAIL setLocalDescription and setRemoteDescription are not racy promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setLocalDescription and setRemoteDescription are not racy promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 0 is incompatible with current signaling state 1"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-operations.https-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-operations.https-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-operations.https-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -26,7 +26,7 @@
PASS sender.getStats does NOT use the operations chain
PASS receiver.getStats does NOT use the operations chain
FAIL addIceCandidate chains onto SRD, fails before assert_equals: expected "InvalidStateError" but got "Error"
-FAIL Operations queue not vulnerable to recursion by chained negotiationneeded promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL Operations queue not vulnerable to recursion by chained negotiationneeded promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 0 is incompatible with current signaling state 1"
FAIL Pack operations queue with implicit offer and answer promise_test: Unhandled rejection with value: object "OperationError: Expect line: v="
TIMEOUT Negotiate solely by operations queue and signaling state Test timed out
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,4 +1,4 @@
-FAIL Perfect negotiation stress glare linear Description type incompatible with current signaling state
-FAIL Perfect negotiation stress glare linear with roles reversed assert_unreached: Error in iframe: InvalidStateError: Description type incompatible with current signaling state Reached unreachable code
+FAIL Perfect negotiation stress glare linear Remote description type 0 is incompatible with current signaling state 1
+FAIL Perfect negotiation stress glare linear with roles reversed assert_unreached: Error in iframe: InvalidStateError: Remote description type 0 is incompatible with current signaling state 1 Reached unreachable code
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,4 +1,4 @@
-FAIL Perfect negotiation stress glare Description type incompatible with current signaling state
-FAIL Perfect negotiation stress glare with roles reversed assert_unreached: Error in iframe: InvalidStateError: Description type incompatible with current signaling state Reached unreachable code
+FAIL Perfect negotiation stress glare Remote description type 0 is incompatible with current signaling state 1
+FAIL Perfect negotiation stress glare with roles reversed assert_unreached: Error in iframe: InvalidStateError: Remote description type 0 is incompatible with current signaling state 1 Reached unreachable code
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,8 +1,8 @@
PASS setLocalDescription(offer) with m= section should assign mid to corresponding transceiver
PASS setRemoteDescription(offer) with m= section and no existing transceiver should create corresponding transceiver
-FAIL setLocalDescription(rollback) should unset transceiver.mid promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL setLocalDescription(rollback) should only unset transceiver mids associated with current round promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL setRemoteDescription(rollback) should remove newly created transceiver from transceiver list promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setLocalDescription(rollback) should unset transceiver.mid promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
+FAIL setLocalDescription(rollback) should only unset transceiver mids associated with current round promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
+FAIL setRemoteDescription(rollback) should remove newly created transceiver from transceiver list promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
PASS setRemoteDescription should set transceiver inactive if its corresponding m section is rejected
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-rollback-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-rollback-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-rollback-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,7 +1,7 @@
-FAIL setLocalDescription(rollback) from have-local-offer state should reset back to stable state promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setLocalDescription(rollback) from have-local-offer state should reset back to stable state promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
PASS setLocalDescription(rollback) from stable state should reject with InvalidStateError
PASS setLocalDescription(rollback) after setting answer description should reject with InvalidStateError
-FAIL setLocalDescription(rollback) should ignore invalid sdp content and succeed promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL setLocalDescription(rollback) should update internal state with a queued tassk, in the right order promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setLocalDescription(rollback) should ignore invalid sdp content and succeed promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
+FAIL setLocalDescription(rollback) should update internal state with a queued tassk, in the right order promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -5,7 +5,7 @@
PASS setRemoteDescription multiple times should succeed
PASS setRemoteDescription multiple times with different offer should succeed
FAIL setRemoteDescription(offer) with invalid SDP should reject with RTCError assert_equals: Expect error detail field to set to sdp-syntax-error expected (string) "sdp-syntax-error" but got (undefined) undefined
-FAIL setRemoteDescription(offer) from have-local-offer should roll back and succeed promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setRemoteDescription(offer) from have-local-offer should roll back and succeed promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 0 is incompatible with current signaling state 1"
TIMEOUT setRemoteDescription(offer) from have-local-offer fires signalingstatechange twice Test timed out
NOTRUN setRemoteDescription(offer) in stable should update internal state with a queued task, in the right order
NOTRUN setRemoteDescription(offer) in have-local-offer should update internal state with a queued task, in the right order
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback-expected.txt (271749 => 271750)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback-expected.txt 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback-expected.txt 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,23 +1,23 @@
-FAIL setRemoteDescription(rollback) in have-remote-offer state should revert to stable state promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setRemoteDescription(rollback) in have-remote-offer state should revert to stable state promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
PASS setRemoteDescription(rollback) from stable state should reject with InvalidStateError
-FAIL setRemoteDescription(rollback) should ignore invalid sdp content and succeed promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL local offer created before setRemoteDescription(remote offer) then rollback should still be usable promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL local offer created before setRemoteDescription(remote offer) with different transceiver level assignments then rollback should still be usable promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback of a remote offer should remove a transceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback of a remote offer should remove touched transceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback of a remote offer should keep a transceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback of a remote offer should keep a transceiver created by addtrack promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback of a remote offer should keep a transceiver without tracks promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL explicit rollback of local offer should remove transceivers and transport promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL setRemoteDescription(rollback) should ignore invalid sdp content and succeed promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL local offer created before setRemoteDescription(remote offer) then rollback should still be usable promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL local offer created before setRemoteDescription(remote offer) with different transceiver level assignments then rollback should still be usable promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL rollback of a remote offer should remove a transceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL rollback of a remote offer should remove touched transceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL rollback of a remote offer should keep a transceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL rollback of a remote offer should keep a transceiver created by addtrack promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL rollback of a remote offer should keep a transceiver without tracks promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL explicit rollback of local offer should remove transceivers and transport promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
FAIL when using addTransceiver, implicit rollback of a local offer should visit stable state, but not fire negotiationneeded until we settle in stable assert_true: There should be no negotiationneeded event right now expected true got false
FAIL when using addTrack, implicit rollback of a local offer should visit stable state, but not fire negotiationneeded assert_true: There should be no negotiationneeded event in this test expected true got false
-FAIL rollback of a remote offer to negotiated stable state should enable applying of a local offer promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback of a local offer to negotiated stable state should enable applying of a remote offer promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL rollback a local offer with audio direction change to negotiated stable state and then add video receiver promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL two transceivers with same mids promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
-FAIL onremovetrack fires during remote rollback promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL rollback of a remote offer to negotiated stable state should enable applying of a local offer promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL rollback of a local offer to negotiated stable state should enable applying of a remote offer promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
+FAIL rollback a local offer with audio direction change to negotiated stable state and then add video receiver promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
+FAIL two transceivers with same mids promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 0 is incompatible with current signaling state 1"
+FAIL onremovetrack fires during remote rollback promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
FAIL rollback of a remote offer with stream changes assert_equals: expected 2 but got 1
PASS removeTrack() with a sender being rolled back does not crash or throw
-FAIL Implicit rollback with only a datachannel works promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
+FAIL Implicit rollback with only a datachannel works promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 0 is incompatible with current signaling state 1"
Modified: trunk/Source/WebCore/ChangeLog (271749 => 271750)
--- trunk/Source/WebCore/ChangeLog 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/Source/WebCore/ChangeLog 2021-01-22 18:33:38 UTC (rev 271750)
@@ -1,5 +1,18 @@
2021-01-22 Youenn Fablet <[email protected]>
+ Add more descriptive messages to setLocalDescription/setRemoteDescription error cases
+ https://bugs.webkit.org/show_bug.cgi?id=220857
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior, covered by rebased tests.
+
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ (WebCore::PeerConnectionBackend::setLocalDescription):
+ (WebCore::PeerConnectionBackend::setRemoteDescription):
+
+2021-01-22 Youenn Fablet <[email protected]>
+
Disable verification timer in case of capture suspension
https://bugs.webkit.org/show_bug.cgi?id=220859
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (271749 => 271750)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2021-01-22 18:11:02 UTC (rev 271749)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2021-01-22 18:33:38 UTC (rev 271750)
@@ -185,7 +185,7 @@
ASSERT(!m_peerConnection.isClosed());
if (sessionDescription && !isLocalDescriptionTypeValidForState(sessionDescription->type(), m_peerConnection.signalingState())) {
- promise.reject(InvalidStateError, "Description type incompatible with current signaling state");
+ promise.reject(InvalidStateError, makeString("Local description type ", sessionDescription->type(), " is incompatible with current signaling state ", m_peerConnection.signalingState()));
return;
}
@@ -245,7 +245,7 @@
ASSERT(!m_peerConnection.isClosed());
if (!isRemoteDescriptionTypeValidForState(sessionDescription.type(), m_peerConnection.signalingState())) {
- promise.reject(InvalidStateError, "Description type incompatible with current signaling state");
+ promise.reject(InvalidStateError, makeString("Remote description type ", sessionDescription.type(), " is incompatible with current signaling state ", m_peerConnection.signalingState()));
return;
}
