<!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>[238150] 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/238150">238150</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2018-11-13 15:22:11 -0800 (Tue, 13 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>RTCPeerConnection.getTransceivers is not always exposing all transceivers
https://bugs.webkit.org/show_bug.cgi?id=191589

Reviewed by Eric Carlson.

LayoutTests/imported/w3c:

* web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt:

Source/WebCore:

Implement the collect transceiver algorithm using libwebrtc backend.
Call this algorithm everytime transceivers are retrieved from JS.
For Plan B, make this a no-op as this is not supported.
Introduce senders/receivers/transceivers getters where we just look at already created transceivers.

Covered by existing and rebased tests.

* Modules/mediastream/PeerConnectionBackend.h:
(WebCore::PeerConnectionBackend::collectTransceivers):
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::getSenders const):
(WebCore::RTCPeerConnection::getReceivers const):
(WebCore::RTCPeerConnection::getTransceivers const):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
(WebCore::LibWebRTCMediaEndpoint::collectTransceivers):
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
* Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:
(WebCore::LibWebRTCPeerConnectionBackend::addTrack):
(WebCore::LibWebRTCPeerConnectionBackend::existingTransceiver):
(WebCore::LibWebRTCPeerConnectionBackend::collectTransceivers):
(WebCore::LibWebRTCPeerConnectionBackend::applyRotationForOutgoingVideoSources):
(WebCore::LibWebRTCPeerConnectionBackend::shouldOfferAllowToReceive const):
* Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcRTCRtpTransceiverhttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCPeerConnectionBackendcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2018-11-13  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        RTCPeerConnection.getTransceivers is not always exposing all transceivers
+        https://bugs.webkit.org/show_bug.cgi?id=191589
+
+        Reviewed by Eric Carlson.
+
+        * web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt:
+
+2018-11-13  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Refresh WPT webrtc tests to ToT
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=191564
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcRTCRtpTransceiverhttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt    2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https-expected.txt       2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PASS checkAddTransceiverWithAddTrack 
</span><span class="cx"> PASS checkAddTransceiverWithDirection 
</span><span class="cx"> PASS checkAddTransceiverWithSetRemoteOfferSending 
</span><del>-FAIL checkAddTransceiverWithSetRemoteOfferNoSend assert_equals: expected "[{currentDirection:null,direction:\"recvonly\",receiver:{track:{kind:\"audio\"}},sender:{track:null},stopped:false}]" but got "[]"
</del><ins>+PASS checkAddTransceiverWithSetRemoteOfferNoSend 
</ins><span class="cx"> PASS checkAddTransceiverBadKind 
</span><span class="cx"> FAIL checkNoMidOffer promise_test: Unhandled rejection with value: object "OperationError: Failed to set remote offer sdp: The BUNDLE group contains MID:0 matching no m= section."
</span><span class="cx"> PASS checkSetDirection 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/ChangeLog      2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2018-11-13  Youenn Fablet  <youenn@apple.com>
+
+        RTCPeerConnection.getTransceivers is not always exposing all transceivers
+        https://bugs.webkit.org/show_bug.cgi?id=191589
+
+        Reviewed by Eric Carlson.
+
+        Implement the collect transceiver algorithm using libwebrtc backend.
+        Call this algorithm everytime transceivers are retrieved from JS.
+        For Plan B, make this a no-op as this is not supported.
+        Introduce senders/receivers/transceivers getters where we just look at already created transceivers.
+
+        Covered by existing and rebased tests.
+
+        * Modules/mediastream/PeerConnectionBackend.h:
+        (WebCore::PeerConnectionBackend::collectTransceivers):
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::getSenders const):
+        (WebCore::RTCPeerConnection::getReceivers const):
+        (WebCore::RTCPeerConnection::getTransceivers const):
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+        (WebCore::LibWebRTCMediaEndpoint::collectTransceivers):
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+        * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:
+        (WebCore::LibWebRTCPeerConnectionBackend::addTrack):
+        (WebCore::LibWebRTCPeerConnectionBackend::existingTransceiver):
+        (WebCore::LibWebRTCPeerConnectionBackend::collectTransceivers):
+        (WebCore::LibWebRTCPeerConnectionBackend::applyRotationForOutgoingVideoSources):
+        (WebCore::LibWebRTCPeerConnectionBackend::shouldOfferAllowToReceive const):
+        * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h:
+
</ins><span class="cx"> 2018-11-13  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Do not show selection UI for editable elements with opacity near zero
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h    2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -167,6 +167,8 @@
</span><span class="cx">     };
</span><span class="cx">     static void generateCertificate(Document&, const CertificateInformation&, DOMPromiseDeferred<IDLInterface<RTCCertificate>>&&);
</span><span class="cx"> 
</span><ins>+    virtual void collectTransceivers() { };
+
</ins><span class="cx"> protected:
</span><span class="cx">     void fireICECandidateEvent(RefPtr<RTCIceCandidate>&&, String&& url);
</span><span class="cx">     void doneGatheringCandidates();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp   2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp      2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -639,6 +639,24 @@
</span><span class="cx">     PeerConnectionBackend::generateCertificate(document, parameters.returnValue(), WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const Vector<std::reference_wrapper<RTCRtpSender>>& RTCPeerConnection::getSenders() const
+{
+    m_backend->collectTransceivers();
+    return m_transceiverSet->senders();
+}
+
+const Vector<std::reference_wrapper<RTCRtpReceiver>>& RTCPeerConnection::getReceivers() const
+{
+    m_backend->collectTransceivers();
+    return m_transceiverSet->receivers();
+}
+
+const Vector<RefPtr<RTCRtpTransceiver>>& RTCPeerConnection::getTransceivers() const
+{
+    m_backend->collectTransceivers();
+    return m_transceiverSet->list();
+}
+
</ins><span class="cx"> #if !RELEASE_LOG_DISABLED
</span><span class="cx"> WTFLogChannel& RTCPeerConnection::logChannel() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h     2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -128,10 +128,13 @@
</span><span class="cx">     void addInternalTransceiver(Ref<RTCRtpTransceiver>&& transceiver) { m_transceiverSet->append(WTFMove(transceiver)); }
</span><span class="cx"> 
</span><span class="cx">     // 5.1 RTCPeerConnection extensions
</span><del>-    const Vector<std::reference_wrapper<RTCRtpSender>>& getSenders() const { return m_transceiverSet->senders(); }
-    const Vector<std::reference_wrapper<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->receivers(); }
-    const Vector<RefPtr<RTCRtpTransceiver>>& getTransceivers() const { return m_transceiverSet->list(); }
</del><ins>+    const Vector<std::reference_wrapper<RTCRtpSender>>& getSenders() const;
+    const Vector<std::reference_wrapper<RTCRtpReceiver>>& getReceivers() const;
+    const Vector<RefPtr<RTCRtpTransceiver>>& getTransceivers() const;
</ins><span class="cx"> 
</span><ins>+    const Vector<std::reference_wrapper<RTCRtpSender>>& currentSenders() const { return m_transceiverSet->senders(); }
+    const Vector<RefPtr<RTCRtpTransceiver>>& currentTransceivers() const { return m_transceiverSet->list(); }
+
</ins><span class="cx">     ExceptionOr<Ref<RTCRtpSender>> addTrack(Ref<MediaStreamTrack>&&, const Vector<std::reference_wrapper<MediaStream>>&);
</span><span class="cx">     ExceptionOr<void> removeTrack(RTCRtpSender&);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp    2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp       2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -457,6 +457,30 @@
</span><span class="cx">     RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void LibWebRTCMediaEndpoint::collectTransceivers()
+{
+    if (!m_backend)
+        return;
+
+    if (!RuntimeEnabledFeatures::sharedFeatures().webRTCUnifiedPlanEnabled())
+        return;
+
+    for (auto& rtcTransceiver : m_backend->GetTransceivers()) {
+        auto* existingTransceiver = m_peerConnectionBackend.existingTransceiver([&](auto& transceiverBackend) {
+            return rtcTransceiver.get() == transceiverBackend.rtcTransceiver();
+        });
+        if (existingTransceiver)
+            continue;
+
+        auto rtcReceiver = rtcTransceiver->receiver();
+        auto source = sourceFromNewReceiver(*rtcReceiver);
+        if (!source)
+            return;
+
+        m_peerConnectionBackend.newRemoteTransceiver(std::make_unique<LibWebRTCRtpTransceiverBackend>(WTFMove(rtcTransceiver)), source.releaseNonNull());
+    }
+}
+
</ins><span class="cx"> void LibWebRTCMediaEndpoint::newTransceiver(rtc::scoped_refptr<webrtc::RtpTransceiverInterface>&& rtcTransceiver)
</span><span class="cx"> {
</span><span class="cx">     auto* transceiver = m_peerConnectionBackend.existingTransceiver([&](auto& transceiverBackend) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h      2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx">     std::unique_ptr<LibWebRTCRtpTransceiverBackend> transceiverBackendFromSender(LibWebRTCRtpSenderBackend&);
</span><span class="cx"> 
</span><span class="cx">     void setSenderSourceFromTrack(LibWebRTCRtpSenderBackend&, MediaStreamTrack&);
</span><ins>+    void collectTransceivers();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     LibWebRTCMediaEndpoint(LibWebRTCPeerConnectionBackend&, LibWebRTCProvider&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCPeerConnectionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp    2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp       2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx">         if (!m_endpoint->addTrack(*senderBackend, track, mediaStreamIds))
</span><span class="cx">             return Exception { TypeError, "Unable to add track"_s };
</span><span class="cx"> 
</span><del>-        if (auto sender = findExistingSender(m_peerConnection.getSenders(), *senderBackend)) {
</del><ins>+        if (auto sender = findExistingSender(m_peerConnection.currentSenders(), *senderBackend)) {
</ins><span class="cx">             sender->setTrack(makeRef(track));
</span><span class="cx">             sender->setMediaStreamIds(WTFMove(mediaStreamIds));
</span><span class="cx">             return sender.releaseNonNull();
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> 
</span><span class="cx">     RTCRtpSender* sender = nullptr;
</span><span class="cx">     // Reuse an existing sender with the same track kind if it has never been used to send before.
</span><del>-    for (auto& transceiver : m_peerConnection.getTransceivers()) {
</del><ins>+    for (auto& transceiver : m_peerConnection.currentTransceivers()) {
</ins><span class="cx">         auto& existingSender = transceiver->sender();
</span><span class="cx">         if (!existingSender.isStopped() && existingSender.trackKind() == track.kind() && existingSender.trackId().isNull() && !transceiver->hasSendingDirection()) {
</span><span class="cx">             existingSender.setTrack(makeRef(track));
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> 
</span><span class="cx"> RTCRtpTransceiver* LibWebRTCPeerConnectionBackend::existingTransceiver(WTF::Function<bool(LibWebRTCRtpTransceiverBackend&)>&& matchingFunction)
</span><span class="cx"> {
</span><del>-    for (auto& transceiver : m_peerConnection.getTransceivers()) {
</del><ins>+    for (auto& transceiver : m_peerConnection.currentTransceivers()) {
</ins><span class="cx">         if (matchingFunction(backendFromRTPTransceiver(*transceiver)))
</span><span class="cx">             return transceiver.get();
</span><span class="cx">     }
</span><span class="lines">@@ -526,6 +526,11 @@
</span><span class="cx">     return transceiver;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void LibWebRTCPeerConnectionBackend::collectTransceivers()
+{
+    m_endpoint->collectTransceivers();
+}
+
</ins><span class="cx"> void LibWebRTCPeerConnectionBackend::removeTrack(RTCRtpSender& sender)
</span><span class="cx"> {
</span><span class="cx">     m_endpoint->removeTrack(backendFromRTPSender(sender));
</span><span class="lines">@@ -533,7 +538,7 @@
</span><span class="cx"> 
</span><span class="cx"> void LibWebRTCPeerConnectionBackend::applyRotationForOutgoingVideoSources()
</span><span class="cx"> {
</span><del>-    for (auto& transceiver : m_peerConnection.getTransceivers()) {
</del><ins>+    for (auto& transceiver : m_peerConnection.currentTransceivers()) {
</ins><span class="cx">         if (!transceiver->sender().isStopped()) {
</span><span class="cx">             if (auto* videoSource = backendFromRTPSender(transceiver->sender()).videoSource())
</span><span class="cx">                 videoSource->setApplyRotation(true);
</span><span class="lines">@@ -544,7 +549,7 @@
</span><span class="cx"> bool LibWebRTCPeerConnectionBackend::shouldOfferAllowToReceive(const char* kind) const
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!RuntimeEnabledFeatures::sharedFeatures().webRTCUnifiedPlanEnabled());
</span><del>-    for (const auto& transceiver : m_peerConnection.getTransceivers()) {
</del><ins>+    for (const auto& transceiver : m_peerConnection.currentTransceivers()) {
</ins><span class="cx">         if (transceiver->sender().trackKind() != kind)
</span><span class="cx">             continue;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h (238149 => 238150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h      2018-11-13 22:46:17 UTC (rev 238149)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h 2018-11-13 23:22:11 UTC (rev 238150)
</span><span class="lines">@@ -99,6 +99,8 @@
</span><span class="cx">     RTCRtpTransceiver* existingTransceiver(WTF::Function<bool(LibWebRTCRtpTransceiverBackend&)>&&);
</span><span class="cx">     RTCRtpTransceiver& newRemoteTransceiver(std::unique_ptr<LibWebRTCRtpTransceiverBackend>&&, Ref<RealtimeMediaSource>&&);
</span><span class="cx"> 
</span><ins>+    void collectTransceivers() final;
+
</ins><span class="cx">     struct VideoReceiver {
</span><span class="cx">         Ref<RTCRtpReceiver> receiver;
</span><span class="cx">         Ref<RealtimeIncomingVideoSource> source;
</span></span></pre>
</div>
</div>

</body>
</html>