<!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>[158470] 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/158470">158470</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-01 18:20:50 -0700 (Fri, 01 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Removing unnecessary early returns in addTrack, removeTrack and removeRemoteSource methods
https://bugs.webkit.org/show_bug.cgi?id=123644

Patch by Thiago de Barros Lacerda &lt;thiago.lacerda@openbossa.org&gt; on 2013-11-01
Reviewed by Eric Carlson.

No new tests needed.

* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::addTrack):
(WebCore::MediaStream::removeTrack):
(WebCore::MediaStream::removeRemoteSource):
(WebCore::MediaStream::trackVectorForType):
* Modules/mediastream/MediaStream.h:</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>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158469 => 158470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-02 01:03:21 UTC (rev 158469)
+++ trunk/Source/WebCore/ChangeLog        2013-11-02 01:20:50 UTC (rev 158470)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-11-01  Thiago de Barros Lacerda  &lt;thiago.lacerda@openbossa.org&gt;
+
+        Removing unnecessary early returns in addTrack, removeTrack and removeRemoteSource methods
+        https://bugs.webkit.org/show_bug.cgi?id=123644
+
+        Reviewed by Eric Carlson.
+
+        No new tests needed.
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::addTrack):
+        (WebCore::MediaStream::removeTrack):
+        (WebCore::MediaStream::removeRemoteSource):
+        (WebCore::MediaStream::trackVectorForType):
+        * Modules/mediastream/MediaStream.h:
+
</ins><span class="cx"> 2013-11-01  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         CSSAspectRatioValue construction helper should return PassRef.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (158469 => 158470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp        2013-11-02 01:03:21 UTC (rev 158469)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp        2013-11-02 01:20:50 UTC (rev 158470)
</span><span class="lines">@@ -163,11 +163,8 @@
</span><span class="cx">     if (getTrackById(track-&gt;id()))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    MediaStreamTrackVector* tracks = getTrackVectorForType(track-&gt;source()-&gt;type());
</del><ins>+    MediaStreamTrackVector* tracks = trackVectorForType(track-&gt;source()-&gt;type());
</ins><span class="cx"> 
</span><del>-    if (!tracks)
-        return false;
-
</del><span class="cx">     tracks-&gt;append(track);
</span><span class="cx">     track-&gt;addObserver(this);
</span><span class="cx">     m_descriptor-&gt;addTrack(&amp;track-&gt;privateTrack());
</span><span class="lines">@@ -194,11 +191,8 @@
</span><span class="cx">     // This is a common part used by removeTrack called by JavaScript
</span><span class="cx">     // and removeRemoteTrack and only removeRemoteTrack must fire removetrack event
</span><span class="cx">     RefPtr&lt;MediaStreamTrack&gt; track = prpTrack;
</span><del>-    MediaStreamTrackVector* tracks = getTrackVectorForType(track-&gt;source()-&gt;type());
</del><ins>+    MediaStreamTrackVector* tracks = trackVectorForType(track-&gt;source()-&gt;type());
</ins><span class="cx"> 
</span><del>-    if (!tracks)
-        return false;
-
</del><span class="cx">     size_t pos = tracks-&gt;find(track);
</span><span class="cx">     if (pos == notFound)
</span><span class="cx">         return false;
</span><span class="lines">@@ -290,11 +284,8 @@
</span><span class="cx">     if (ended())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    Vector&lt;RefPtr&lt;MediaStreamTrack&gt;&gt;* tracks = getTrackVectorForType(source-&gt;type());
</del><ins>+    Vector&lt;RefPtr&lt;MediaStreamTrack&gt;&gt;* tracks = trackVectorForType(source-&gt;type());
</ins><span class="cx"> 
</span><del>-    if (!tracks)
-        return;
-
</del><span class="cx">     for (int i = tracks-&gt;size() - 1; i &gt;= 0; --i) {
</span><span class="cx">         if ((*tracks)[i]-&gt;source() != source)
</span><span class="cx">             continue;
</span><span class="lines">@@ -371,21 +362,17 @@
</span><span class="cx">     return MediaStreamRegistry::registry();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaStreamTrackVector* MediaStream::getTrackVectorForType(MediaStreamSource::Type type)
</del><ins>+MediaStreamTrackVector* MediaStream::trackVectorForType(MediaStreamSource::Type type)
</ins><span class="cx"> {
</span><del>-    MediaStreamTrackVector* tracks = nullptr;
</del><span class="cx">     switch (type) {
</span><span class="cx">     case MediaStreamSource::Audio:
</span><del>-        tracks = &amp;m_audioTracks;
-        break;
</del><ins>+        return &amp;m_audioTracks;
</ins><span class="cx">     case MediaStreamSource::Video:
</span><del>-        tracks = &amp;m_videoTracks;
-        break;
</del><ins>+        return &amp;m_videoTracks;
</ins><span class="cx">     case MediaStreamSource::None:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><del>-        break;
</del><span class="cx">     }
</span><del>-    return tracks;
</del><ins>+    return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (158469 => 158470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h        2013-11-02 01:03:21 UTC (rev 158469)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h        2013-11-02 01:20:50 UTC (rev 158470)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> 
</span><span class="cx">     void cloneMediaStreamTrackVector(MediaStreamTrackVector&amp;, const MediaStreamTrackVector&amp;);
</span><span class="cx"> 
</span><del>-    MediaStreamTrackVector* getTrackVectorForType(MediaStreamSource::Type);
</del><ins>+    MediaStreamTrackVector* trackVectorForType(MediaStreamSource::Type);
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;MediaStreamDescriptor&gt; m_descriptor;
</span><span class="cx">     MediaStreamTrackVector m_audioTracks;
</span></span></pre>
</div>
</div>

</body>
</html>