Title: [267401] trunk
- Revision
- 267401
- Author
- [email protected]
- Date
- 2020-09-22 01:03:38 -0700 (Tue, 22 Sep 2020)
Log Message
toRTCIceProtocol should handle ssltcp candidates
https://bugs.webkit.org/show_bug.cgi?id=216762
Reviewed by Darin Adler.
Source/WebCore:
Covered by mock WebRTC backend pushing ssltcp candidates.
* Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
(WebCore::toRTCIceProtocol):
* testing/MockLibWebRTCPeerConnection.cpp:
LayoutTests:
* fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (267400 => 267401)
--- trunk/LayoutTests/ChangeLog 2020-09-22 06:58:00 UTC (rev 267400)
+++ trunk/LayoutTests/ChangeLog 2020-09-22 08:03:38 UTC (rev 267401)
@@ -1,3 +1,12 @@
+2020-09-22 Youenn Fablet <[email protected]>
+
+ toRTCIceProtocol should handle ssltcp candidates
+ https://bugs.webkit.org/show_bug.cgi?id=216762
+
+ Reviewed by Darin Adler.
+
+ * fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt:
+
2020-09-21 Diego Pino Garcia <[email protected]>
[GLIB] Unreviewed test gardening. Update baselines after r267389.
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt (267400 => 267401)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt 2020-09-22 06:58:00 UTC (rev 267400)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt 2020-09-22 08:03:38 UTC (rev 267401)
@@ -19,6 +19,11 @@
PASS candidate instanceof RTCIceCandidate is true
PASS candidate.sdpMLineIndex is 0
FAIL candidate.sdpMid should be null (of type object). Was 1 (of type string).
+PASS candidate.candidate: candidate:1019216384 1 ssltcp 1019216385 192.168.0.100 49888 typ host generation 0
+PASS Got candidate
+PASS candidate instanceof RTCIceCandidate is true
+PASS candidate.sdpMLineIndex is 0
+FAIL candidate.sdpMid should be null (of type object). Was 1 (of type string).
PASS candidate.candidate: candidate:1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 192.168.0.100 rport 47989 generation 0
PASS Got end of candidates
PASS candidate is null
Modified: trunk/Source/WebCore/ChangeLog (267400 => 267401)
--- trunk/Source/WebCore/ChangeLog 2020-09-22 06:58:00 UTC (rev 267400)
+++ trunk/Source/WebCore/ChangeLog 2020-09-22 08:03:38 UTC (rev 267401)
@@ -1,3 +1,16 @@
+2020-09-22 Youenn Fablet <[email protected]>
+
+ toRTCIceProtocol should handle ssltcp candidates
+ https://bugs.webkit.org/show_bug.cgi?id=216762
+
+ Reviewed by Darin Adler.
+
+ Covered by mock WebRTC backend pushing ssltcp candidates.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
+ (WebCore::toRTCIceProtocol):
+ * testing/MockLibWebRTCPeerConnection.cpp:
+
2020-09-21 Adrian Perez de Castro <[email protected]>
[GTK] Bump cairo version to support HiDPI
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp (267400 => 267401)
--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp 2020-09-22 06:58:00 UTC (rev 267400)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp 2020-09-22 08:03:38 UTC (rev 267401)
@@ -266,7 +266,7 @@
return { };
if (protocol == "udp")
return RTCIceProtocol::Udp;
- ASSERT(protocol == "tcp");
+ ASSERT(protocol == "tcp" || protocol == "ssltcp");
return RTCIceProtocol::Tcp;
}
Modified: trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp (267400 => 267401)
--- trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2020-09-22 06:58:00 UTC (rev 267400)
+++ trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2020-09-22 08:03:38 UTC (rev 267401)
@@ -128,6 +128,8 @@
LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
MockLibWebRTCIceCandidate candidate("candidate:1019216383 1 tcp 1019216384 192.168.0.100 9 typ host tcptype passive generation 0", "1");
m_observer.OnIceCandidate(&candidate);
+ MockLibWebRTCIceCandidate candidateSSLTcp("candidate:1019216384 1 ssltcp 1019216385 192.168.0.100 49888 typ host generation 0", "1");
+ m_observer.OnIceCandidate(&candidateSSLTcp);
});
LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
