<!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>[214207] 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/214207">214207</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2017-03-20 19:51:00 -0700 (Mon, 20 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Follow-up on comments for bug 169664
https://bugs.webkit.org/show_bug.cgi?id=169709
Reviewed by Youenn Fablet.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::deriveAggregatedIceConnectionState): Update deriveAggregatedIceConnectionState.
(WebCore::MediaEndpointPeerConnection::iceTransportStateChanged): Set a capacity and used
uncheckedAppend.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214206 => 214207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-21 02:15:59 UTC (rev 214206)
+++ trunk/Source/WebCore/ChangeLog 2017-03-21 02:51:00 UTC (rev 214207)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-20 Jon Lee <jonlee@apple.com>
+
+ Follow-up on comments for bug 169664
+ https://bugs.webkit.org/show_bug.cgi?id=169709
+
+ Reviewed by Youenn Fablet.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::deriveAggregatedIceConnectionState): Update deriveAggregatedIceConnectionState.
+ (WebCore::MediaEndpointPeerConnection::iceTransportStateChanged): Set a capacity and used
+ uncheckedAppend.
+
</ins><span class="cx"> 2017-03-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a system trace point for memory warning handling
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (214206 => 214207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2017-03-21 02:15:59 UTC (rev 214206)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2017-03-21 02:51:00 UTC (rev 214207)
</span><span class="lines">@@ -806,7 +806,7 @@
</span><span class="cx"> PeerConnectionBackend::doneGatheringCandidates();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RTCIceTransportState deriveAggregatedIceConnectionState(const Vector<RTCIceTransportState>& states)
</del><ins>+static RTCIceConnectionState deriveAggregatedIceConnectionState(const Vector<RTCIceTransportState>& states)
</ins><span class="cx"> {
</span><span class="cx"> unsigned newCount = 0;
</span><span class="cx"> unsigned checkingCount = 0;
</span><span class="lines">@@ -844,25 +844,25 @@
</span><span class="cx">
</span><span class="cx"> // The aggregated RTCIceConnectionState is derived from the RTCIceTransportState of all RTCIceTransports.
</span><span class="cx"> if ((newCount > 0 && !checkingCount && !failedCount && !disconnectedCount) || (closedCount == states.size()))
</span><del>- return RTCIceTransportState::New;
</del><ins>+ return RTCIceConnectionState::New;
</ins><span class="cx">
</span><span class="cx"> if (checkingCount > 0 && !failedCount && !disconnectedCount)
</span><del>- return RTCIceTransportState::Checking;
</del><ins>+ return RTCIceConnectionState::Checking;
</ins><span class="cx">
</span><span class="cx"> if ((connectedCount + completedCount + closedCount) == states.size() && connectedCount > 0)
</span><del>- return RTCIceTransportState::Connected;
</del><ins>+ return RTCIceConnectionState::Connected;
</ins><span class="cx">
</span><span class="cx"> if ((completedCount + closedCount) == states.size() && completedCount > 0)
</span><del>- return RTCIceTransportState::Completed;
</del><ins>+ return RTCIceConnectionState::Completed;
</ins><span class="cx">
</span><span class="cx"> if (failedCount > 0)
</span><del>- return RTCIceTransportState::Failed;
</del><ins>+ return RTCIceConnectionState::Failed;
</ins><span class="cx">
</span><span class="cx"> if (disconnectedCount > 0) // Any failed caught above.
</span><del>- return RTCIceTransportState::Disconnected;
</del><ins>+ return RTCIceConnectionState::Disconnected;
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return RTCIceTransportState::New;
</del><ins>+ return RTCIceConnectionState::New;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaEndpointPeerConnection::iceTransportStateChanged(const String& mid, RTCIceTransportState mediaEndpointIceTransportState)
</span><span class="lines">@@ -877,11 +877,11 @@
</span><span class="cx">
</span><span class="cx"> // Determine if the script needs to be notified.
</span><span class="cx"> Vector<RTCIceTransportState> transportStates;
</span><ins>+ transportStates.reserveInitialCapacity(m_peerConnection.getTransceivers().size());
</ins><span class="cx"> for (auto& transceiver : m_peerConnection.getTransceivers())
</span><del>- transportStates.append(transceiver->iceTransport().state());
</del><ins>+ transportStates.uncheckedAppend(transceiver->iceTransport().state());
</ins><span class="cx">
</span><del>- RTCIceTransportState derivedState = deriveAggregatedIceConnectionState(transportStates);
- m_peerConnection.updateIceConnectionState(static_cast<RTCIceConnectionState>(derivedState));
</del><ins>+ m_peerConnection.updateIceConnectionState(deriveAggregatedIceConnectionState(transportStates));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>