<!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>[159958] 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/159958">159958</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-02 13:41:18 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Use iterator-based loops instead of index-based loops
https://bugs.webkit.org/show_bug.cgi?id=125021
Patch by Roger Zanoni <rogerzanoni@gmail.com> on 2013-12-02
Reviewed by Eric Carlson.
Also, changing iterator variable names from iter to it and
initializing an 'end' variable in each loop instead of evaluating
'collection.end()' multiple times.
No new tests, covered by existing ones.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::cloneMediaStreamTrackVector):
(WebCore::MediaStream::haveTrackWithSource):
(WebCore::MediaStream::getTrackById):
(WebCore::MediaStream::trackDidEnd):
(WebCore::MediaStream::scheduledEventTimerFired):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159957 => 159958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-02 21:15:47 UTC (rev 159957)
+++ trunk/Source/WebCore/ChangeLog 2013-12-02 21:41:18 UTC (rev 159958)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-02 Roger Zanoni <rogerzanoni@gmail.com>
+
+ [MediaStream] Use iterator-based loops instead of index-based loops
+ https://bugs.webkit.org/show_bug.cgi?id=125021
+
+ Reviewed by Eric Carlson.
+
+ Also, changing iterator variable names from iter to it and
+ initializing an 'end' variable in each loop instead of evaluating
+ 'collection.end()' multiple times.
+
+ No new tests, covered by existing ones.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::cloneMediaStreamTrackVector):
+ (WebCore::MediaStream::haveTrackWithSource):
+ (WebCore::MediaStream::getTrackById):
+ (WebCore::MediaStream::trackDidEnd):
+ (WebCore::MediaStream::scheduledEventTimerFired):
+
</ins><span class="cx"> 2013-12-02 Rob Buis <rob.buis@samsung.com>
</span><span class="cx">
</span><span class="cx"> [css shapes] Parse new ellipse shape syntax
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (159957 => 159958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-12-02 21:15:47 UTC (rev 159957)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-12-02 21:41:18 UTC (rev 159958)
</span><span class="lines">@@ -137,8 +137,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaStream::cloneMediaStreamTrackVector(Vector<RefPtr<MediaStreamTrack>>& destination, const Vector<RefPtr<MediaStreamTrack>>& source)
</span><span class="cx"> {
</span><del>- for (unsigned i = 0; i < source.size(); i++)
- destination.append(source[i]->clone());
</del><ins>+ for (auto it = source.begin(), end = source.end(); it != end; ++it)
+ destination.append((*it)->clone());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
</span><span class="lines">@@ -217,15 +217,15 @@
</span><span class="cx"> bool MediaStream::haveTrackWithSource(PassRefPtr<MediaStreamSource> source)
</span><span class="cx"> {
</span><span class="cx"> if (source->type() == MediaStreamSource::Audio) {
</span><del>- for (auto iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
- if ((*iter)->source() == source.get())
</del><ins>+ for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it) {
+ if ((*it)->source() == source.get())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (auto iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
- if ((*iter)->source() == source.get())
</del><ins>+ for (auto it = m_videoTracks.begin(), end = m_videoTracks.end(); it != end; ++it) {
+ if ((*it)->source() == source.get())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -234,14 +234,14 @@
</span><span class="cx">
</span><span class="cx"> MediaStreamTrack* MediaStream::getTrackById(String id)
</span><span class="cx"> {
</span><del>- for (auto iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
- if ((*iter)->id() == id)
- return (*iter).get();
</del><ins>+ for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it) {
+ if ((*it)->id() == id)
+ return (*it).get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- for (auto iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
- if ((*iter)->id() == id)
- return (*iter).get();
</del><ins>+ for (auto it = m_videoTracks.begin(), end = m_videoTracks.end(); it != end; ++it) {
+ if ((*it)->id() == id)
+ return (*it).get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -249,14 +249,15 @@
</span><span class="cx">
</span><span class="cx"> void MediaStream::trackDidEnd()
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < m_audioTracks.size(); ++i)
- if (!m_audioTracks[i]->ended())
</del><ins>+ for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it) {
+ if (!(*it)->ended())
</ins><span class="cx"> return;
</span><del>-
- for (size_t i = 0; i < m_videoTracks.size(); ++i)
- if (!m_videoTracks[i]->ended())
</del><ins>+ }
+ for (auto it = m_videoTracks.begin(), end = m_videoTracks.end(); it != end; ++it) {
+ if (!(*it)->ended())
</ins><span class="cx"> return;
</span><del>-
</del><ins>+ }
+
</ins><span class="cx"> setEnded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,8 +352,7 @@
</span><span class="cx"> Vector<RefPtr<Event>> events;
</span><span class="cx"> events.swap(m_scheduledEvents);
</span><span class="cx">
</span><del>- Vector<RefPtr<Event>>::iterator it = events.begin();
- for (; it != events.end(); ++it)
</del><ins>+ for (auto it = events.begin(), end = events.end(); it != end; ++it)
</ins><span class="cx"> dispatchEvent((*it).release());
</span><span class="cx">
</span><span class="cx"> events.clear();
</span></span></pre>
</div>
</div>
</body>
</html>