<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283307] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283307">283307</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2021-09-30 04:20:49 -0700 (Thu, 30 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Layout Test imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=203256
<rdar://problem/56506063>

Reviewed by Eric Carlson.

Source/WebCore:

Test was flaky for a few reasons:
- Setting local/remote descriptions may change the ICE transports in use so we need to update the ice connection state when setting local/remote descriptions.
- We start observing ICE transport backend state asynchronously and we might miss the checking state which can happen very quickly. Synthesize it if needed.
- We were using the ICE connection state value from the backend as well as computing it from our RTCIceTransport objects. We now fully compute it from RTCIceTransport objects.
  This ensures we have consistent state between RTCIceTransport and RTCPeerConnection objects with regards to ICE state.

Covered by no longer flaky test.

* Modules/mediastream/PeerConnectionBackend.cpp:
(WebCore::PeerConnectionBackend::setLocalDescriptionSucceeded):
(WebCore::PeerConnectionBackend::setRemoteDescriptionSucceeded):
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::updateIceGatheringState):
(WebCore::RTCPeerConnection::updateIceConnectionState):
(WebCore::RTCPeerConnection::computeIceConnectionStateFromIceTransports):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/libwebrtc/LibWebRTCIceTransportBackend.cpp:
(WebCore::LibWebRTCIceTransportBackendObserver::start):

LayoutTests:

