<!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>[208683] 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/208683">208683</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-14 07:46:05 -0800 (Mon, 14 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RTCRtpTransceiver should have Ref of sender and receiver
https://bugs.webkit.org/show_bug.cgi?id=164665
Patch by Youenn Fablet <youennf@gmail.com> on 2016-11-14
Reviewed by Darin Adler.
No change of behavior.
Making RTCRptTransceiver have Ref<RTCRtpSender> and Ref<RTCRtpReceiver>.
Transforming transceiver set list of senders and receivers as vectors of references to reduce count churning.
Also making RTCRptTransceiver have a Ref<RTCIceTransport> instead of a RefPtr.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::createOfferTask):
(WebCore::MediaEndpointPeerConnection::createAnswerTask):
(WebCore::createSourceMap):
(WebCore::MediaEndpointPeerConnection::setRemoteDescriptionTask):
(WebCore::MediaEndpointPeerConnection::createReceiver):
(WebCore::MediaEndpointPeerConnection::replaceTrack):
* Modules/mediastream/MediaEndpointPeerConnection.h:
* Modules/mediastream/PeerConnectionBackend.h:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::addTrack):
(WebCore::RTCPeerConnection::removeTrack):
(WebCore::RTCPeerConnection::close):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCRtpTransceiver.cpp:
(WebCore::RTCRtpTransceiver::RTCRtpTransceiver):
* Modules/mediastream/RTCRtpTransceiver.h:
(WebCore::RTCRtpTransceiver::create):
(WebCore::RTCRtpTransceiver::sender):
(WebCore::RTCRtpTransceiver::receiver):
(WebCore::RTCRtpTransceiver::iceTransport):
(WebCore::RtpTransceiverSet::senders):
(WebCore::RtpTransceiverSet::receivers):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h</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="#trunkSourceWebCoreModulesmediastreamRTCRtpTransceivercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverh">trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-11-14 Youenn Fablet <youennf@gmail.com>
+
+ RTCRtpTransceiver should have Ref of sender and receiver
+ https://bugs.webkit.org/show_bug.cgi?id=164665
+
+ Reviewed by Darin Adler.
+
+ No change of behavior.
+
+ Making RTCRptTransceiver have Ref<RTCRtpSender> and Ref<RTCRtpReceiver>.
+ Transforming transceiver set list of senders and receivers as vectors of references to reduce count churning.
+ Also making RTCRptTransceiver have a Ref<RTCIceTransport> instead of a RefPtr.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::createOfferTask):
+ (WebCore::MediaEndpointPeerConnection::createAnswerTask):
+ (WebCore::createSourceMap):
+ (WebCore::MediaEndpointPeerConnection::setRemoteDescriptionTask):
+ (WebCore::MediaEndpointPeerConnection::createReceiver):
+ (WebCore::MediaEndpointPeerConnection::replaceTrack):
+ * Modules/mediastream/MediaEndpointPeerConnection.h:
+ * Modules/mediastream/PeerConnectionBackend.h:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::addTrack):
+ (WebCore::RTCPeerConnection::removeTrack):
+ (WebCore::RTCPeerConnection::close):
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCRtpTransceiver.cpp:
+ (WebCore::RTCRtpTransceiver::RTCRtpTransceiver):
+ * Modules/mediastream/RTCRtpTransceiver.h:
+ (WebCore::RTCRtpTransceiver::create):
+ (WebCore::RTCRtpTransceiver::sender):
+ (WebCore::RTCRtpTransceiver::receiver):
+ (WebCore::RTCRtpTransceiver::iceTransport):
+ (WebCore::RtpTransceiverSet::senders):
+ (WebCore::RtpTransceiverSet::receivers):
+
</ins><span class="cx"> 2016-11-14 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix various --minimal build issue
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> mediaDescription.mode = transceiver->directionString();
</span><span class="cx"> if (transceiver->hasSendingDirection()) {
</span><del>- RTCRtpSender& sender = *transceiver->sender();
</del><ins>+ auto& sender = transceiver->sender();
</ins><span class="cx">
</span><span class="cx"> mediaDescription.mediaStreamId = sender.mediaStreamIds()[0];
</span><span class="cx"> mediaDescription.mediaStreamTrackId = sender.trackId();
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> // Add media descriptions for remaining transceivers.
</span><span class="cx"> for (auto& transceiver : transceivers) {
</span><span class="cx"> PeerMediaDescription mediaDescription;
</span><del>- RTCRtpSender& sender = *transceiver->sender();
</del><ins>+ auto& sender = transceiver->sender();
</ins><span class="cx">
</span><span class="cx"> mediaDescription.mode = transceiver->directionString();
</span><span class="cx"> mediaDescription.mid = transceiver->provisionalMid();
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> if (i >= configurationSnapshot->mediaDescriptions().size()) {
</span><span class="cx"> PeerMediaDescription newMediaDescription;
</span><span class="cx">
</span><del>- RTCRtpSender& sender = *transceiver->sender();
</del><ins>+ auto& sender = transceiver->sender();
</ins><span class="cx"> if (sender.track()) {
</span><span class="cx"> if (sender.mediaStreamIds().size())
</span><span class="cx"> newMediaDescription.mediaStreamId = sender.mediaStreamIds()[0];
</span><span class="lines">@@ -306,8 +306,8 @@
</span><span class="cx">
</span><span class="cx"> RTCRtpTransceiver* transceiver = matchTransceiverByMid(transceivers, remoteMediaDescription.mid);
</span><span class="cx"> if (transceiver) {
</span><del>- if (transceiver->hasSendingDirection() && transceiver->sender()->track())
- sourceMap.set(transceiver->mid(), &transceiver->sender()->track()->source());
</del><ins>+ if (transceiver->hasSendingDirection() && transceiver->sender().track())
+ sourceMap.set(transceiver->mid(), &transceiver->sender().track()->source());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> if (mediaDescription.mode == "sendrecv" || mediaDescription.mode == "recvonly") {
</span><span class="cx"> // Try to match an existing transceiver.
</span><span class="cx"> transceiver = matchTransceiver(transceivers, [&mediaDescription] (RTCRtpTransceiver& current) {
</span><del>- return !current.stopped() && current.mid().isNull() && current.sender()->trackKind() == mediaDescription.type;
</del><ins>+ return !current.stopped() && current.mid().isNull() && current.sender().trackKind() == mediaDescription.type;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (transceiver) {
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (mediaDescription.mode == "sendrecv" || mediaDescription.mode == "sendonly") {
</span><del>- RTCRtpReceiver& receiver = *transceiver->receiver();
</del><ins>+ auto& receiver = transceiver->receiver();
</ins><span class="cx"> if (receiver.isDispatched())
</span><span class="cx"> continue;
</span><span class="cx"> receiver.setDispatched(true);
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> return remoteStreams;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpReceiver> MediaEndpointPeerConnection::createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId)
</del><ins>+Ref<RTCRtpReceiver> MediaEndpointPeerConnection::createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId)
</ins><span class="cx"> {
</span><span class="cx"> RealtimeMediaSource::Type sourceType = trackKind == "audio" ? RealtimeMediaSource::Type::Audio : RealtimeMediaSource::Type::Video;
</span><span class="cx">
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> void MediaEndpointPeerConnection::replaceTrack(RTCRtpSender& sender, RefPtr<MediaStreamTrack>&& withTrack, PeerConnection::VoidPromise&& promise)
</span><span class="cx"> {
</span><span class="cx"> RTCRtpTransceiver* transceiver = matchTransceiver(m_peerConnection.getTransceivers(), [&sender] (RTCRtpTransceiver& current) {
</span><del>- return current.sender() == &sender;
</del><ins>+ return &current.sender() == &sender;
</ins><span class="cx"> });
</span><span class="cx"> ASSERT(transceiver);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<MediaStream>> getRemoteStreams() const override;
</span><span class="cx">
</span><del>- RefPtr<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) override;
</del><ins>+ Ref<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) override;
</ins><span class="cx"> void replaceTrack(RTCRtpSender&, RefPtr<MediaStreamTrack>&&, PeerConnection::VoidPromise&&) override;
</span><span class="cx">
</span><span class="cx"> bool isNegotiationNeeded() const override { return m_negotiationNeeded; };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> virtual Vector<RefPtr<MediaStream>> getRemoteStreams() const = 0;
</span><span class="cx">
</span><del>- virtual RefPtr<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) = 0;
</del><ins>+ virtual Ref<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) = 0;
</ins><span class="cx"> virtual void replaceTrack(RTCRtpSender&, RefPtr<MediaStreamTrack>&&, PeerConnection::VoidPromise&&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool isNegotiationNeeded() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> if (!streams.size())
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="cx">
</span><del>- for (auto& sender : m_transceiverSet->getSenders()) {
- if (sender->trackId() == track->id())
</del><ins>+ for (RTCRtpSender& sender : m_transceiverSet->senders()) {
+ if (sender.trackId() == track->id())
</ins><span class="cx"> return Exception { INVALID_ACCESS_ERR };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> // Reuse an existing sender with the same track kind if it has never been used to send before.
</span><span class="cx"> for (auto& transceiver : m_transceiverSet->list()) {
</span><del>- RTCRtpSender& existingSender = *transceiver->sender();
</del><ins>+ auto& existingSender = transceiver->sender();
</ins><span class="cx"> if (existingSender.trackKind() == track->kind() && existingSender.trackId().isNull() && !transceiver->hasSendingDirection()) {
</span><span class="cx"> existingSender.setTrack(WTFMove(track));
</span><span class="cx"> existingSender.setMediaStreamIds(WTFMove(mediaStreamIds));
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> // provisional mid if the transceiver is used to create an offer.
</span><span class="cx"> transceiver->setProvisionalMid(transceiverMid);
</span><span class="cx">
</span><del>- sender = transceiver->sender();
</del><ins>+ sender = &transceiver->sender();
</ins><span class="cx"> m_transceiverSet->append(WTFMove(transceiver));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,7 +148,14 @@
</span><span class="cx"> if (m_signalingState == SignalingState::Closed)
</span><span class="cx"> return Exception { INVALID_STATE_ERR };
</span><span class="cx">
</span><del>- if (!m_transceiverSet->getSenders().contains(&sender))
</del><ins>+ bool shouldAbort = true;
+ for (RTCRtpSender& senderInSet : m_transceiverSet->senders()) {
+ if (&senderInSet == &sender) {
+ shouldAbort = sender.isStopped();
+ break;
+ }
+ }
+ if (shouldAbort)
</ins><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> sender.stop();
</span><span class="lines">@@ -199,7 +206,7 @@
</span><span class="cx"> {
</span><span class="cx"> transceiver.setDirection(static_cast<RTCRtpTransceiver::Direction>(init.direction));
</span><span class="cx">
</span><del>- m_transceiverSet->append(&transceiver);
</del><ins>+ m_transceiverSet->append(transceiver);
</ins><span class="cx"> m_backend->markAsNeedingNegotiation();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -387,8 +394,8 @@
</span><span class="cx"> m_iceConnectionState = IceConnectionState::Closed;
</span><span class="cx"> m_signalingState = SignalingState::Closed;
</span><span class="cx">
</span><del>- for (auto& sender : m_transceiverSet->getSenders())
- sender->stop();
</del><ins>+ for (RTCRtpSender& sender : m_transceiverSet->senders())
+ sender.stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::emulatePlatformEvent(const String& action)
</span><span class="lines">@@ -412,7 +419,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::addTransceiver(RefPtr<RTCRtpTransceiver>&& transceiver)
</del><ins>+void RTCPeerConnection::addTransceiver(Ref<RTCRtpTransceiver>&& transceiver)
</ins><span class="cx"> {
</span><span class="cx"> m_transceiverSet->append(WTFMove(transceiver));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> initializeWith(Document&, const Dictionary&);
</span><span class="cx">
</span><del>- const Vector<RefPtr<RTCRtpSender>>& getSenders() const { return m_transceiverSet->getSenders(); }
- const Vector<RefPtr<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->getReceivers(); }
</del><ins>+ const Vector<std::reference_wrapper<RTCRtpSender>>& getSenders() const { return m_transceiverSet->senders(); }
+ const Vector<std::reference_wrapper<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->receivers(); }
</ins><span class="cx"> const Vector<RefPtr<RTCRtpTransceiver>>& getTransceivers() const { return m_transceiverSet->list(); }
</span><span class="cx">
</span><span class="cx"> // Part of legacy MediaStream-based API (mostly implemented as JS built-ins)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> WEBCORE_EXPORT void emulatePlatformEvent(const String& action);
</span><span class="cx">
</span><span class="cx"> // API used by PeerConnectionBackend and relatives
</span><del>- void addTransceiver(RefPtr<RTCRtpTransceiver>&&);
</del><ins>+ void addTransceiver(Ref<RTCRtpTransceiver>&&);
</ins><span class="cx"> void setSignalingState(PeerConnectionStates::SignalingState);
</span><span class="cx"> void updateIceGatheringState(PeerConnectionStates::IceGatheringState);
</span><span class="cx"> void updateIceConnectionState(PeerConnectionStates::IceConnectionState);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpTransceivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -49,11 +49,6 @@
</span><span class="cx"> STRING_FUNCTION(recvonly)
</span><span class="cx"> STRING_FUNCTION(inactive)
</span><span class="cx">
</span><del>-Ref<RTCRtpTransceiver> RTCRtpTransceiver::create(RefPtr<RTCRtpSender>&& sender, RefPtr<RTCRtpReceiver>&& receiver)
-{
- return adoptRef(*new RTCRtpTransceiver(WTFMove(sender), WTFMove(receiver)));
-}
-
</del><span class="cx"> String RTCRtpTransceiver::getNextMid()
</span><span class="cx"> {
</span><span class="cx"> static unsigned mid = 0;
</span><span class="lines">@@ -60,10 +55,10 @@
</span><span class="cx"> return String::number(++mid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCRtpTransceiver::RTCRtpTransceiver(RefPtr<RTCRtpSender>&& sender, RefPtr<RTCRtpReceiver>&& receiver)
</del><ins>+RTCRtpTransceiver::RTCRtpTransceiver(Ref<RTCRtpSender>&& sender, Ref<RTCRtpReceiver>&& receiver)
</ins><span class="cx"> : m_direction(Direction::Sendrecv)
</span><del>- , m_sender(sender)
- , m_receiver(receiver)
</del><ins>+ , m_sender(WTFMove(sender))
+ , m_receiver(WTFMove(receiver))
</ins><span class="cx"> , m_iceTransport(RTCIceTransport::create())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -102,7 +97,7 @@
</span><span class="cx"> m_direction = Direction::Inactive;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RtpTransceiverSet::append(RefPtr<RTCRtpTransceiver>&& transceiver)
</del><ins>+void RtpTransceiverSet::append(Ref<RTCRtpTransceiver>&& transceiver)
</ins><span class="cx"> {
</span><span class="cx"> m_senders.append(transceiver->sender());
</span><span class="cx"> m_receivers.append(transceiver->receiver());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h (208682 => 208683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h 2016-11-14 15:39:43 UTC (rev 208682)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h 2016-11-14 15:46:05 UTC (rev 208683)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> // This enum is mirrored in RTCPeerConnection.h
</span><span class="cx"> enum class Direction { Sendrecv, Sendonly, Recvonly, Inactive };
</span><span class="cx">
</span><del>- static Ref<RTCRtpTransceiver> create(RefPtr<RTCRtpSender>&&, RefPtr<RTCRtpReceiver>&&);
</del><ins>+ static Ref<RTCRtpTransceiver> create(Ref<RTCRtpSender>&& sender, Ref<RTCRtpReceiver>&& receiver) { return adoptRef(*new RTCRtpTransceiver(WTFMove(sender), WTFMove(receiver))); }
</ins><span class="cx"> virtual ~RTCRtpTransceiver() { }
</span><span class="cx">
</span><span class="cx"> bool hasSendingDirection() const;
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx"> const String& mid() const { return m_mid; }
</span><span class="cx"> void setMid(const String& mid) { m_mid = mid; }
</span><span class="cx">
</span><del>- RTCRtpSender* sender() const { return m_sender.get(); }
- RTCRtpReceiver* receiver() const { return m_receiver.get(); }
</del><ins>+ RTCRtpSender& sender() { return m_sender.get(); }
+ RTCRtpReceiver& receiver() { return m_receiver.get(); }
</ins><span class="cx">
</span><span class="cx"> bool stopped() const { return m_stopped; }
</span><span class="cx"> void stop() { m_stopped = true; }
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx"> // FIXME: Temporary solution to keep track of ICE states for this transceiver. Later, each
</span><span class="cx"> // sender and receiver will have up to two DTLS transports, which in turn will have an ICE
</span><span class="cx"> // transport each.
</span><del>- RTCIceTransport& iceTransport() const { return *m_iceTransport; }
</del><ins>+ RTCIceTransport& iceTransport() { return m_iceTransport.get(); }
</ins><span class="cx">
</span><span class="cx"> static String getNextMid();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCRtpTransceiver(RefPtr<RTCRtpSender>&&, RefPtr<RTCRtpReceiver>&&);
</del><ins>+ RTCRtpTransceiver(Ref<RTCRtpSender>&&, Ref<RTCRtpReceiver>&&);
</ins><span class="cx">
</span><span class="cx"> String m_provisionalMid;
</span><span class="cx"> String m_mid;
</span><span class="lines">@@ -85,27 +85,27 @@
</span><span class="cx">
</span><span class="cx"> Direction m_direction;
</span><span class="cx">
</span><del>- RefPtr<RTCRtpSender> m_sender;
- RefPtr<RTCRtpReceiver> m_receiver;
</del><ins>+ Ref<RTCRtpSender> m_sender;
+ Ref<RTCRtpReceiver> m_receiver;
</ins><span class="cx">
</span><span class="cx"> bool m_stopped { false };
</span><span class="cx">
</span><del>- RefPtr<RTCIceTransport> m_iceTransport;
</del><ins>+ Ref<RTCIceTransport> m_iceTransport;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class RtpTransceiverSet {
</span><span class="cx"> public:
</span><span class="cx"> const Vector<RefPtr<RTCRtpTransceiver>>& list() const { return m_transceivers; }
</span><del>- void append(RefPtr<RTCRtpTransceiver>&&);
</del><ins>+ void append(Ref<RTCRtpTransceiver>&&);
</ins><span class="cx">
</span><del>- const Vector<RefPtr<RTCRtpSender>>& getSenders() const { return m_senders; }
- const Vector<RefPtr<RTCRtpReceiver>>& getReceivers() const { return m_receivers; }
</del><ins>+ const Vector<std::reference_wrapper<RTCRtpSender>>& senders() const { return m_senders; }
+ const Vector<std::reference_wrapper<RTCRtpReceiver>>& receivers() const { return m_receivers; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Vector<RefPtr<RTCRtpTransceiver>> m_transceivers;
</span><span class="cx">
</span><del>- Vector<RefPtr<RTCRtpSender>> m_senders;
- Vector<RefPtr<RTCRtpReceiver>> m_receivers;
</del><ins>+ Vector<std::reference_wrapper<RTCRtpSender>> m_senders;
+ Vector<std::reference_wrapper<RTCRtpReceiver>> m_receivers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>