<!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>[167750] 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/167750">167750</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-23 23:37:51 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Implement MediaStream active attribute
https://bugs.webkit.org/show_bug.cgi?id=131973
Patch by Praveen R Jadhav <praveen.j@samsung.com> on 2014-04-23
Reviewed by Eric Carlson.
Source/WebCore:
MediaStream .active attribute are introduced which will replace
.ended attribute. This patch implements the newly introduced attributes.
MediaStream-add-remove-tracks.html is updated to handle this scenario.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::active): Added.
(WebCore::MediaStream::setActive): Added.
(WebCore::MediaStream::addTrack): Propagates 'onactive' event when required.
(WebCore::MediaStream::removeTrack): Propagates 'oninactive' event when required.
(WebCore::MediaStream::trackDidEnd): Propagates 'oninactive' event when required.
(WebCore::MediaStream::streamDidEnd):
(WebCore::MediaStream::setStreamIsActive): Added.
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/MediaStream.idl:
* dom/EventNames.h:
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::MediaStreamPrivate): Initialize .active attribute
(WebCore::MediaStreamPrivate::setEnded):
(WebCore::MediaStreamPrivate::setActive): Added.
* platform/mediastream/MediaStreamPrivate.h:
(WebCore::MediaStreamPrivate::active): Added.
LayoutTests:
MediaStream .onended attribute will be replaced with .active attribute.
Patch updates the test case to verify the .active attribute.
* fast/mediastream/MediaStream-add-remove-tracks-expected.txt:
* fast/mediastream/MediaStream-add-remove-tracks.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamaddremovetracksexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamaddremovetrackshtml">trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html</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>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/LayoutTests/ChangeLog 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-23 Praveen R Jadhav <praveen.j@samsung.com>
+
+ [MediaStream] Implement MediaStream active attribute
+ https://bugs.webkit.org/show_bug.cgi?id=131973
+
+ Reviewed by Eric Carlson.
+
+ MediaStream .onended attribute will be replaced with .active attribute.
+ Patch updates the test case to verify the .active attribute.
+
+ * fast/mediastream/MediaStream-add-remove-tracks-expected.txt:
+ * fast/mediastream/MediaStream-add-remove-tracks.html:
+
</ins><span class="cx"> 2014-04-23 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Eliminate internals.setMockScrollbarsEnabled()
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddremovetracksexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -3,8 +3,10 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS stream1.active is true
</ins><span class="cx"> PASS stream1.getAudioTracks().length is 1
</span><span class="cx"> PASS stream1.getVideoTracks().length is 1
</span><ins>+PASS stream2.active is true
</ins><span class="cx"> PASS stream2.getAudioTracks().length is 1
</span><span class="cx"> PASS stream2.getVideoTracks().length is 1
</span><span class="cx">
</span><span class="lines">@@ -50,6 +52,7 @@
</span><span class="cx"> *** it should be impossible to add a track after the stream has ended
</span><span class="cx"> PASS stream2.addTrack(audioTrack) threw exception Error: InvalidStateError: DOM Exception 11.
</span><span class="cx"> PASS stream2.removeTrack(audioTrack) threw exception Error: InvalidStateError: DOM Exception 11.
</span><ins>+Stream2 is inactive.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddremovetrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -50,18 +50,33 @@
</span><span class="cx"> testFailed("\"addtrack\" or \"removetrack\" events should not fire as a result of local addTrack() or removeTrack() operations.");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function shouldFireActive() {
+ debug("Stream2 is active.");
+ finishJSTest();
+ }
+
+ function shouldFireInActive() {
+ debug("Stream2 is inactive.");
+ finishJSTest();
+ }
+
</ins><span class="cx"> function gotStream2(s) {
</span><span class="cx"> stream2 = s;
</span><span class="cx">
</span><ins>+ shouldBe('stream1.active', 'true');
</ins><span class="cx"> shouldBe('stream1.getAudioTracks().length', '1');
</span><span class="cx"> shouldBe('stream1.getVideoTracks().length', '1');
</span><span class="cx">
</span><ins>+ shouldBe('stream2.active', 'true');
</ins><span class="cx"> shouldBe('stream2.getAudioTracks().length', '1');
</span><span class="cx"> shouldBe('stream2.getVideoTracks().length', '1');
</span><span class="cx">
</span><span class="cx"> stream1.onaddtrack = shouldNotFire;
</span><span class="cx"> stream1.onremovetrack = shouldNotFire;
</span><span class="cx">
</span><ins>+ stream2.onactive = shouldFireActive;
+ stream2.oninactive = shouldFireInActive;
+
</ins><span class="cx"> audioTrack = stream1.getAudioTracks()[0];
</span><span class="cx"> videoTrack = stream1.getVideoTracks()[0];
</span><span class="cx">
</span><span class="lines">@@ -119,8 +134,6 @@
</span><span class="cx"> debug("<br>*** it should be impossible to add a track after the stream has ended");
</span><span class="cx"> shouldThrow('stream2.addTrack(audioTrack)', '"Error: InvalidStateError: DOM Exception 11"');
</span><span class="cx"> shouldThrow('stream2.removeTrack(audioTrack)', '"Error: InvalidStateError: DOM Exception 11"');
</span><del>-
- setTimeout(finishJSTest, 0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function gotStream1(s) {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-04-23 Praveen R Jadhav <praveen.j@samsung.com>
+
+ [MediaStream] Implement MediaStream active attribute
+ https://bugs.webkit.org/show_bug.cgi?id=131973
+
+ Reviewed by Eric Carlson.
+
+ MediaStream .active attribute are introduced which will replace
+ .ended attribute. This patch implements the newly introduced attributes.
+
+ MediaStream-add-remove-tracks.html is updated to handle this scenario.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::active): Added.
+ (WebCore::MediaStream::setActive): Added.
+ (WebCore::MediaStream::addTrack): Propagates 'onactive' event when required.
+ (WebCore::MediaStream::removeTrack): Propagates 'oninactive' event when required.
+ (WebCore::MediaStream::trackDidEnd): Propagates 'oninactive' event when required.
+ (WebCore::MediaStream::streamDidEnd):
+ (WebCore::MediaStream::setStreamIsActive): Added.
+ * Modules/mediastream/MediaStream.h:
+ * Modules/mediastream/MediaStream.idl:
+ * dom/EventNames.h:
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::MediaStreamPrivate): Initialize .active attribute
+ (WebCore::MediaStreamPrivate::setEnded):
+ (WebCore::MediaStreamPrivate::setActive): Added.
+ * platform/mediastream/MediaStreamPrivate.h:
+ (WebCore::MediaStreamPrivate::active): Added.
+
</ins><span class="cx"> 2014-04-23 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] fix CF leaks found by code inspection
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -126,6 +126,18 @@
</span><span class="cx"> m_private->setEnded();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaStream::active() const
+{
+ return m_private->active();
+}
+
+void MediaStream::setActive(bool isActive)
+{
+ if (active() == isActive)
+ return;
+ m_private->setActive(isActive);
+}
+
</ins><span class="cx"> PassRefPtr<MediaStream> MediaStream::clone()
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>> trackSet;
</span><span class="lines">@@ -172,6 +184,7 @@
</span><span class="cx"> tracks->append(track);
</span><span class="cx"> track->addObserver(this);
</span><span class="cx"> m_private->addTrack(&track->privateTrack());
</span><ins>+ setActive(true);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -214,8 +227,10 @@
</span><span class="cx"> m_private->removeSource(track->source());
</span><span class="cx">
</span><span class="cx"> track->removeObserver(this);
</span><del>- if (!m_audioTracks.size() && !m_videoTracks.size())
- setEnded();
</del><ins>+ if (!m_audioTracks.size() && !m_videoTracks.size()) {
+ setEnded(); // FIXME : to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
+ setActive(false);
+ }
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -264,7 +279,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setEnded();
</del><ins>+ setEnded(); // FIXME : to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
+
+ if (!m_audioTracks.size() && !m_videoTracks.size())
+ setActive(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStream::streamDidEnd()
</span><span class="lines">@@ -275,6 +293,14 @@
</span><span class="cx"> scheduleDispatchEvent(Event::create(eventNames().endedEvent, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStream::setStreamIsActive(bool streamActive)
+{
+ if (streamActive)
+ scheduleDispatchEvent(Event::create(eventNames().activeEvent, false, false));
+ else
+ scheduleDispatchEvent(Event::create(eventNames().inactiveEvent, false, false));
+}
+
</ins><span class="cx"> void MediaStream::contextDestroyed()
</span><span class="cx"> {
</span><span class="cx"> ContextDestructionObserver::contextDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -75,6 +75,12 @@
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
</span><span class="cx">
</span><ins>+ bool active() const;
+ void setActive(bool);
+
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(active);
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);
+
</ins><span class="cx"> MediaStreamPrivate* privateStream() const { return m_private.get(); }
</span><span class="cx">
</span><span class="cx"> // EventTarget
</span><span class="lines">@@ -104,6 +110,7 @@
</span><span class="cx"> // MediaStreamPrivateClient
</span><span class="cx"> virtual void trackDidEnd() override final;
</span><span class="cx"> virtual void streamDidEnd() override final;
</span><ins>+ virtual void setStreamIsActive(bool) override final;
</ins><span class="cx"> virtual void addRemoteSource(MediaStreamSource*) override final;
</span><span class="cx"> virtual void removeRemoteSource(MediaStreamSource*) override final;
</span><span class="cx"> virtual void addRemoteTrack(MediaStreamTrackPrivate*) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.idl (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -48,6 +48,11 @@
</span><span class="cx"> attribute EventListener onaddtrack;
</span><span class="cx"> attribute EventListener onremovetrack;
</span><span class="cx">
</span><ins>+ readonly attribute boolean active;
+
+ attribute EventListener onactive;
+ attribute EventListener oninactive;
+
</ins><span class="cx"> // EventTarget interface
</span><span class="cx"> void addEventListener(DOMString type,
</span><span class="cx"> EventListener listener,
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/dom/EventNames.h 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -163,6 +163,8 @@
</span><span class="cx"> macro(volumechange) \
</span><span class="cx"> macro(waiting) \
</span><span class="cx"> \
</span><ins>+ macro(active) \
+ macro(inactive) \
</ins><span class="cx"> macro(addtrack) \
</span><span class="cx"> macro(cuechange) \
</span><span class="cx"> macro(enter) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> : m_client(0)
</span><span class="cx"> , m_id(id)
</span><span class="cx"> , m_ended(false)
</span><ins>+ , m_isActive(false)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_id.length());
</span><span class="cx"> for (size_t i = 0; i < audioSources.size(); i++)
</span><span class="lines">@@ -140,15 +141,20 @@
</span><span class="cx"> unsigned providedSourcesSize = audioSources.size() + videoSources.size();
</span><span class="cx"> unsigned tracksSize = m_audioPrivateTracks.size() + m_videoPrivateTracks.size();
</span><span class="cx"> // If sources were provided and no track was added to the MediaStreamPrivate's tracks, this means
</span><del>- // that the tracks were all ended
</del><ins>+ // that the tracks were all ended.
+ // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
</ins><span class="cx"> if (providedSourcesSize > 0 && !tracksSize)
</span><span class="cx"> m_ended = true;
</span><ins>+
+ if (providedSourcesSize > 0 && tracksSize > 0)
+ m_isActive = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamPrivate::MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks)
</span><span class="cx"> : m_client(0)
</span><span class="cx"> , m_id(id)
</span><span class="cx"> , m_ended(false)
</span><ins>+ , m_isActive(false)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_id.length());
</span><span class="cx"> for (size_t i = 0; i < audioPrivateTracks.size(); i++)
</span><span class="lines">@@ -161,8 +167,12 @@
</span><span class="cx"> unsigned tracksSize = m_audioPrivateTracks.size() + m_videoPrivateTracks.size();
</span><span class="cx"> // If tracks were provided and no one was added to the MediaStreamPrivate's tracks, this means
</span><span class="cx"> // that the tracks were all ended
</span><ins>+ // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
</ins><span class="cx"> if (providedTracksSize > 0 && !tracksSize)
</span><span class="cx"> m_ended = true;
</span><ins>+
+ if (providedTracksSize > 0 && tracksSize > 0)
+ m_isActive = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::setEnded()
</span><span class="lines">@@ -173,6 +183,16 @@
</span><span class="cx"> m_ended = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStreamPrivate::setActive(bool active)
+{
+ if (m_isActive != active) {
+ m_isActive = active;
+
+ if (m_client)
+ m_client->setStreamIsActive(active);
+ }
+}
+
</ins><span class="cx"> void MediaStreamPrivate::addTrack(PassRefPtr<MediaStreamTrackPrivate> prpTrack)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamTrackPrivate> track = prpTrack;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (167749 => 167750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2014-04-24 05:16:45 UTC (rev 167749)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2014-04-24 06:37:51 UTC (rev 167750)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> virtual ~MediaStreamPrivateClient() { }
</span><span class="cx">
</span><span class="cx"> virtual void streamDidEnd() = 0;
</span><ins>+ virtual void setStreamIsActive(bool) = 0;
</ins><span class="cx"> virtual void addRemoteSource(MediaStreamSource*) = 0;
</span><span class="cx"> virtual void removeRemoteSource(MediaStreamSource*) = 0;
</span><span class="cx"> virtual void addRemoteTrack(MediaStreamTrackPrivate*) = 0;
</span><span class="lines">@@ -86,9 +87,13 @@
</span><span class="cx"> void addRemoteSource(MediaStreamSource*);
</span><span class="cx"> void removeRemoteSource(MediaStreamSource*);
</span><span class="cx">
</span><ins>+ // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
</ins><span class="cx"> bool ended() const { return m_ended; }
</span><span class="cx"> void setEnded();
</span><span class="cx">
</span><ins>+ bool active() const { return m_isActive; }
+ void setActive(bool);
+
</ins><span class="cx"> void addTrack(PassRefPtr<MediaStreamTrackPrivate>);
</span><span class="cx"> void removeTrack(PassRefPtr<MediaStreamTrackPrivate>);
</span><span class="cx">
</span><span class="lines">@@ -106,7 +111,8 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<MediaStreamTrackPrivate>> m_audioPrivateTracks;
</span><span class="cx"> Vector<RefPtr<MediaStreamTrackPrivate>> m_videoPrivateTracks;
</span><del>- bool m_ended;
</del><ins>+ bool m_ended; // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
+ bool m_isActive;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<MediaStreamPrivate>> MediaStreamPrivateVector;
</span></span></pre>
</div>
</div>
</body>
</html>