<!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>[169743] 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/169743">169743</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-10 03:17:16 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Add getTracks() support to MediaStream.
https://bugs.webkit.org/show_bug.cgi?id=133641
Patch by Kiran <kiran.guduru@samsung.com> on 2014-06-10
Reviewed by Eric Carlson.
Source/WebCore:
A new method named getTracks is proposed to retrieve all the tracks
of a MediaStream irrespective of the type. This method has been implementd.
Test: fast/mediastream/MediaStream-getTracks.html
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::getTracks):
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/MediaStream.idl:
LayoutTests:
* fast/mediastream/MediaStream-getTracks-expected.txt: Added.
* fast/mediastream/MediaStream-getTracks.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamidl">trunk/Source/WebCore/Modules/mediastream/MediaStream.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamgetTracksexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-getTracks-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamgetTrackshtml">trunk/LayoutTests/fast/mediastream/MediaStream-getTracks.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169742 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-10 05:49:57 UTC (rev 169742)
+++ trunk/LayoutTests/ChangeLog 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-10 Kiran <kiran.guduru@samsung.com>
+
+ [MediaStream] Add getTracks() support to MediaStream.
+ https://bugs.webkit.org/show_bug.cgi?id=133641
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/MediaStream-getTracks-expected.txt: Added.
+ * fast/mediastream/MediaStream-getTracks.html: Added.
+
</ins><span class="cx"> 2014-06-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Work towards having frames in the scrolling tree
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamgetTracksexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-getTracks-expected.txt (0 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-getTracks-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-getTracks-expected.txt 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Test adding tracks to inactive MediaStream.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS stream1.getTracks().length is 2
+PASS stream2.getTracks().length is 2
+PASS track added to stream.
+PASS stream2.getAudioTracks().length is 2
+PASS stream2.getVideoTracks().length is 1
+PASS stream2.getTracks().length is 3
+PASS track added to stream.
+PASS stream2.getAudioTracks().length is 2
+PASS stream2.getVideoTracks().length is 2
+PASS stream2.getTracks().length is 4
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamgetTrackshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-getTracks.html (0 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-getTracks.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-getTracks.html 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -0,0 +1,83 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+
+ var stream1;
+ var stream2;
+ var audioTrack;
+ var videoTrack;
+
+ function error()
+ {
+ testFailed('Stream generation failed.');
+ finishJSTest();
+ }
+
+ function getUserMedia(dictionary, callback)
+ {
+ try {
+ navigator.webkitGetUserMedia(dictionary, callback, error);
+ } catch (e) {
+ testFailed('webkitGetUserMedia threw exception :' + e);
+ finishJSTest();
+ }
+ }
+
+ function tryAddTrack(stream, track)
+ {
+ try {
+ stream.addTrack(track);
+ testPassed("track added to stream.");
+ } catch (exception) {
+ testFailed("addTrack threw an exception.");
+ finishJSTest();
+ }
+ }
+
+ function createStreamAndAddTracks()
+ {
+ shouldBe('stream2.getTracks().length', '2');
+ audioTrack = stream1.getAudioTracks()[0];
+ tryAddTrack(stream2, audioTrack);
+ shouldBe('stream2.getAudioTracks().length', '2');
+ shouldBe('stream2.getVideoTracks().length', '1');
+ shouldBe('stream2.getTracks().length', '3');
+ videoTrack = stream1.getVideoTracks()[0];
+ tryAddTrack(stream2, videoTrack);
+ shouldBe('stream2.getAudioTracks().length', '2');
+ shouldBe('stream2.getVideoTracks().length', '2');
+ shouldBe('stream2.getTracks().length', '4');
+
+ finishJSTest();
+ }
+
+ function gotStream2(s)
+ {
+ stream2 = s;
+ createStreamAndAddTracks();
+ }
+
+ function gotStream1(s)
+ {
+ stream1 = s;
+ shouldBe('stream1.getTracks().length', '2');
+ getUserMedia({audio:true, video:true}, gotStream2);
+ }
+
+ function startMedia()
+ {
+ description("Test adding tracks to inactive MediaStream.");
+ getUserMedia({audio:true, video:true}, gotStream1);
+ }
+ window.jsTestIsAsync = true;
+ window.successfullyParsed = true;
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </head>
+ <body onload="startMedia()">
+ <p id="description"></p>
+ <div id="console"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169742 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-10 05:49:57 UTC (rev 169742)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-10 Kiran <kiran.guduru@samsung.com>
+
+ [MediaStream] Add getTracks() support to MediaStream.
+ https://bugs.webkit.org/show_bug.cgi?id=133641
+
+ Reviewed by Eric Carlson.
+
+ A new method named getTracks is proposed to retrieve all the tracks
+ of a MediaStream irrespective of the type. This method has been implementd.
+
+ Test: fast/mediastream/MediaStream-getTracks.html
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::getTracks):
+ * Modules/mediastream/MediaStream.h:
+ * Modules/mediastream/MediaStream.idl:
+
</ins><span class="cx"> 2014-06-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove use of view() in RenderView code
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (169742 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2014-06-10 05:49:57 UTC (rev 169742)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -249,6 +249,17 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<RefPtr<MediaStreamTrack>> MediaStream::getTracks()
+{
+ Vector<RefPtr<MediaStreamTrack>> tracks;
+ for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it)
+ tracks.append((*it).get());
+ for (auto it = m_videoTracks.begin(), end = m_videoTracks.end(); it != end; ++it)
+ tracks.append((*it).get());
+
+ return tracks;
+}
+
</ins><span class="cx"> void MediaStream::trackDidEnd()
</span><span class="cx"> {
</span><span class="cx"> for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (169742 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-06-10 05:49:57 UTC (rev 169742)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>> getAudioTracks() const { return m_audioTracks; }
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>> getVideoTracks() const { return m_videoTracks; }
</span><ins>+ Vector<RefPtr<MediaStreamTrack>> getTracks();
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<MediaStream> clone();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.idl (169742 => 169743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2014-06-10 05:49:57 UTC (rev 169742)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2014-06-10 10:17:16 UTC (rev 169743)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> sequence<MediaStreamTrack> getAudioTracks();
</span><span class="cx"> sequence<MediaStreamTrack> getVideoTracks();
</span><ins>+ sequence<MediaStreamTrack> getTracks();
</ins><span class="cx">
</span><span class="cx"> [RaisesException] void addTrack(MediaStreamTrack track);
</span><span class="cx"> [RaisesException] void removeTrack(MediaStreamTrack track);
</span></span></pre>
</div>
</div>
</body>
</html>