<!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>[282638] trunk/Source/WebCore</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/282638">282638</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2021-09-17 00:07:07 -0700 (Fri, 17 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make sure to use event queue when settling RTCPeerConnection.addIceCandidate promise
https://bugs.webkit.org/show_bug.cgi?id=230346

Reviewed by Eric Carlson.

Before the patch, we were resolving the promise in a callOnMainThread lambda.
We now do like for other methods: hop to main thread, then queue a task in event loop to resolve the promise.
Covered by existing tests.

* Modules/mediastream/PeerConnectionBackend.cpp:
(WebCore::PeerConnectionBackend::addIceCandidate):
* Modules/mediastream/PeerConnectionBackend.h:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::addIceCandidate):</pre>

<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282637 => 282638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-17 07:02:29 UTC (rev 282637)
+++ trunk/Source/WebCore/ChangeLog      2021-09-17 07:07:07 UTC (rev 282638)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2021-09-17  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        Make sure to use event queue when settling RTCPeerConnection.addIceCandidate promise
+        https://bugs.webkit.org/show_bug.cgi?id=230346
+
+        Reviewed by Eric Carlson.
+
+        Before the patch, we were resolving the promise in a callOnMainThread lambda.
+        We now do like for other methods: hop to main thread, then queue a task in event loop to resolve the promise.
+        Covered by existing tests.
+
+        * Modules/mediastream/PeerConnectionBackend.cpp:
+        (WebCore::PeerConnectionBackend::addIceCandidate):
+        * Modules/mediastream/PeerConnectionBackend.h:
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::addIceCandidate):
+
+2021-09-17  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Compute RTCPeerConnection.connectionState as per https://w3c.github.io/webrtc-pc/#rtcpeerconnectionstate-enum
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=230341
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (282637 => 282638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp       2021-09-17 07:02:29 UTC (rev 282637)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp  2021-09-17 07:07:07 UTC (rev 282638)
</span><span class="lines">@@ -294,40 +294,39 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PeerConnectionBackend::addIceCandidate(RTCIceCandidate* iceCandidate, DOMPromiseDeferred<void>&& promise)
</del><ins>+void PeerConnectionBackend::addIceCandidate(RTCIceCandidate* iceCandidate, Function<void(ExceptionOr<void>&&)>&& callback)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_peerConnection.isClosed());
</span><span class="cx"> 
</span><span class="cx">     if (!iceCandidate) {
</span><del>-        endOfIceCandidates(WTFMove(promise));
</del><ins>+        callback({ });
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // FIXME: As per https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-addicecandidate(), this check should be done before enqueuing the task.
-    if (iceCandidate->sdpMid().isNull() && !iceCandidate->sdpMLineIndex()) {
-        promise.reject(Exception { TypeError, "Trying to add a candidate that is missing both sdpMid and sdpMLineIndex"_s });
-        return;
-    }
-
</del><span class="cx">     if (shouldIgnoreIceCandidate(*iceCandidate)) {
</span><del>-        promise.resolve();
</del><ins>+        callback({ });
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    doAddIceCandidate(*iceCandidate, [weakThis = makeWeakPtr(this), promise = WTFMove(promise)](auto&& result) mutable {
-        ASSERT(isMainThread());
-        if (!weakThis || weakThis->m_peerConnection.isClosed())
</del><ins>+    doAddIceCandidate(*iceCandidate, [weakThis = makeWeakPtr(this), callback = WTFMove(callback)](auto&& result) mutable {
+        if (!weakThis)
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        if (result.hasException()) {
-            RELEASE_LOG_ERROR(WebRTC, "Adding ice candidate failed %d", result.exception().code());
-            promise.reject(result.releaseException());
-            return;
-        }
</del><ins>+        auto& peerConnection = weakThis->m_peerConnection;
+        peerConnection.queueTaskKeepingObjectAlive(peerConnection, TaskSource::Networking, [&peerConnection, callback = WTFMove(callback), result = WTFMove(result)]() mutable {
+            if (peerConnection.isClosed())
+                return;
</ins><span class="cx"> 
</span><del>-        if (auto descriptions = result.releaseReturnValue())
-            weakThis->m_peerConnection.updateDescriptions(WTFMove(*descriptions));
-        promise.resolve();
</del><ins>+            if (result.hasException()) {
+                RELEASE_LOG_ERROR(WebRTC, "Adding ice candidate failed %d", result.exception().code());
+                callback(result.releaseException());
+                return;
+            }
+
+            if (auto descriptions = result.releaseReturnValue())
+                peerConnection.updateDescriptions(WTFMove(*descriptions));
+            callback({ });
+        });
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -386,11 +385,6 @@
</span><span class="cx">     m_peerConnection.updateIceGatheringState(RTCIceGatheringState::Complete);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PeerConnectionBackend::endOfIceCandidates(DOMPromiseDeferred<void>&& promise)
-{
-    promise.resolve();
-}
-
</del><span class="cx"> void PeerConnectionBackend::stop()
</span><span class="cx"> {
</span><span class="cx">     m_offerAnswerCallback = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (282637 => 282638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2021-09-17 07:02:29 UTC (rev 282637)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h    2021-09-17 07:07:07 UTC (rev 282638)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">     void createAnswer(RTCAnswerOptions&&, CreateCallback&&);
</span><span class="cx">     void setLocalDescription(const RTCSessionDescription*, Function<void(ExceptionOr<void>&&)>&&);
</span><span class="cx">     void setRemoteDescription(const RTCSessionDescription&, Function<void(ExceptionOr<void>&&)>&&);
</span><del>-    void addIceCandidate(RTCIceCandidate*, DOMPromiseDeferred<void>&&);
</del><ins>+    void addIceCandidate(RTCIceCandidate*, Function<void(ExceptionOr<void>&&)>&&);
</ins><span class="cx"> 
</span><span class="cx">     virtual std::unique_ptr<RTCDataChannelHandler> createDataChannelHandler(const String&, const RTCDataChannelInit&) = 0;
</span><span class="cx"> 
</span><span class="lines">@@ -229,7 +229,6 @@
</span><span class="cx">     virtual void doSetLocalDescription(const RTCSessionDescription*) = 0;
</span><span class="cx">     virtual void doSetRemoteDescription(const RTCSessionDescription&) = 0;
</span><span class="cx">     virtual void doAddIceCandidate(RTCIceCandidate&, AddIceCandidateCallback&&) = 0;
</span><del>-    virtual void endOfIceCandidates(DOMPromiseDeferred<void>&&);
</del><span class="cx">     virtual void doStop() = 0;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (282637 => 282638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp   2021-09-17 07:02:29 UTC (rev 282637)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp      2021-09-17 07:07:07 UTC (rev 282638)
</span><span class="lines">@@ -346,17 +346,27 @@
</span><span class="cx">         });
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    ALWAYS_LOG(LOGIDENTIFIER, "Received ice candidate:\n", candidate ? candidate->candidate() : "null");
+
</ins><span class="cx">     if (exception) {
</span><span class="cx">         promise->reject(*exception);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (candidate && candidate->sdpMid().isNull() && !candidate->sdpMLineIndex()) {
+        promise->reject(Exception { TypeError, "Trying to add a candidate that is missing both sdpMid and sdpMLineIndex"_s });
+        return;
+    }
+
</ins><span class="cx">     if (isClosed())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    ALWAYS_LOG(LOGIDENTIFIER, "Received ice candidate:\n", candidate ? candidate->candidate() : "null");
</del><span class="cx">     chainOperation(WTFMove(promise), [this, candidate = WTFMove(candidate)](auto&& promise) mutable {
</span><del>-        m_backend->addIceCandidate(candidate.get(), WTFMove(promise));
</del><ins>+        m_backend->addIceCandidate(candidate.get(), [protectedThis = makeRef(*this), promise = DOMPromiseDeferred<void>(WTFMove(promise))](auto&& result) mutable {
+            if (protectedThis->isClosed())
+                return;
+            promise.settle(WTFMove(result));
+        });
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>