Diff
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,24 +1,3 @@
-2021-08-19 Youenn Fablet <you...@apple.com>
-
- Add support for RTCDtlsTransport
- https://bugs.webkit.org/show_bug.cgi?id=229133
-
- Reviewed by Eric Carlson.
-
- * web-platform-tests/webrtc/RTCDtlsTransport-getRemoteCertificates-expected.txt:
- * web-platform-tests/webrtc/RTCDtlsTransport-state-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-helper-test-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-answer-expected.txt:
- * web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-offer-expected.txt:
- * web-platform-tests/webrtc/RTCRtpSender-transport.https-expected.txt:
- * web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt:
- * web-platform-tests/webrtc/protocol/bundle.https-expected.txt:
- * web-platform-tests/webrtc/protocol/crypto-suite.https-expected.txt:
-
2021-08-18 Chris Dumez <cdu...@apple.com>
Unreviewed, reverting r281206.
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDtlsTransport-getRemoteCertificates-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDtlsTransport-getRemoteCertificates-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDtlsTransport-getRemoteCertificates-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,3 +1,3 @@
-PASS RTCDtlsTransport.prototype.getRemoteCertificates
+FAIL RTCDtlsTransport.prototype.getRemoteCertificates undefined is not an object (evaluating 'dtlsTransport.state')
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDtlsTransport-state-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDtlsTransport-state-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDtlsTransport-state-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,5 +1,5 @@
-PASS DTLS transport goes to connected state
-FAIL close() causes the local transport to close immediately assert_equals: expected "closed" but got "connected"
-PASS close() causes the other end's DTLS transport to close
+FAIL DTLS transport goes to connected state promise_test: Unhandled rejection with value: object "ReferenceError: Can't find variable: RTCDtlsTransport"
+FAIL close() causes the local transport to close immediately promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'dtlstransport.state')"
+FAIL close() causes the other end's DTLS transport to close promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'dtlstransport.state')"
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,5 +1,5 @@
-PASS Candidates are added dynamically; connection should work
-PASS Candidates are added at PC1; connection should work
-PASS Candidates are added at PC2; connection should work
+FAIL Candidates are added dynamically; connection should work promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
+FAIL Candidates are added at PC1; connection should work promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
+FAIL Candidates are added at PC2; connection should work promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-helper-test-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-helper-test-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-helper-test-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,3 +1,3 @@
-PASS Setting up a connection using helpers and defaults should work
+FAIL Setting up a connection using helpers and defaults should work promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -6,9 +6,9 @@
PASS connection with audio track should eventually have connected connection state
PASS connection with audio and video tracks should eventually have connected connection state
PASS ICE can connect in a recvonly usecase
-FAIL iceConnectionState changes at the right time, with bundle policy balanced promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
-FAIL iceConnectionState changes at the right time, with bundle policy max-bundle promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
-FAIL iceConnectionState changes at the right time, with bundle policy max-compat promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
+FAIL iceConnectionState changes at the right time, with bundle policy balanced promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'caller_transceiver1.receiver.transport.iceTransport')"
+FAIL iceConnectionState changes at the right time, with bundle policy max-bundle promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'caller_transceiver1.receiver.transport.iceTransport')"
+FAIL iceConnectionState changes at the right time, with bundle policy max-compat promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'caller_transceiver1.receiver.transport.iceTransport')"
PASS Responder ICE connection state behaves as expected
PASS Closing a PeerConnection should not fire iceconnectionstatechange event
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -4,9 +4,11 @@
PASS Initial iceGatheringState should be new
PASS iceGatheringState should eventually become complete after setLocalDescription
TIMEOUT setLocalDescription(reoffer) with no new transports should not cause iceGatheringState to change Test timed out
-NOTRUN setLocalDescription() with no transports should not cause iceGatheringState to change
+NOTRUN rolling back an ICE restart when gathering is complete should not result in iceGatheringState changes
NOTRUN setLocalDescription(reoffer) with a new transport should cause iceGatheringState to go to "checking" and then "complete"
NOTRUN sRD does not cause ICE gathering state changes
+NOTRUN setLocalDescription(rollback) of original offer should cause iceGatheringState to reach "new" when starting in "complete"
+NOTRUN setLocalDescription(rollback) of original offer should cause iceGatheringState to reach "new" when starting in "gathering"
NOTRUN renegotiation that closes all transports should result in ICE gathering state "new"
FAIL connection with one data channel should eventually have connected connection state undefined is not an object (evaluating 'pc2.sctp.transport')
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -13,6 +13,6 @@
PASS removeTrack should cause negotiationneeded to fire on the caller
PASS removeTrack should cause negotiationneeded to fire on the callee
PASS Updating the direction of the transceiver should cause negotiationneeded to fire
-PASS Calling setStreams should cause negotiationneeded to fire
+FAIL Calling setStreams should cause negotiationneeded to fire promise_test: Unhandled rejection with value: object "TypeError: transceiver.sender.setStreams is not a function. (In 'transceiver.sender.setStreams(stream)', 'transceiver.sender.setStreams' is undefined)"
PASS Adding two transceivers, one at a time, results in the expected number of negotiationneeded events
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-answer-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-answer-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-answer-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,9 +1,9 @@
PASS setLocalDescription() with valid answer should succeed
FAIL setLocalDescription() with type answer and null sdp should use lastAnswer generated from createAnswer promise_test: Unhandled rejection with value: object "OperationError: Expect line: v="
-FAIL setLocalDescription() with answer not created by own createAnswer() should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "OperationError: Failed to set local answer sdp: Failed to apply the description for m= section with mid='0': Local fingerprint does not match identity. Expected: sha-256 0D:E2:FA:94:4D:00:FD:19:00:18:DC:96:C0:5D:20:81:53:91:E1:DE:73:E9:B6:99:A3:64:B9:F1:58:69:81:18 Got: sha-256 94:25:42:B4:B7:8C:8C:F5:DF:C5:ED:6A:82:03:44:0D:4E:1B:0A:B7:76:D6:BE:DA:72:80:7D:3D:6C:78:2B:F3" that is not a DOMException InvalidModificationError: property "code" is equal to 0, expected 13
-FAIL Calling setLocalDescription(answer) from stable state should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "InvalidStateError: Local description type 2 is incompatible with current signaling state 0" that is not a DOMException InvalidModificationError: property "code" is equal to 11, expected 13
-FAIL Calling setLocalDescription(answer) from have-local-offer state should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "InvalidStateError: Local description type 2 is incompatible with current signaling state 1" that is not a DOMException InvalidModificationError: property "code" is equal to 11, expected 13
-FAIL Setting previously generated answer after a call to createOffer should work promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL setLocalDescription() with answer not created by own createAnswer() should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "OperationError: Failed to set local answer sdp: Failed to apply the description for 0: Local fingerprint does not match identity. Expected: sha-256 94:08:AE:B7:34:87:16:81:D4:31:42:BE:25:5D:E7:FA:1A:71:B4:51:9A:BF:D5:83:BE:FA:66:2D:51:49:7A:25 Got: sha-256 77:1A:44:22:03:5C:81:A3:27:FA:09:EB:C9:AD:DD:19:A6:AE:4A:AF:A0:1C:69:E7:9D:11:12:E5:96:4F:C4:F7" that is not a DOMException InvalidModificationError: property "code" is equal to 0, expected 13
+FAIL Calling setLocalDescription(answer) from stable state should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "InvalidStateError: Description type incompatible with current signaling state" that is not a DOMException InvalidModificationError: property "code" is equal to 11, expected 13
+FAIL Calling setLocalDescription(answer) from have-local-offer state should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "InvalidStateError: Description type incompatible with current signaling state" that is not a DOMException InvalidModificationError: property "code" is equal to 11, expected 13
+FAIL Setting previously generated answer after a call to createOffer should work promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
FAIL setLocalDescription(answer) should update internal state with a queued task, in the right order assert_not_equals: pendingRemoteDescription should not be set synchronously after a call to sLD got disallowed value null
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-offer-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-offer-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-offer-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,10 +1,10 @@
PASS setLocalDescription with valid offer should succeed
FAIL setLocalDescription with type offer and null sdp should use lastOffer generated from createOffer promise_test: Unhandled rejection with value: object "OperationError: Expect line: v="
-FAIL setLocalDescription() with offer not created by own createOffer() should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "OperationError: Failed to set local offer sdp: Failed to apply the description for m= section with mid='0': Local fingerprint does not match identity. Expected: sha-256 AC:89:BE:E6:A4:DB:0A:BB:A7:A5:85:7E:53:F6:60:11:D8:97:44:6D:D0:A1:4C:32:80:B3:03:94:C8:83:AD:A8 Got: sha-256 34:AF:27:F0:FE:EF:83:BC:1D:76:C6:89:C7:D9:81:7C:C3:FB:DA:F0:04:CF:D3:81:FC:62:FA:9A:84:B5:3B:E8" that is not a DOMException InvalidModificationError: property "code" is equal to 0, expected 13
+FAIL setLocalDescription() with offer not created by own createOffer() should reject with InvalidModificationError promise_rejects_dom: function "function () { throw e }" threw object "OperationError: Failed to set local offer sdp: Failed to apply the description for 0: Local fingerprint does not match identity. Expected: sha-256 5D:F6:6D:28:A7:DC:C3:E4:F3:81:FD:B0:DD:0F:03:45:D7:C8:E5:70:18:11:02:4B:91:49:45:52:1F:8E:BD:FA Got: sha-256 B1:90:88:57:15:70:3A:0F:B6:FC:B9:1B:02:8A:66:84:00:0C:2E:ED:2C:54:51:29:7F:98:48:DC:1C:59:7F:87" that is not a DOMException InvalidModificationError: property "code" is equal to 0, expected 13
FAIL Set created offer other than last offer should reject with InvalidModificationError assert_unreached: Should have rejected: undefined Reached unreachable code
PASS Creating and setting offer multiple times should succeed
-FAIL Setting previously generated offer after a call to createAnswer should work promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL Setting previously generated offer after a call to createAnswer should work promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
FAIL Negotiation works when there has been a repeated setLocalDescription(offer) assert_equals: expected 1 but got 0
FAIL setLocalDescription(offer) should update internal state with a queued task, in the right order assert_equals: pendingRemoteDescription should never be set due to sLD expected null but got object "[object RTCSessionDescription]"
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpSender-transport.https-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpSender-transport.https-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpSender-transport.https-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,10 +1,10 @@
-PASS RTCRtpSender.transport is null when unconnected
-PASS RTCRtpSender/receiver.transport has a value when connected
-PASS RTCRtpSender/receiver.transport at the right time, with bundle policy balanced
-FAIL RTCRtpSender/receiver/SCTP transport at the right time, with bundle policy balanced promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'caller.sctp.transport')"
-PASS RTCRtpSender/receiver.transport at the right time, with bundle policy max-bundle
-FAIL RTCRtpSender/receiver/SCTP transport at the right time, with bundle policy max-bundle promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'caller.sctp.transport')"
-PASS RTCRtpSender/receiver.transport at the right time, with bundle policy max-compat
-FAIL RTCRtpSender/receiver/SCTP transport at the right time, with bundle policy max-compat promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'caller.sctp.transport')"
+FAIL RTCRtpSender.transport is null when unconnected assert_equals: expected (object) null but got (undefined) undefined
+FAIL RTCRtpSender/receiver.transport has a value when connected promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'sender.transport.iceTransport')"
+FAIL RTCRtpSender/receiver.transport at the right time, with bundle policy balanced assert_equals: expected (object) null but got (undefined) undefined
+FAIL RTCRtpSender/receiver/SCTP transport at the right time, with bundle policy balanced assert_equals: expected (object) null but got (undefined) undefined
+FAIL RTCRtpSender/receiver.transport at the right time, with bundle policy max-bundle assert_equals: expected (object) null but got (undefined) undefined
+FAIL RTCRtpSender/receiver/SCTP transport at the right time, with bundle policy max-bundle assert_equals: expected (object) null but got (undefined) undefined
+FAIL RTCRtpSender/receiver.transport at the right time, with bundle policy max-compat assert_equals: expected (object) null but got (undefined) undefined
+FAIL RTCRtpSender/receiver/SCTP transport at the right time, with bundle policy max-compat assert_equals: expected (object) null but got (undefined) undefined
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,4 +1,6 @@
+Harness Error (TIMEOUT), message = null
+
PASS checkAddTransceiverNoTrack
PASS checkAddTransceiverWithTrack
PASS checkAddTransceiverWithAddTrack
@@ -10,7 +12,7 @@
PASS checkNoMidOffer
PASS checkNoMidAnswer
PASS checkSetDirection
-FAIL checkCurrentDirection assert_equals: expected "[{currentDirection:null}]" but got "[{currentDirection:\"inactive\"}]"
+PASS checkCurrentDirection
PASS checkSendrecvWithNoSendTrack
PASS checkSendrecvWithTracklessStream
PASS checkAddTransceiverNoTrackDoesntPair
@@ -21,20 +23,20 @@
PASS checkReplaceTrackNullDoesntPreventPairing
PASS checkRemoveAndReadd
PASS checkAddTrackExistingTransceiverThenRemove
-FAIL checkRemoveTrackNegotiation promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
+FAIL checkRemoveTrackNegotiation promise_test: Unhandled rejection with value: object "InvalidStateError: Description type incompatible with current signaling state"
FAIL checkMute assert_true: expected true got false
-FAIL checkStop assert_equals: expected "[{currentDirection:\"sendrecv\",direction:\"stopped\",receiver:{track:{kind:\"audio\",readyState:\"ended\"}},sender:{track:{kind:\"audio\"}}}]" but got "[{currentDirection:\"sendrecv\",direction:\"inactive\",receiver:{track:{kind:\"audio\",readyState:\"ended\"}},sender:{track:null}}]"
-FAIL checkStopAfterCreateOffer assert_equals: expected "[{currentDirection:\"sendrecv\",direction:\"stopped\"}]" but got "[{currentDirection:\"sendrecv\",direction:\"inactive\"}]"
-FAIL checkStopAfterSetLocalOffer assert_equals: expected "[{currentDirection:\"sendrecv\",direction:\"stopped\"}]" but got "[{currentDirection:\"sendrecv\",direction:\"inactive\"}]"
-FAIL checkStopAfterSetRemoteOffer assert_equals: expected "stopped" but got "inactive"
-FAIL checkStopAfterCreateAnswer assert_equals: expected "[{currentDirection:null,direction:\"stopped\"}]" but got "[{currentDirection:null,direction:\"inactive\"}]"
-FAIL checkStopAfterSetLocalAnswer assert_equals: expected "[{currentDirection:\"sendrecv\",direction:\"stopped\"}]" but got "[{currentDirection:\"sendrecv\",direction:\"inactive\"}]"
-PASS checkStopAfterClose
-FAIL checkLocalRollback promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
-FAIL checkRollbackAndSetRemoteOfferWithDifferentType promise_test: Unhandled rejection with value: object "InvalidStateError: Local description type 3 is incompatible with current signaling state 1"
-FAIL checkRemoteRollback promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 3 is incompatible with current signaling state 2"
-FAIL checkMsectionReuse assert_equals: expected "[{currentDirection:null,mid:null}]" but got "[{currentDirection:\"inactive\",mid:\"0\"}]"
-PASS checkStopAfterCreateOfferWithReusedMsection
-FAIL checkAddIceCandidateToStoppedTransceiver promise_test: Unhandled rejection with value: object "InvalidStateError: Remote description type 0 is incompatible with current signaling state 1"
-FAIL checkBundleTagRejected promise_test: Unhandled rejection with value: object "InvalidAccessError: Failed to set remote offer sdp: The m= section with mid='1' should be rejected."
+FAIL checkStop assert_equals: expected "[{currentDirection:null,direction:\"sendrecv\",receiver:{track:{kind:\"audio\",readyState:\"ended\"}},sender:{track:{kind:\"audio\"}},stopped:true}]" but got "[{currentDirection:null,direction:\"sendrecv\",receiver:{track:{kind:\"audio\",readyState:\"ended\"}},sender:{track:null},stopped:true}]"
+FAIL checkStopAfterCreateOffer assert_equals: expected "[{mid:null,stopped:true}]" but got "[{mid:\"0\",stopped:true}]"
+FAIL checkStopAfterSetLocalOffer assert_equals: expected "[{mid:null,stopped:true}]" but got "[{mid:\"0\",stopped:true}]"
+FAIL checkStopAfterSetRemoteOffer assert_equals: expected "[]" but got "[{isTrusted:true}]"
+FAIL checkStopAfterCreateAnswer assert_equals: expected "[{mid:null,stopped:true}]" but got "[{mid:\"0\",stopped:true}]"
+TIMEOUT checkStopAfterSetLocalAnswer Test timed out
+NOTRUN checkStopAfterClose
+NOTRUN checkLocalRollback
+NOTRUN checkRollbackAndSetRemoteOfferWithDifferentType
+NOTRUN checkRemoteRollback
+NOTRUN checkMsectionReuse
+NOTRUN checkStopAfterCreateOfferWithReusedMsection
+NOTRUN checkAddIceCandidateToStoppedTransceiver
+NOTRUN checkBundleTagRejected
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/idlharness.https.window-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/idlharness.https.window-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/idlharness.https.window-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -232,7 +232,7 @@
PASS RTCRtpSender interface: existence and properties of interface prototype object's "constructor" property
PASS RTCRtpSender interface: existence and properties of interface prototype object's @@unscopables property
PASS RTCRtpSender interface: attribute track
-PASS RTCRtpSender interface: attribute transport
+FAIL RTCRtpSender interface: attribute transport assert_true: The prototype object must have a property "transport" expected true got false
PASS RTCRtpSender interface: operation getCapabilities(DOMString)
PASS RTCRtpSender interface: operation setParameters(RTCRtpSendParameters)
PASS RTCRtpSender interface: operation getParameters()
@@ -243,7 +243,7 @@
PASS RTCRtpSender must be primary interface of new RTCPeerConnection().addTransceiver('audio').sender
PASS Stringification of new RTCPeerConnection().addTransceiver('audio').sender
PASS RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "track" with the proper type
-PASS RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "transport" with the proper type
+FAIL RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "transport" with the proper type assert_inherits: property "transport" not found in prototype chain
PASS RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "getCapabilities(DOMString)" with the proper type
PASS RTCRtpSender interface: calling getCapabilities(DOMString) on new RTCPeerConnection().addTransceiver('audio').sender with too few arguments must throw TypeError
PASS RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "setParameters(RTCRtpSendParameters)" with the proper type
@@ -262,7 +262,7 @@
PASS RTCRtpReceiver interface: existence and properties of interface prototype object's "constructor" property
PASS RTCRtpReceiver interface: existence and properties of interface prototype object's @@unscopables property
PASS RTCRtpReceiver interface: attribute track
-PASS RTCRtpReceiver interface: attribute transport
+FAIL RTCRtpReceiver interface: attribute transport assert_true: The prototype object must have a property "transport" expected true got false
PASS RTCRtpReceiver interface: operation getCapabilities(DOMString)
PASS RTCRtpReceiver interface: operation getParameters()
PASS RTCRtpReceiver interface: operation getContributingSources()
@@ -271,7 +271,7 @@
PASS RTCRtpReceiver must be primary interface of new RTCPeerConnection().addTransceiver('audio').receiver
PASS Stringification of new RTCPeerConnection().addTransceiver('audio').receiver
PASS RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "track" with the proper type
-PASS RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "transport" with the proper type
+FAIL RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "transport" with the proper type assert_inherits: property "transport" not found in prototype chain
PASS RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getCapabilities(DOMString)" with the proper type
PASS RTCRtpReceiver interface: calling getCapabilities(DOMString) on new RTCPeerConnection().addTransceiver('audio').receiver with too few arguments must throw TypeError
PASS RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getParameters()" with the proper type
@@ -301,17 +301,17 @@
PASS RTCRtpTransceiver interface: new RTCPeerConnection().addTransceiver('audio') must inherit property "stop()" with the proper type
PASS RTCRtpTransceiver interface: new RTCPeerConnection().addTransceiver('audio') must inherit property "setCodecPreferences(sequence<RTCRtpCodecCapability>)" with the proper type
PASS RTCRtpTransceiver interface: calling setCodecPreferences(sequence<RTCRtpCodecCapability>) on new RTCPeerConnection().addTransceiver('audio') with too few arguments must throw TypeError
-PASS RTCDtlsTransport interface: existence and properties of interface object
-PASS RTCDtlsTransport interface object length
-PASS RTCDtlsTransport interface object name
-PASS RTCDtlsTransport interface: existence and properties of interface prototype object
-PASS RTCDtlsTransport interface: existence and properties of interface prototype object's "constructor" property
-PASS RTCDtlsTransport interface: existence and properties of interface prototype object's @@unscopables property
-FAIL RTCDtlsTransport interface: attribute iceTransport assert_true: The prototype object must have a property "iceTransport" expected true got false
-PASS RTCDtlsTransport interface: attribute state
-PASS RTCDtlsTransport interface: operation getRemoteCertificates()
-PASS RTCDtlsTransport interface: attribute onstatechange
-PASS RTCDtlsTransport interface: attribute onerror
+FAIL RTCDtlsTransport interface: existence and properties of interface object assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface object length assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface object name assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: existence and properties of interface prototype object assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: attribute iceTransport assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: attribute state assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: operation getRemoteCertificates() assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: attribute onstatechange assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
+FAIL RTCDtlsTransport interface: attribute onerror assert_own_property: self does not have own property "RTCDtlsTransport" expected property "RTCDtlsTransport" missing
FAIL RTCDtlsTransport must be primary interface of idlTestObjects.dtlsTransport assert_equals: wrong typeof object expected "object" but got "undefined"
FAIL Stringification of idlTestObjects.dtlsTransport assert_equals: wrong typeof object expected "object" but got "undefined"
FAIL RTCDtlsTransport interface: idlTestObjects.dtlsTransport must inherit property "iceTransport" with the proper type assert_equals: wrong typeof object expected "object" but got "undefined"
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/bundle.https-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/bundle.https-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/bundle.https-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,4 +1,4 @@
FAIL not negotiating BUNDLE creates two separate ice and dtls transports assert_not_equals: got disallowed value undefined
-PASS bundles on the first transport and closes the second
+FAIL bundles on the first transport and closes the second assert_not_equals: got disallowed value undefined
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/crypto-suite.https-expected.txt (281262 => 281263)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/crypto-suite.https-expected.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/webrtc/protocol/crypto-suite.https-expected.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,10 +1,10 @@
FAIL tlsVersion is acceptable on data-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'pc1.sctp.transport')"
-PASS tlsVersion is acceptable on video-only
+FAIL tlsVersion is acceptable on video-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
FAIL dtlsCipher is acceptable on data-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'pc1.sctp.transport')"
-FAIL dtlsCipher is acceptable on video-only assert_true: expected true got false
+FAIL dtlsCipher is acceptable on video-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
FAIL srtpCipher is acceptable on data-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'pc1.sctp.transport')"
-PASS srtpCipher is acceptable on video-only
+FAIL srtpCipher is acceptable on video-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
FAIL tlsGroup is acceptable on data-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'pc1.sctp.transport')"
-FAIL tlsGroup is acceptable on video-only assert_true: Value present: expected true got false
+FAIL tlsGroup is acceptable on video-only promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'transport.state')"
Modified: branches/safari-612-branch/Source/ThirdParty/libwebrtc/ChangeLog (281262 => 281263)
--- branches/safari-612-branch/Source/ThirdParty/libwebrtc/ChangeLog 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/ThirdParty/libwebrtc/ChangeLog 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,14 +1,3 @@
-2021-08-19 Youenn Fablet <you...@apple.com>
-
- Add support for RTCDtlsTransport
- https://bugs.webkit.org/show_bug.cgi?id=229133
-
- Reviewed by Eric Carlson.
-
- * Configurations/libwebrtc.iOS.exp:
- * Configurations/libwebrtc.iOSsim.exp:
- * Configurations/libwebrtc.mac.exp:
-
2021-08-13 Youenn Fablet <you...@apple.com>
Use profile auto level for WebRTC H264 encoder on Apple Silicon
Modified: branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp (281262 => 281263)
--- branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -324,4 +324,3 @@
__ZNK3rtc13SocketAddress4HashEv
__ZNK3rtc13SocketAddresseqERKS0_
__ZNK3rtc9IPAddress5IsNilEv
-__ZN3rtc12SSLCertChainD1Ev
Modified: branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp (281262 => 281263)
--- branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -324,4 +324,3 @@
__ZNK3rtc13SocketAddress4HashEv
__ZNK3rtc13SocketAddresseqERKS0_
__ZNK3rtc9IPAddress5IsNilEv
-__ZN3rtc12SSLCertChainD1Ev
Modified: branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp (281262 => 281263)
--- branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -324,4 +324,3 @@
__ZNK3rtc13SocketAddress4HashEv
__ZNK3rtc13SocketAddresseqERKS0_
__ZNK3rtc9IPAddress5IsNilEv
-__ZN3rtc12SSLCertChainD1Ev
Modified: branches/safari-612-branch/Source/WebCore/CMakeLists.txt (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/CMakeLists.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/CMakeLists.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -377,8 +377,6 @@
Modules/mediastream/RTCDataChannel.idl
Modules/mediastream/RTCDataChannelEvent.idl
Modules/mediastream/RTCDegradationPreference.idl
- Modules/mediastream/RTCDtlsTransport.idl
- Modules/mediastream/RTCDtlsTransportState.idl
Modules/mediastream/RTCDtxStatus.idl
Modules/mediastream/RTCEncodedAudioFrame.idl
Modules/mediastream/RTCEncodedVideoFrame.idl
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-08-19 20:29:59 UTC (rev 281263)
@@ -74,82 +74,6 @@
(WebCore::RTCRtpTransceiver::RTCRtpTransceiver):
* Modules/mediastream/RTCRtpTransceiver.h:
-2021-08-19 Youenn Fablet <you...@apple.com>
-
- Add support for RTCDtlsTransport
- https://bugs.webkit.org/show_bug.cgi?id=229133
-
- Reviewed by Eric Carlson.
-
- RTCDtlsTransport is an object representing the transport used by RTCRtp senders and receivers.
- Add WebIDL and backend implementation.
- In particular, we set sender/receiver transports as per spec when setting the descriptions.
- Add support for state and certificates access. Add support for statechange event.
-
- Covered by rebased tests.
-
- * CMakeLists.txt:
- * DerivedSources-input.xcfilelist:
- * DerivedSources-output.xcfilelist:
- * DerivedSources.make:
- * Modules/mediastream/PeerConnectionBackend.cpp:
- (WebCore::PeerConnectionBackend::setLocalDescriptionSucceeded):
- (WebCore::PeerConnectionBackend::setRemoteDescriptionSucceeded):
- * Modules/mediastream/PeerConnectionBackend.h:
- * Modules/mediastream/RTCDtlsTransport.cpp: Added.
- (WebCore::RTCDtlsTransport::RTCDtlsTransport):
- (WebCore::RTCDtlsTransport::~RTCDtlsTransport):
- (WebCore::RTCDtlsTransport::getRemoteCertificates):
- (WebCore::RTCDtlsTransport::stop):
- (WebCore::RTCDtlsTransport::virtualHasPendingActivity const):
- (WebCore::RTCDtlsTransport::onStateChanged):
- (WebCore::RTCDtlsTransport::onError):
- * Modules/mediastream/RTCDtlsTransport.h: Added.
- * Modules/mediastream/RTCDtlsTransport.idl: Added.
- * Modules/mediastream/RTCDtlsTransportBackend.h: Added.
- (WebCore::operator==):
- * Modules/mediastream/RTCDtlsTransportState.h: Added.
- * Modules/mediastream/RTCDtlsTransportState.idl: Added.
- * Modules/mediastream/RTCPeerConnection.cpp:
- (WebCore::RTCPeerConnection::getOrCreateDtlsTransport):
- (WebCore::RTCPeerConnection::updateTransceiverTransports):
- (WebCore::RTCPeerConnection::updateTransceiversAfterSuccessfulLocalDescription):
- (WebCore::RTCPeerConnection::updateTransceiversAfterSuccessfulRemoteDescription):
- * Modules/mediastream/RTCPeerConnection.h:
- * Modules/mediastream/RTCRtpReceiver.cpp:
- * Modules/mediastream/RTCRtpReceiver.h:
- * Modules/mediastream/RTCRtpReceiver.idl:
- * Modules/mediastream/RTCRtpReceiverBackend.h:
- * Modules/mediastream/RTCRtpSender.cpp:
- * Modules/mediastream/RTCRtpSender.h:
- * Modules/mediastream/RTCRtpSender.idl:
- * Modules/mediastream/RTCRtpSenderBackend.h:
- * Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.cpp: Added.
- (WebCore::toRTCDtlsTransportState):
- (WebCore::LibWebRTCDtlsTransportBackendObserver::LibWebRTCDtlsTransportBackendObserver):
- (WebCore::LibWebRTCDtlsTransportBackendObserver::updateState):
- (WebCore::LibWebRTCDtlsTransportBackendObserver::start):
- (WebCore::LibWebRTCDtlsTransportBackendObserver::stop):
- (WebCore::LibWebRTCDtlsTransportBackendObserver::OnStateChange):
- (WebCore::LibWebRTCDtlsTransportBackendObserver::OnError):
- (WebCore::LibWebRTCDtlsTransportBackend::LibWebRTCDtlsTransportBackend):
- (WebCore::LibWebRTCDtlsTransportBackend::~LibWebRTCDtlsTransportBackend):
- (WebCore::LibWebRTCDtlsTransportBackend::registerClient):
- (WebCore::LibWebRTCDtlsTransportBackend::unregisterClient):
- * Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.h: Added.
- * Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp:
- (WebCore::LibWebRTCRtpReceiverBackend::rtpDtlsTransportBackend):
- * Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.h:
- * Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp:
- (WebCore::LibWebRTCRtpSenderBackend::rtpDtlsTransportBackend):
- * Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h:
- * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
- * Modules/mediastream/libwebrtc/LibWebRTCUtils.h:
- * Sources.txt:
- * WebCore.xcodeproj/project.pbxproj:
- * bindings/js/WebCoreBuiltinNames.h:
- * dom/EventTargetFactory.in:
-
2021-08-18 David Kilzer <ddkil...@apple.com>
Bug 229264: Leak of CMBufferQueueRef (up to 752 bytes each) in com.apple.WebKit.GPU.Development process
Modified: branches/safari-612-branch/Source/WebCore/DerivedSources-input.xcfilelist (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/DerivedSources-input.xcfilelist 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/DerivedSources-input.xcfilelist 2021-08-19 20:29:59 UTC (rev 281263)
@@ -219,8 +219,6 @@
$(PROJECT_DIR)/Modules/mediastream/RTCDataChannel.idl
$(PROJECT_DIR)/Modules/mediastream/RTCDataChannelEvent.idl
$(PROJECT_DIR)/Modules/mediastream/RTCDegradationPreference.idl
-$(PROJECT_DIR)/Modules/mediastream/RTCDtlsTransport.idl
-$(PROJECT_DIR)/Modules/mediastream/RTCDtlsTransportState.idl
$(PROJECT_DIR)/Modules/mediastream/RTCDtxStatus.idl
$(PROJECT_DIR)/Modules/mediastream/RTCEncodedAudioFrame.idl
$(PROJECT_DIR)/Modules/mediastream/RTCEncodedVideoFrame.idl
@@ -728,13 +726,13 @@
$(PROJECT_DIR)/css/plugIns.css
$(PROJECT_DIR)/css/quirks.css
$(PROJECT_DIR)/css/svg.css
+$(PROJECT_DIR)/css/typedom/StylePropertyMap.idl
+$(PROJECT_DIR)/css/typedom/StylePropertyMapReadOnly.idl
+$(PROJECT_DIR)/css/typedom/CSSStyleImageValue.idl
$(PROJECT_DIR)/css/typedom/CSSNumericValue.idl
-$(PROJECT_DIR)/css/typedom/CSSStyleImageValue.idl
$(PROJECT_DIR)/css/typedom/CSSStyleValue.idl
$(PROJECT_DIR)/css/typedom/CSSUnitValue.idl
$(PROJECT_DIR)/css/typedom/CSSUnparsedValue.idl
-$(PROJECT_DIR)/css/typedom/StylePropertyMap.idl
-$(PROJECT_DIR)/css/typedom/StylePropertyMapReadOnly.idl
$(PROJECT_DIR)/dom/AbortAlgorithm.idl
$(PROJECT_DIR)/dom/AbortController.idl
$(PROJECT_DIR)/dom/AbortSignal.idl
Modified: branches/safari-612-branch/Source/WebCore/DerivedSources-output.xcfilelist (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/DerivedSources-output.xcfilelist 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/DerivedSources-output.xcfilelist 2021-08-19 20:29:59 UTC (rev 281263)
@@ -312,8 +312,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSMediaRule.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNamespaceRule.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNamespaceRule.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNumericValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNumericValue.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSPageRule.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSPageRule.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSPaintCallback.cpp
@@ -328,24 +326,16 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleDeclaration+PropertyNames.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleDeclaration.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleDeclaration.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleImageValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleImageValue.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleRule.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleRule.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleSheet.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleSheet.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleValue.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSSupportsRule.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSSupportsRule.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSTransition.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSTransition.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnitValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnitValue.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnknownRule.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnknownRule.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnparsedValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnparsedValue.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCacheQueryOptions.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCacheQueryOptions.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCanvasCaptureMediaStreamTrack.cpp
@@ -1637,10 +1627,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDataChannelEvent.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDegradationPreference.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDegradationPreference.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDtlsTransport.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDtlsTransport.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDtlsTransportState.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDtlsTransportState.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDtxStatus.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCDtxStatus.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCEncodedAudioFrame.cpp
@@ -2255,6 +2241,16 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTreeWalker.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypeConversions.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypeConversions.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleImageValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleImageValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNumericValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNumericValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnitValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnitValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnparsedValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnparsedValue.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSUIEvent.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSUIEvent.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSUIEventInit.cpp
Modified: branches/safari-612-branch/Source/WebCore/DerivedSources.make (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/DerivedSources.make 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/DerivedSources.make 2021-08-19 20:29:59 UTC (rev 281263)
@@ -245,8 +245,6 @@
$(WebCore)/Modules/mediastream/RTCDataChannel.idl \
$(WebCore)/Modules/mediastream/RTCDataChannelEvent.idl \
$(WebCore)/Modules/mediastream/RTCDegradationPreference.idl \
- $(WebCore)/Modules/mediastream/RTCDtlsTransport.idl \
- $(WebCore)/Modules/mediastream/RTCDtlsTransportState.idl \
$(WebCore)/Modules/mediastream/RTCDtxStatus.idl \
$(WebCore)/Modules/mediastream/RTCEncodedAudioFrame.idl \
$(WebCore)/Modules/mediastream/RTCEncodedVideoFrame.idl \
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -40,7 +40,6 @@
#include "LibWebRTCCertificateGenerator.h"
#include "Logging.h"
#include "Page.h"
-#include "RTCDtlsTransport.h"
#include "RTCIceCandidate.h"
#include "RTCPeerConnection.h"
#include "RTCPeerConnectionIceEvent.h"
@@ -201,7 +200,7 @@
m_peerConnection.doTask([this, promise = WTFMove(m_setDescriptionPromise)]() mutable {
if (m_peerConnection.isClosed())
return;
- m_peerConnection.updateTransceiversAfterSuccessfulLocalDescription();
+
promise->resolve();
});
}
@@ -277,7 +276,6 @@
if (m_peerConnection.isClosed())
return;
- m_peerConnection.updateTransceiversAfterSuccessfulRemoteDescription();
promise->resolve();
});
}
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -50,8 +50,6 @@
class PeerConnectionBackend;
class RTCCertificate;
class RTCDataChannelHandler;
-class RTCDtlsTransport;
-class RTCDtlsTransportBackend;
class RTCIceCandidate;
class RTCPeerConnection;
class RTCRtpReceiver;
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2017 Apple 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "RTCDtlsTransport.h"
-
-#if ENABLE(WEB_RTC)
-
-#include "Blob.h"
-#include "EventNames.h"
-#include "Logging.h"
-#include "NotImplemented.h"
-#include "RTCDtlsTransportBackend.h"
-#include "ScriptExecutionContext.h"
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(RTCDtlsTransport);
-
-RTCDtlsTransport::RTCDtlsTransport(ScriptExecutionContext& context, UniqueRef<RTCDtlsTransportBackend>&& backend)
- : ActiveDOMObject(&context)
- , m_backend(WTFMove(backend))
-{
- suspendIfNeeded();
- m_backend->registerClient(*this);
-}
-
-RTCDtlsTransport::~RTCDtlsTransport()
-{
- m_backend->unregisterClient();
-}
-
-Vector<Ref<JSC::ArrayBuffer>> RTCDtlsTransport::getRemoteCertificates()
-{
- return m_remoteCertificates;
-}
-
-void RTCDtlsTransport::stop()
-{
- m_state = RTCDtlsTransportState::Closed;
-}
-
-bool RTCDtlsTransport::virtualHasPendingActivity() const
-{
- return m_state != RTCDtlsTransportState::Closed && hasEventListeners();
-}
-
-void RTCDtlsTransport::onStateChanged(RTCDtlsTransportState state, Vector<Ref<JSC::ArrayBuffer>>&& certificates)
-{
- queueTaskKeepingObjectAlive(*this, TaskSource::Networking, [this, state, certificates = WTFMove(certificates)]() mutable {
- if (m_state == RTCDtlsTransportState::Closed)
- return;
-
- if (m_remoteCertificates != certificates)
- m_remoteCertificates = WTFMove(certificates);
-
- if (m_state != state) {
- m_state = state;
- dispatchEvent(Event::create(eventNames().statechangeEvent, Event::CanBubble::Yes, Event::IsCancelable::No));
- }
- });
-}
-
-void RTCDtlsTransport::onError()
-{
- onStateChanged(RTCDtlsTransportState::Failed, { });
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2021 Apple 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(WEB_RTC)
-
-#include "ActiveDOMObject.h"
-#include "Event.h"
-#include "EventTarget.h"
-#include "RTCDtlsTransportBackend.h"
-#include <_javascript_Core/ArrayBuffer.h>
-
-namespace WebCore {
-
-class PeerConnectionBackend;
-class RTCPeerConnection;
-class ScriptExecutionContext;
-
-class RTCDtlsTransport final : public RefCounted<RTCDtlsTransport>, public ActiveDOMObject, public EventTargetWithInlineData, public RTCDtlsTransportBackend::Client {
- WTF_MAKE_ISO_ALLOCATED(RTCDtlsTransport);
-public:
- static Ref<RTCDtlsTransport> create(ScriptExecutionContext& context, UniqueRef<RTCDtlsTransportBackend>&& backend) { return adoptRef(*new RTCDtlsTransport(context, WTFMove(backend))); }
- ~RTCDtlsTransport();
-
- using RefCounted<RTCDtlsTransport>::ref;
- using RefCounted<RTCDtlsTransport>::deref;
-
- RTCDtlsTransportState state() { return m_state; }
- Vector<Ref<JSC::ArrayBuffer>> getRemoteCertificates();
-
- const RTCDtlsTransportBackend& backend() const { return m_backend.get(); }
-
-private:
- RTCDtlsTransport(ScriptExecutionContext&, UniqueRef<RTCDtlsTransportBackend>&&);
-
- // EventTargetWithInlineData
- EventTargetInterface eventTargetInterface() const final { return RTCDtlsTransportEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const final { return m_scriptExecutionContext; }
- void refEventTarget() final { ref(); }
- void derefEventTarget() final { deref(); }
-
- // ActiveDOMObject
- void stop() final;
- const char* activeDOMObjectName() const final { return "RTCDtlsTransport"; }
- bool virtualHasPendingActivity() const final;
-
- // RTCDtlsTransportBackend::Client
- void onStateChanged(RTCDtlsTransportState, Vector<Ref<JSC::ArrayBuffer>>&&) final;
- void onError() final;
-
- UniqueRef<RTCDtlsTransportBackend> m_backend;
- RTCDtlsTransportState m_state { RTCDtlsTransportState::New };
- Vector<Ref<JSC::ArrayBuffer>> m_remoteCertificates;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.idl (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.idl 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransport.idl 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 Apple 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- ActiveDOMObject,
- Conditional=WEB_RTC,
- EnabledBySetting=PeerConnection,
- Exposed=(Window),
-] interface RTCDtlsTransport : EventTarget {
- // [SameObject] readonly attribute RTCIceTransport iceTransport;
- readonly attribute RTCDtlsTransportState state;
- sequence<ArrayBuffer> getRemoteCertificates();
- attribute EventHandler onstatechange;
- attribute EventHandler onerror;
-};
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(WEB_RTC)
-
-#include "RTCDtlsTransportState.h"
-#include <wtf/WeakPtr.h>
-
-namespace JSC {
-class ArrayBuffer;
-}
-
-namespace WebCore {
-
-class RTCDtlsTransportBackend {
-public:
- virtual ~RTCDtlsTransportBackend() = default;
-
- virtual const void* backend() const = 0;
-
- class Client : public CanMakeWeakPtr<Client> {
- public:
- virtual ~Client() = default;
- virtual void onStateChanged(RTCDtlsTransportState, Vector<Ref<JSC::ArrayBuffer>>&&) = 0;
- virtual void onError() = 0;
- };
- virtual void registerClient(Client&) = 0;
- virtual void unregisterClient() = 0;
-};
-
-inline bool operator==(const RTCDtlsTransportBackend& a, const RTCDtlsTransportBackend& b)
-{
- return a.backend() == b.backend();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportState.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportState.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportState.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 Apple 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(WEB_RTC)
-
-enum class RTCDtlsTransportState {
- New,
- Connecting,
- Connected,
- Closed,
- Failed
-};
-
-#endif
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportState.idl (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportState.idl 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCDtlsTransportState.idl 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2021 Apple 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- Conditional=WEB_RTC,
- EnabledBySetting=PeerConnection
-] enum RTCDtlsTransportState {
- "new",
- "connecting",
- "connected",
- "closed",
- "failed"
-};
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -51,8 +51,6 @@
#include "RTCConfiguration.h"
#include "RTCController.h"
#include "RTCDataChannel.h"
-#include "RTCDtlsTransport.h"
-#include "RTCDtlsTransportBackend.h"
#include "RTCIceCandidate.h"
#include "RTCIceCandidateInit.h"
#include "RTCOfferOptions.h"
@@ -835,49 +833,6 @@
return downcast<Document>(scriptExecutionContext());
}
-RefPtr<RTCDtlsTransport> RTCPeerConnection::getOrCreateDtlsTransport(std::unique_ptr<RTCDtlsTransportBackend>&& backend)
-{
- if (!backend)
- return nullptr;
-
- auto* context = scriptExecutionContext();
- if (!context)
- return nullptr;
-
- auto index = m_transports.findMatching([&backend](auto& transport) { return *backend == transport->backend(); });
- if (index == notFound) {
- index = m_transports.size();
- m_transports.append(RTCDtlsTransport::create(*context, makeUniqueRefFromNonNullUniquePtr(WTFMove(backend))));
- }
-
- return m_transports[index].copyRef();
-}
-
-void RTCPeerConnection::updateTransceiverTransports()
-{
- for (auto& transceiver : m_transceiverSet->list()) {
- auto& sender = transceiver->sender();
- if (auto* senderBackend = sender.backend())
- sender.setTransport(getOrCreateDtlsTransport(senderBackend->dtlsTransportBackend()));
-
- auto& receiver = transceiver->receiver();
- if (auto* receiverBackend = receiver.backend())
- receiver.setTransport(getOrCreateDtlsTransport(receiverBackend->dtlsTransportBackend()));
- }
-}
-
-// https://w3c.github.io/webrtc-pc/#set-description step 4.9.1
-void RTCPeerConnection::updateTransceiversAfterSuccessfulLocalDescription()
-{
- updateTransceiverTransports();
-}
-
-// https://w3c.github.io/webrtc-pc/#set-description step 4.9.2
-void RTCPeerConnection::updateTransceiversAfterSuccessfulRemoteDescription()
-{
- updateTransceiverTransports();
-}
-
#if !RELEASE_LOG_DISABLED
WTFLogChannel& RTCPeerConnection::logChannel() const
{
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -58,8 +58,6 @@
class MediaStream;
class MediaStreamTrack;
class RTCController;
-class RTCDtlsTransport;
-class RTCDtlsTransportBackend;
class RTCIceCandidate;
class RTCPeerConnectionErrorCallback;
class RTCSessionDescription;
@@ -184,9 +182,6 @@
void doTask(Function<void()>&&);
- void updateTransceiversAfterSuccessfulLocalDescription();
- void updateTransceiversAfterSuccessfulRemoteDescription();
-
#if !RELEASE_LOG_DISABLED
const Logger& logger() const final { return m_logger.get(); }
const void* logIdentifier() const final { return m_logIdentifier; }
@@ -229,9 +224,6 @@
ExceptionOr<Vector<MediaEndpointConfiguration::IceServerInfo>> iceServersFromConfiguration(RTCConfiguration& newConfiguration, const RTCConfiguration* existingConfiguration, bool isLocalDescriptionSet);
- RefPtr<RTCDtlsTransport> getOrCreateDtlsTransport(std::unique_ptr<RTCDtlsTransportBackend>&&);
- void updateTransceiverTransports();
-
bool m_isStopped { false };
RTCSignalingState m_signalingState { RTCSignalingState::Stable };
RTCIceGatheringState m_iceGatheringState { RTCIceGatheringState::New };
@@ -255,7 +247,6 @@
Deque<std::pair<Ref<DeferredPromise>, Function<void(Ref<DeferredPromise>&&)>>> m_operations;
bool m_hasPendingOperation { false };
bool m_shouldFireNegotiationNeededOnceOperationChainIsEmpty { false };
- Vector<Ref<RTCDtlsTransport>> m_transports;
};
} // namespace WebCore
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -33,7 +33,6 @@
#if ENABLE(WEB_RTC)
#include "MediaStreamTrack.h"
-#include "RTCDtlsTransport.h"
#include "RTCRtpReceiverBackend.h"
#include "RTCRtpSynchronizationSource.h"
#include "RTCRtpTransform.h"
@@ -70,9 +69,6 @@
MediaStreamTrack& track() { return m_track.get(); }
- RTCDtlsTransport* transport() { return m_transport.get(); }
- void setTransport(RefPtr<RTCDtlsTransport>&& transport) { m_transport = WTFMove(transport); }
-
RTCRtpReceiverBackend* backend() { return m_backend.get(); }
void getStats(Ref<DeferredPromise>&&);
@@ -90,7 +86,6 @@
#endif
Ref<MediaStreamTrack> m_track;
- RefPtr<RTCDtlsTransport> m_transport;
std::unique_ptr<RTCRtpReceiverBackend> m_backend;
WeakPtr<PeerConnectionBackend> m_connection;
std::unique_ptr<RTCRtpTransform> m_transform;
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl 2021-08-19 20:29:59 UTC (rev 281263)
@@ -35,8 +35,8 @@
Exposed=Window
] interface RTCRtpReceiver {
readonly attribute MediaStreamTrack track;
- readonly attribute RTCDtlsTransport? transport;
-
+ // FIXME 169662: missing transport
+ // FIXME 169662: missing rtcpTransport
[CallWith=ScriptExecutionContext] static RTCRtpCapabilities? getCapabilities(DOMString kind);
RTCRtpParameters getParameters();
sequence<RTCRtpContributingSource> getContributingSources();
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiverBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiverBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpReceiverBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -31,7 +31,6 @@
namespace WebCore {
-class RTCDtlsTransportBackend;
class RTCRtpTransformBackend;
class RTCRtpReceiverBackend {
@@ -41,7 +40,6 @@
virtual Vector<RTCRtpContributingSource> getContributingSources() const { return { }; }
virtual Vector<RTCRtpSynchronizationSource> getSynchronizationSources() const { return { }; }
virtual Ref<RTCRtpTransformBackend> rtcRtpTransformBackend() = 0;
- virtual std::unique_ptr<RTCDtlsTransportBackend> dtlsTransportBackend() = 0;
};
} // namespace WebCore
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSender.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -34,7 +34,6 @@
#include "JSDOMPromiseDeferred.h"
#include "MediaStreamTrack.h"
-#include "RTCDtlsTransport.h"
#include "RTCRtpSenderBackend.h"
#include "RTCRtpTransceiverDirection.h"
#include "RTCRtpTransform.h"
@@ -65,9 +64,6 @@
MediaStreamTrack* track() { return m_track.get(); }
- RTCDtlsTransport* transport() { return m_transport.get(); }
- void setTransport(RefPtr<RTCDtlsTransport>&& transport) { m_transport = WTFMove(transport); }
-
const String& trackId() const { return m_trackId; }
const String& trackKind() const { return m_trackKind; }
@@ -107,7 +103,6 @@
#endif
RefPtr<MediaStreamTrack> m_track;
- RefPtr<RTCDtlsTransport> m_transport;
String m_trackId;
String m_trackKind;
std::unique_ptr<RTCRtpSenderBackend> m_backend;
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSender.idl (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2021-08-19 20:29:59 UTC (rev 281263)
@@ -35,8 +35,7 @@
Exposed=Window
] interface RTCRtpSender {
readonly attribute MediaStreamTrack? track;
- readonly attribute RTCDtlsTransport? transport;
-
+ // FIXME 169662: readonly attribute RTCDtlsTransport? transport;
[CallWith=ScriptExecutionContext] static RTCRtpCapabilities? getCapabilities(DOMString kind);
RTCRtpSendParameters getParameters();
Promise<undefined> setParameters(RTCRtpSendParameters parameters);
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -33,7 +33,6 @@
class MediaStreamTrack;
class RTCDTMFSenderBackend;
-class RTCDtlsTransportBackend;
class RTCRtpSender;
class RTCRtpTransformBackend;
class ScriptExecutionContext;
@@ -52,7 +51,6 @@
virtual std::unique_ptr<RTCDTMFSenderBackend> createDTMFBackend() = 0;
virtual Ref<RTCRtpTransformBackend> rtcRtpTransformBackend() = 0;
virtual void setMediaStreamIds(const Vector<String>&) = 0;
- virtual std::unique_ptr<RTCDtlsTransportBackend> dtlsTransportBackend() = 0;
};
} // namespace WebCore
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "LibWebRTCDtlsTransportBackend.h"
-
-#if ENABLE(WEB_RTC) && USE(LIBWEBRTC)
-
-#include <webrtc/api/dtls_transport_interface.h>
-
-namespace WebCore {
-
-static inline RTCDtlsTransportState toRTCDtlsTransportState(webrtc::DtlsTransportState state)
-{
- switch (state) {
- case webrtc::DtlsTransportState::kNew:
- return RTCDtlsTransportState::New;
- case webrtc::DtlsTransportState::kConnecting:
- return RTCDtlsTransportState::Connecting;
- case webrtc::DtlsTransportState::kConnected:
- return RTCDtlsTransportState::Connected;
- case webrtc::DtlsTransportState::kClosed:
- return RTCDtlsTransportState::Closed;
- case webrtc::DtlsTransportState::kFailed:
- return RTCDtlsTransportState::Failed;
- case webrtc::DtlsTransportState::kNumValues:
- ASSERT_NOT_REACHED();
- return RTCDtlsTransportState::Failed;
- }
-
- RELEASE_ASSERT_NOT_REACHED();
-}
-
-class LibWebRTCDtlsTransportBackendObserver final : public ThreadSafeRefCounted<LibWebRTCDtlsTransportBackendObserver>, public webrtc::DtlsTransportObserverInterface {
-public:
- static Ref<LibWebRTCDtlsTransportBackendObserver> create(RTCDtlsTransportBackend::Client& client, rtc::scoped_refptr<webrtc::DtlsTransportInterface>& backend) { return adoptRef(*new LibWebRTCDtlsTransportBackendObserver(client, backend)); }
-
- void start();
- void stop();
-
-private:
- LibWebRTCDtlsTransportBackendObserver(RTCDtlsTransportBackend::Client&, rtc::scoped_refptr<webrtc::DtlsTransportInterface>&);
-
- void OnStateChange(webrtc::DtlsTransportInformation) final;
- void OnError(webrtc::RTCError) final;
-
- void updateState(webrtc::DtlsTransportInformation&&);
-
- rtc::scoped_refptr<webrtc::DtlsTransportInterface> m_backend;
- WeakPtr<RTCDtlsTransportBackend::Client> m_client;
-};
-
-LibWebRTCDtlsTransportBackendObserver::LibWebRTCDtlsTransportBackendObserver(RTCDtlsTransportBackend::Client& client, rtc::scoped_refptr<webrtc::DtlsTransportInterface>& backend)
- : m_backend(backend)
- , m_client(makeWeakPtr(client))
-{
- ASSERT(m_backend);
-}
-
-void LibWebRTCDtlsTransportBackendObserver::updateState(webrtc::DtlsTransportInformation&& info)
-{
- if (!m_client)
- return;
-
- Vector<rtc::Buffer> certificates;
- if (auto* remoteCertificates = info.remote_ssl_certificates()) {
- for (size_t i = 0; i < remoteCertificates->GetSize(); ++i) {
- rtc::Buffer certificate;
- remoteCertificates->Get(i).ToDER(&certificate);
- certificates.append(WTFMove(certificate));
- }
- }
- m_client->onStateChanged(toRTCDtlsTransportState(info.state()), map(certificates, [](auto& certificate) -> Ref<JSC::ArrayBuffer> {
- return JSC::ArrayBuffer::create(certificate.data(), certificate.size());
- }));
-}
-
-void LibWebRTCDtlsTransportBackendObserver::start()
-{
- LibWebRTCProvider::callOnWebRTCNetworkThread([this, protectedThis = makeRef(*this)]() mutable {
- m_backend->RegisterObserver(this);
- callOnMainThread([protectedThis = WTFMove(protectedThis), info = m_backend->Information()]() mutable {
- protectedThis->updateState(WTFMove(info));
- });
- });
-}
-
-void LibWebRTCDtlsTransportBackendObserver::stop()
-{
- m_client = nullptr;
- LibWebRTCProvider::callOnWebRTCNetworkThread([protectedThis = makeRef(*this)] {
- protectedThis->m_backend->UnregisterObserver();
- });
-}
-
-void LibWebRTCDtlsTransportBackendObserver::OnStateChange(webrtc::DtlsTransportInformation info)
-{
- callOnMainThread([protectedThis = makeRef(*this), info = WTFMove(info)]() mutable {
- protectedThis->updateState(WTFMove(info));
- });
-}
-
-void LibWebRTCDtlsTransportBackendObserver::OnError(webrtc::RTCError)
-{
- callOnMainThread([protectedThis = makeRef(*this)] {
- if (protectedThis->m_client)
- protectedThis->m_client->onError();
- });
-}
-
-
-LibWebRTCDtlsTransportBackend::LibWebRTCDtlsTransportBackend(rtc::scoped_refptr<webrtc::DtlsTransportInterface>&& backend)
- : m_backend(WTFMove(backend))
-{
- ASSERT(m_backend);
-}
-
-LibWebRTCDtlsTransportBackend::~LibWebRTCDtlsTransportBackend()
-{
- if (m_observer)
- m_observer->stop();
-}
-
-void LibWebRTCDtlsTransportBackend::registerClient(Client& client)
-{
- ASSERT(!m_observer);
- m_observer = LibWebRTCDtlsTransportBackendObserver::create(client, m_backend);
- m_observer->start();
-}
-
-void LibWebRTCDtlsTransportBackend::unregisterClient()
-{
- ASSERT(m_observer);
- m_observer->stop();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC) && USE(LIBWEBRTC)
Deleted: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(WEB_RTC)
-
-#include "LibWebRTCMacros.h"
-#include "RTCDtlsTransportBackend.h"
-#include <wtf/WeakPtr.h>
-
-ALLOW_UNUSED_PARAMETERS_BEGIN
-
-#include <webrtc/api/scoped_refptr.h>
-
-ALLOW_UNUSED_PARAMETERS_END
-
-namespace webrtc {
-class DtlsTransportInterface;
-}
-
-namespace WebCore {
-class LibWebRTCDtlsTransportBackendObserver;
-class LibWebRTCDtlsTransportBackend final : public RTCDtlsTransportBackend, public CanMakeWeakPtr<LibWebRTCDtlsTransportBackend> {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- explicit LibWebRTCDtlsTransportBackend(rtc::scoped_refptr<webrtc::DtlsTransportInterface>&&);
- ~LibWebRTCDtlsTransportBackend();
-
-private:
- // RTCDtlsTransportBackend
- const void* backend() const final { return m_backend.get(); }
- void registerClient(Client&) final;
- void unregisterClient() final;
-
- rtc::scoped_refptr<webrtc::DtlsTransportInterface> m_backend;
- RefPtr<LibWebRTCDtlsTransportBackendObserver> m_observer;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -25,7 +25,6 @@
#include "config.h"
#include "LibWebRTCRtpReceiverBackend.h"
-#include "LibWebRTCDtlsTransportBackend.h"
#include "LibWebRTCRtpReceiverTransformBackend.h"
#include "LibWebRTCUtils.h"
#include "RTCRtpTransformBackend.h"
@@ -125,12 +124,6 @@
return *m_transformBackend;
}
-std::unique_ptr<RTCDtlsTransportBackend> LibWebRTCRtpReceiverBackend::dtlsTransportBackend()
-{
- auto backend = m_rtcReceiver->dtls_transport();
- return backend ? makeUnique<LibWebRTCDtlsTransportBackend>(WTFMove(backend)) : nullptr;
-}
-
} // namespace WebCore
#endif // ENABLE(WEB_RTC) && USE(LIBWEBRTC)
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -53,7 +53,6 @@
Vector<RTCRtpContributingSource> getContributingSources() const final;
Vector<RTCRtpSynchronizationSource> getSynchronizationSources() const final;
Ref<RTCRtpTransformBackend> rtcRtpTransformBackend() final;
- std::unique_ptr<RTCDtlsTransportBackend> dtlsTransportBackend() final;
rtc::scoped_refptr<webrtc::RtpReceiverInterface> m_rtcReceiver;
RefPtr<RTCRtpTransformBackend> m_transformBackend;
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -29,7 +29,6 @@
#include "JSDOMPromiseDeferred.h"
#include "LibWebRTCDTMFSenderBackend.h"
-#include "LibWebRTCDtlsTransportBackend.h"
#include "LibWebRTCPeerConnectionBackend.h"
#include "LibWebRTCRtpSenderTransformBackend.h"
#include "LibWebRTCUtils.h"
@@ -168,12 +167,6 @@
return *m_transformBackend;
}
-std::unique_ptr<RTCDtlsTransportBackend> LibWebRTCRtpSenderBackend::dtlsTransportBackend()
-{
- auto backend = m_rtcSender->dtls_transport();
- return backend ? makeUnique<LibWebRTCDtlsTransportBackend>(WTFMove(backend)) : nullptr;
-}
-
void LibWebRTCRtpSenderBackend::setMediaStreamIds(const Vector<String>& streamIds)
{
std::vector<std::string> ids;
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -66,7 +66,6 @@
void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&) final;
std::unique_ptr<RTCDTMFSenderBackend> createDTMFBackend() final;
Ref<RTCRtpTransformBackend> rtcRtpTransformBackend() final;
- std::unique_ptr<RTCDtlsTransportBackend> dtlsTransportBackend() final;
void setMediaStreamIds(const Vector<String>&) final;
void startSource();
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp 2021-08-19 20:29:59 UTC (rev 281263)
@@ -28,7 +28,6 @@
#if USE(LIBWEBRTC)
#include "LibWebRTCMacros.h"
-#include "RTCDtlsTransportState.h"
#include "RTCIceCandidate.h"
#include "RTCPeerConnection.h"
#include "RTCRtpSendParameters.h"
Modified: branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -36,7 +36,6 @@
class RTCError;
-enum class DtlsTransportState;
enum class Priority;
enum class RTCErrorType;
enum class RtpTransceiverDirection;
@@ -68,6 +67,7 @@
RTCPriorityType toRTCPriorityType(webrtc::Priority);
webrtc::Priority fromRTCPriorityType(RTCPriorityType);
+
inline String fromStdString(const std::string& value)
{
return String::fromUTF8(value.data(), value.length());
Modified: branches/safari-612-branch/Source/WebCore/Sources.txt (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/Sources.txt 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/Sources.txt 2021-08-19 20:29:59 UTC (rev 281263)
@@ -161,7 +161,6 @@
Modules/mediastream/RTCDataChannelEvent.cpp
Modules/mediastream/RTCDataChannelRemoteHandler.cpp
Modules/mediastream/RTCDataChannelRemoteSource.cpp
-Modules/mediastream/RTCDtlsTransport.cpp
Modules/mediastream/RTCEncodedAudioFrame.cpp
Modules/mediastream/RTCEncodedFrame.cpp
Modules/mediastream/RTCEncodedVideoFrame.cpp
@@ -187,7 +186,6 @@
Modules/mediastream/UserMediaController.cpp
Modules/mediastream/UserMediaRequest.cpp
Modules/mediastream/libwebrtc/LibWebRTCCertificateGenerator.cpp
-Modules/mediastream/libwebrtc/LibWebRTCDtlsTransportBackend.cpp
Modules/mediastream/libwebrtc/LibWebRTCRtpReceiverTransformBackend.cpp
Modules/mediastream/libwebrtc/LibWebRTCRtpSenderTransformBackend.cpp
Modules/mediastream/libwebrtc/LibWebRTCRtpTransformBackend.cpp
@@ -3297,8 +3295,6 @@
JSRTCDataChannelEvent.cpp
JSRTCDegradationPreference.cpp
JSRTCDtxStatus.cpp
-JSRTCDtlsTransport.cpp
-JSRTCDtlsTransportState.cpp
JSRTCEncodedAudioFrame.cpp
JSRTCEncodedVideoFrame.cpp
JSRTCIceCandidate.cpp
Modified: branches/safari-612-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-08-19 20:29:59 UTC (rev 281263)
@@ -1143,8 +1143,6 @@
4186BD40213EE3450001826F /* LibWebRTCRtpReceiverBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D1A04A213EDDFE0063FB6B /* LibWebRTCRtpReceiverBackend.cpp */; };
4186BD4E2140B9E80001826F /* LibWebRTCRtpTransceiverBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4186BD4D2140B9E80001826F /* LibWebRTCRtpTransceiverBackend.cpp */; };
41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */ = {isa = PBXBuildFile; fileRef = 41885B9111B6FDA6003383BB /* FormSubmission.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 4188D55C26C54D6F004858C8 /* RTCDtlsTransportBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 4188D55A26C54D6F004858C8 /* RTCDtlsTransportBackend.h */; };
- 4188D56326C551B1004858C8 /* RTCDtlsTransportState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4188D56226C551B1004858C8 /* RTCDtlsTransportState.h */; };
418938B22429F9B4007FDC41 /* RetrieveRecordsOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 418938AF2429F9AB007FDC41 /* RetrieveRecordsOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
418A06D0133C04D500CD379C /* EventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 418A06CE133C04D500CD379C /* EventDispatcher.h */; };
418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 418F88030FF957AE0080F045 /* JSAbstractWorker.h */; };
@@ -7929,14 +7927,6 @@
418807E124E458C300DDAF94 /* AbortAlgorithm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AbortAlgorithm.h; sourceTree = "<group>"; };
41885B9111B6FDA6003383BB /* FormSubmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSubmission.h; sourceTree = "<group>"; };
41885B9211B6FDA6003383BB /* FormSubmission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormSubmission.cpp; sourceTree = "<group>"; };
- 4188D55A26C54D6F004858C8 /* RTCDtlsTransportBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDtlsTransportBackend.h; sourceTree = "<group>"; };
- 4188D55D26C5511A004858C8 /* RTCDtlsTransport.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCDtlsTransport.idl; sourceTree = "<group>"; };
- 4188D55E26C5511A004858C8 /* RTCDtlsTransport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCDtlsTransport.h; sourceTree = "<group>"; };
- 4188D55F26C5511A004858C8 /* RTCDtlsTransport.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDtlsTransport.cpp; sourceTree = "<group>"; };
- 4188D56026C55166004858C8 /* RTCDtlsTransportState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCDtlsTransportState.idl; sourceTree = "<group>"; };
- 4188D56226C551B1004858C8 /* RTCDtlsTransportState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDtlsTransportState.h; sourceTree = "<group>"; };
- 4188D56426C5530B004858C8 /* LibWebRTCDtlsTransportBackend.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCDtlsTransportBackend.cpp; path = libwebrtc/LibWebRTCDtlsTransportBackend.cpp; sourceTree = "<group>"; };
- 4188D56526C5530B004858C8 /* LibWebRTCDtlsTransportBackend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LibWebRTCDtlsTransportBackend.h; path = libwebrtc/LibWebRTCDtlsTransportBackend.h; sourceTree = "<group>"; };
418938AF2429F9AB007FDC41 /* RetrieveRecordsOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RetrieveRecordsOptions.h; sourceTree = "<group>"; };
418A06CE133C04D500CD379C /* EventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatcher.h; sourceTree = "<group>"; };
418A06CF133C04D500CD379C /* EventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatcher.cpp; sourceTree = "<group>"; };
@@ -17156,12 +17146,6 @@
416EDBEF25FFB22400092675 /* RTCDataChannelRemoteSource.h */,
41FCB75D214866FE0038ADC6 /* RTCDegradationPreference.h */,
41FCB755214865CF0038ADC6 /* RTCDegradationPreference.idl */,
- 4188D55F26C5511A004858C8 /* RTCDtlsTransport.cpp */,
- 4188D55E26C5511A004858C8 /* RTCDtlsTransport.h */,
- 4188D55D26C5511A004858C8 /* RTCDtlsTransport.idl */,
- 4188D55A26C54D6F004858C8 /* RTCDtlsTransportBackend.h */,
- 4188D56226C551B1004858C8 /* RTCDtlsTransportState.h */,
- 4188D56026C55166004858C8 /* RTCDtlsTransportState.idl */,
07221B6917CEC32700848E51 /* RTCDTMFSender.cpp */,
07221B6A17CEC32700848E51 /* RTCDTMFSender.h */,
07221B6B17CEC32700848E51 /* RTCDTMFSender.idl */,
@@ -19304,8 +19288,6 @@
41209E95216EC34E00A73A12 /* LibWebRTCCertificateGenerator.h */,
5CDD833F1E43253D00621E92 /* LibWebRTCDataChannelHandler.cpp */,
5CDD83401E43253D00621E92 /* LibWebRTCDataChannelHandler.h */,
- 4188D56426C5530B004858C8 /* LibWebRTCDtlsTransportBackend.cpp */,
- 4188D56526C5530B004858C8 /* LibWebRTCDtlsTransportBackend.h */,
417612AB1E3A993B00C3D81D /* LibWebRTCMediaEndpoint.cpp */,
417612AC1E3A993B00C3D81D /* LibWebRTCMediaEndpoint.h */,
415A3B732138E264001B4BAA /* LibWebRTCObservers.h */,
@@ -34336,8 +34318,6 @@
411223BE26025BC100B0A0B6 /* RTCDataChannelRemoteSource.h in Headers */,
416EDC042600E81000092675 /* RTCDataChannelRemoteSourceConnection.h in Headers */,
316DE7021E83AE1D0084C261 /* RTCDataChannelState.h in Headers */,
- 4188D55C26C54D6F004858C8 /* RTCDtlsTransportBackend.h in Headers */,
- 4188D56326C551B1004858C8 /* RTCDtlsTransportState.h in Headers */,
078E092017D14D1C00420AA1 /* RTCDTMFSender.h in Headers */,
078E092117D14D1C00420AA1 /* RTCDTMFToneChangeEvent.h in Headers */,
078E092317D14D1C00420AA1 /* RTCIceCandidate.h in Headers */,
Modified: branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2021-08-19 20:29:59 UTC (rev 281263)
@@ -191,7 +191,6 @@
macro(RTCDTMFToneChangeEvent) \
macro(RTCDataChannel) \
macro(RTCDataChannelEvent) \
- macro(RTCDtlsTransport) \
macro(RTCEncodedAudioFrame) \
macro(RTCEncodedVideoFrame) \
macro(RTCIceCandidate) \
Modified: branches/safari-612-branch/Source/WebCore/dom/EventTargetFactory.in (281262 => 281263)
--- branches/safari-612-branch/Source/WebCore/dom/EventTargetFactory.in 2021-08-19 20:29:50 UTC (rev 281262)
+++ branches/safari-612-branch/Source/WebCore/dom/EventTargetFactory.in 2021-08-19 20:29:59 UTC (rev 281263)
@@ -38,7 +38,6 @@
PictureInPictureWindow conditional=PICTURE_IN_PICTURE_API
RemotePlayback conditional=WIRELESS_PLAYBACK_TARGET
RTCDataChannel conditional=WEB_RTC
-RTCDtlsTransport conditional=WEB_RTC
RTCDTMFSender conditional=WEB_RTC
RTCPeerConnection conditional=WEB_RTC
RTCRtpSFrameTransform conditional=WEB_RTC