* TestExpectations:
Mark webrtc/connection-state.html as flaky as it is probably too restrictive and should be reworked.
* platform/mac-wk2/TestExpectations:
Unflake test.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCIceTransportBackendcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCIceTransportBackend.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/LayoutTests/ChangeLog 2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-09-30  Youenn Fablet  <youenn@apple.com>
+
+        Layout Test imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=203256
+        <rdar://problem/56506063>
+
+        Reviewed by Eric Carlson.
+
+        * TestExpectations:
+        Mark webrtc/connection-state.html as flaky as it is probably too restrictive and should be reworked.
+        * platform/mac-wk2/TestExpectations:
+        Unflake test.
+
</ins><span class="cx"> 2021-09-29  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Import WPT push api tests
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/LayoutTests/TestExpectations  2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -2073,6 +2073,8 @@
</span><span class="cx"> webrtc/h264-baseline.html [ Slow ]
</span><span class="cx"> webrtc/h264-high.html [ Slow ]
</span><span class="cx"> 
</span><ins>+webkit.org/b/207798 webrtc/connection-state.html [ Pass Failure ]
+
</ins><span class="cx"> imported/w3c/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html [ Pass Failure Slow ]
</span><span class="cx"> webkit.org/b/214197 imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https.html [ Pass Failure Crash ]
</span><span class="cx"> imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations      2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -987,9 +987,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/199089 [ Debug ] plugins/window-open.html [ Skip ]
</span><span class="cx"> 
</span><del>-# <rdar://problem/56506063> Layout Test imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html is a flaky failure (203256)
-webkit.org/b/203256 [ Debug ] imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/205808 fast/text/international/unicode-bidi-other-neutrals.html [ Pass Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/206864 http/tests/workers/service/basic-timeout.https.html [ Pass Failure ]
</span><span class="lines">@@ -1033,8 +1030,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/207796 [ Release ] fast/box-shadow/hidpi-box-shadow.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/207798 webrtc/connection-state.html [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/207938 http/wpt/crypto/derive-hmac-key-crash.any.html [ Pass Crash ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/207962 accessibility/mac/aria-menu-item-selected-notification.html [ Slow ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/Source/WebCore/ChangeLog      2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2021-09-30  Youenn Fablet  <youenn@apple.com>
+
+        Layout Test imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=203256
+        <rdar://problem/56506063>
+
+        Reviewed by Eric Carlson.
+
+        Test was flaky for a few reasons:
+        - Setting local/remote descriptions may change the ICE transports in use so we need to update the ice connection state when setting local/remote descriptions.
+        - We start observing ICE transport backend state asynchronously and we might miss the checking state which can happen very quickly. Synthesize it if needed.
+        - We were using the ICE connection state value from the backend as well as computing it from our RTCIceTransport objects. We now fully compute it from RTCIceTransport objects.
+          This ensures we have consistent state between RTCIceTransport and RTCPeerConnection objects with regards to ICE state.
+
+        Covered by no longer flaky test.
+
+        * Modules/mediastream/PeerConnectionBackend.cpp:
+        (WebCore::PeerConnectionBackend::setLocalDescriptionSucceeded):
+        (WebCore::PeerConnectionBackend::setRemoteDescriptionSucceeded):
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::updateIceGatheringState):
+        (WebCore::RTCPeerConnection::updateIceConnectionState):
+        (WebCore::RTCPeerConnection::computeIceConnectionStateFromIceTransports):
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/libwebrtc/LibWebRTCIceTransportBackend.cpp:
+        (WebCore::LibWebRTCIceTransportBackendObserver::start):
+
</ins><span class="cx"> 2021-09-30  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed GTK build fix after r283304
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp       2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp  2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">             m_peerConnection.updateDescriptions(WTFMove(*descriptionStates));
</span><span class="cx">         m_peerConnection.updateTransceiversAfterSuccessfulLocalDescription();
</span><span class="cx">         m_peerConnection.updateSctpBackend(WTFMove(sctpBackend));
</span><del>-
</del><ins>+        m_peerConnection.processIceTransportChanges();
</ins><span class="cx">         callback({ });
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -235,6 +235,7 @@
</span><span class="cx"> 
</span><span class="cx">         m_peerConnection.updateTransceiversAfterSuccessfulRemoteDescription();
</span><span class="cx">         m_peerConnection.updateSctpBackend(WTFMove(sctpBackend));
</span><ins>+        m_peerConnection.processIceTransportChanges();
</ins><span class="cx">         callback({ });
</span><span class="cx">     });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp   2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp      2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -670,13 +670,14 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RTCPeerConnection::updateIceConnectionState(RTCIceConnectionState newState)
</del><ins>+void RTCPeerConnection::updateIceConnectionState(RTCIceConnectionState)
</ins><span class="cx"> {
</span><del>-    ALWAYS_LOG(LOGIDENTIFIER, newState);
-
-    queueTaskKeepingObjectAlive(*this, TaskSource::Networking, [this, newState] {
-        if (isClosed() || m_iceConnectionState == newState)
</del><ins>+    queueTaskKeepingObjectAlive(*this, TaskSource::Networking, [this] {
+        if (isClosed())
</ins><span class="cx">             return;
</span><ins>+        auto newState = computeIceConnectionStateFromIceTransports();
+        if (m_iceConnectionState == newState)
+            return;
</ins><span class="cx"> 
</span><span class="cx">         m_iceConnectionState = newState;
</span><span class="cx">         dispatchEvent(Event::create(eventNames().iceconnectionstatechangeEvent, Event::CanBubble::No, Event::IsCancelable::No));
</span><span class="lines">@@ -791,6 +792,16 @@
</span><span class="cx">         dispatchEvent(Event::create(eventNames().connectionstatechangeEvent, Event::CanBubble::No, Event::IsCancelable::No));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RTCPeerConnection::processIceTransportChanges()
+{
+    auto newIceConnectionState = computeIceConnectionStateFromIceTransports();
+    bool iceConnectionStateChanged = m_iceConnectionState != newIceConnectionState;
+    m_iceConnectionState = newIceConnectionState;
+
+    if (iceConnectionStateChanged && !isClosed())
+        dispatchEvent(Event::create(eventNames().iceconnectionstatechangeEvent, Event::CanBubble::No, Event::IsCancelable::No));
+}
+
</ins><span class="cx"> void RTCPeerConnection::updateNegotiationNeededFlag(std::optional<uint32_t> eventId)
</span><span class="cx"> {
</span><span class="cx">     queueTaskKeepingObjectAlive(*this, TaskSource::Networking, [this, eventId]() mutable {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h     2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -192,6 +192,7 @@
</span><span class="cx">     void updateSctpBackend(std::unique_ptr<RTCSctpTransportBackend>&&);
</span><span class="cx"> 
</span><span class="cx">     void processIceTransportStateChange(RTCIceTransport&);
</span><ins>+    void processIceTransportChanges();
</ins><span class="cx"> 
</span><span class="cx">     RTCSctpTransport* sctp() { return m_sctpTransport.get(); }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCIceTransportBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCIceTransportBackend.cpp (283306 => 283307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCIceTransportBackend.cpp      2021-09-30 08:42:16 UTC (rev 283306)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCIceTransportBackend.cpp 2021-09-30 11:20:49 UTC (rev 283307)
</span><span class="lines">@@ -108,7 +108,15 @@
</span><span class="cx">             return;
</span><span class="cx">         internal->SignalIceTransportStateChanged.connect(this, &LibWebRTCIceTransportBackendObserver::onIceTransportStateChanged);
</span><span class="cx">         internal->SignalGatheringState.connect(this, &LibWebRTCIceTransportBackendObserver::onGatheringStateChanged);
</span><del>-        callOnMainThread([protectedThis = Ref { *this }, transportState = internal->GetIceTransportState(), gatheringState = internal->gathering_state()] {
</del><ins>+        auto transportState = internal->GetIceTransportState();
+        // We start observing a bit late and might miss the checking state. Synthesize it as needed.
+        if (transportState > webrtc::IceTransportState::kChecking && transportState != webrtc::IceTransportState::kClosed) {
+            callOnMainThread([protectedThis = Ref { *this }] {
+                if (protectedThis->m_client)
+                    protectedThis->m_client->onStateChanged(RTCIceTransportState::Checking);
+            });
+        }
+        callOnMainThread([protectedThis = Ref { *this }, transportState, gatheringState = internal->gathering_state()] {
</ins><span class="cx">             if (!protectedThis->m_client)
</span><span class="cx">                 return;
</span><span class="cx">             protectedThis->m_client->onStateChanged(toRTCIceTransportState(transportState));
</span></span></pre>
</div>
</div>

</body>
</html>