Diff
Modified: trunk/LayoutTests/ChangeLog (284448 => 284449)
--- trunk/LayoutTests/ChangeLog 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/LayoutTests/ChangeLog 2021-10-19 14:17:27 UTC (rev 284449)
@@ -1,3 +1,15 @@
+2021-10-19 Youenn Fablet <you...@apple.com>
+
+ [ wk2 ] 2 page-cache layout-tests are flakey crashing
+ https://bugs.webkit.org/show_bug.cgi?id=224558
+ <rdar://problem/76652825>
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt: Rebasing after mock changes.
+ * platform/mac-wk2/TestExpectations:
+ * webrtc/peerconnection-new-candidate-page-cache.html:
+
2021-10-19 Martin Robinson <mrobin...@igalia.com>
[css-scroll-snap] Triggering a layout during scroll causes jittery scrolling on iOS
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt (284448 => 284449)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt 2021-10-19 14:17:27 UTC (rev 284449)
@@ -9,22 +9,22 @@
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:2013266431 1 udp 2013266432 192.168.0.100 38838 typ host generation 0
+PASS candidate.candidate: candidate:2013266431 1 udp 2013266432 e7588693-48a3-434d-a5e3-64159095e03b.local 38838 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:1019216383 1 tcp 1019216384 192.168.0.100 9 typ host tcptype passive generation 0
+PASS candidate.candidate: candidate:1019216383 1 tcp 1019216384 d7588693-48a3-434d-a5e3-64159095e03b.local 9 typ host tcptype passive 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:1019216384 1 ssltcp 1019216385 192.168.0.100 49888 typ host generation 0
+PASS candidate.candidate: candidate:1019216384 1 ssltcp 1019216385 c7588693-48a3-434d-a5e3-64159095e03b.local 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 candidate.candidate: candidate:1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 0.0.0.0 rport 0 generation 0
PASS Got end of candidates
PASS candidate is null
PASS successfullyParsed is true
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (284448 => 284449)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2021-10-19 14:17:27 UTC (rev 284449)
@@ -1422,10 +1422,6 @@
webkit.org/b/224463 [ BigSur arm64 ] webrtc/disable-encryption.html [ Pass Timeout ]
-# webkit.org/b/224558 The following two page-cache tests are flakey crasing:
-webrtc/peerconnection-new-candidate-page-cache.html [ Pass Crash ]
-http/tests/navigation/page-cache-mediastream.html [ Pass Crash ]
-
webkit.org/b/224633 media/presentationmodechanged-fired-once.html [ Pass Timeout ]
webkit.org/b/224690 compositing/video/video-border-radius-clipping.html [ Pass ImageOnlyFailure ]
Modified: trunk/LayoutTests/webrtc/peerconnection-new-candidate-page-cache.html (284448 => 284449)
--- trunk/LayoutTests/webrtc/peerconnection-new-candidate-page-cache.html 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/LayoutTests/webrtc/peerconnection-new-candidate-page-cache.html 2021-10-19 14:17:27 UTC (rev 284449)
@@ -9,7 +9,7 @@
t = async_test();
if (window.internals) {
- internals.useMockRTCPeerConnectionFactory("ICECandidatesWithDelay");
+ internals.useMockRTCPeerConnectionFactory("MDNSICECandidatesWithDelay");
internals.setICECandidateFiltering(true);
}
Modified: trunk/Source/WebCore/ChangeLog (284448 => 284449)
--- trunk/Source/WebCore/ChangeLog 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/Source/WebCore/ChangeLog 2021-10-19 14:17:27 UTC (rev 284449)
@@ -1,3 +1,18 @@
+2021-10-19 Youenn Fablet <you...@apple.com>
+
+ [ wk2 ] 2 page-cache layout-tests are flakey crashing
+ https://bugs.webkit.org/show_bug.cgi?id=224558
+ <rdar://problem/76652825>
+
+ Reviewed by Eric Carlson.
+
+ Covered by updated test.
+
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ srflx candidates can be exposed even in case of filtering enabled.
+ * testing/MockLibWebRTCPeerConnection.cpp:
+ Backend should now handle the mDNS filtering itself.
+
2021-10-19 Rob Buis <rb...@igalia.com>
Remove support for some SVG properties
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (284448 => 284449)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2021-10-19 14:17:27 UTC (rev 284449)
@@ -372,7 +372,7 @@
ALWAYS_LOG(logSiteIdentifier, "Gathered ice candidate:", sdp);
m_finishedGatheringCandidates = false;
- ASSERT(!m_shouldFilterICECandidates || sdp.contains(".local"));
+ ASSERT(!m_shouldFilterICECandidates || sdp.contains(".local") || sdp.contains(" srflx "));
auto candidate = RTCIceCandidate::create(WTFMove(sdp), WTFMove(mid), sdpMLineIndex);
m_peerConnection.dispatchEvent(RTCPeerConnectionIceEvent::create(Event::CanBubble::No, Event::IsCancelable::No, WTFMove(candidate), WTFMove(serverURL)));
});
Modified: trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp (284448 => 284449)
--- trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2021-10-19 13:46:40 UTC (rev 284448)
+++ trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2021-10-19 14:17:27 UTC (rev 284449)
@@ -121,19 +121,19 @@
// Let's gather candidates
LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
- MockLibWebRTCIceCandidate candidate("candidate:2013266431 1 udp 2013266432 192.168.0.100 38838 typ host generation 0", "1");
+ MockLibWebRTCIceCandidate candidate("candidate:2013266431 1 udp 2013266432 e7588693-48a3-434d-a5e3-64159095e03b.local 38838 typ host generation 0", "1");
m_observer.OnIceCandidate(&candidate);
});
LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
- MockLibWebRTCIceCandidate candidate("candidate:1019216383 1 tcp 1019216384 192.168.0.100 9 typ host tcptype passive generation 0", "1");
+ MockLibWebRTCIceCandidate candidate("candidate:1019216383 1 tcp 1019216384 d7588693-48a3-434d-a5e3-64159095e03b.local 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");
+ MockLibWebRTCIceCandidate candidateSSLTcp("candidate:1019216384 1 ssltcp 1019216385 c7588693-48a3-434d-a5e3-64159095e03b.local 49888 typ host generation 0", "1");
m_observer.OnIceCandidate(&candidateSSLTcp);
});
LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
- MockLibWebRTCIceCandidate candidate("candidate:1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 192.168.0.100 rport 47989 generation 0", "1");
+ MockLibWebRTCIceCandidate candidate("candidate:1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 0.0.0.0 rport 0 generation 0", "1");
m_observer.OnIceCandidate(&candidate);
});
@@ -221,7 +221,7 @@
if (testCase == "ICECandidates")
return new rtc::RefCountedObject<MockLibWebRTCPeerConnectionForIceCandidates>(observer);
- if (testCase == "ICECandidatesWithDelay")
+ if (testCase == "MDNSICECandidatesWithDelay")
return new rtc::RefCountedObject<MockLibWebRTCPeerConnectionForIceCandidates>(observer, 1000);
if (testCase == "ICEConnectionState")
