<!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>[167868] 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/167868">167868</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-27 19:37:42 -0700 (Sun, 27 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] .ended shouldn't be part of MediaStream IDL
https://bugs.webkit.org/show_bug.cgi?id=132104
Patch by Praveen R Jadhav <praveen.j@samsung.com> on 2014-04-27
Reviewed by Eric Carlson.
Source/WebCore:
.ended attribute is spec'ed out of MediaStream IDL. Instead, .active
is introduced to handle more scenarios. This patch replaces all 'ended'
attribute calls with corresponding 'active' attributes.
MediaStream-add-remove-tracks.html is updated.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::addTrack): Replaced ended() with active().
(WebCore::MediaStream::removeTrack): setEnded() isn't called. setActive()
is retained which propagates oninactive event.
(WebCore::MediaStream::trackDidEnd): setEnded() isn't called.
(WebCore::MediaStream::removeRemoteSource): Replaced ended() with active().
(WebCore::MediaStream::addRemoteTrack): Replaced ended() with active().
(WebCore::MediaStream::removeRemoteTrack): Replaced ended() with active().
(WebCore::MediaStream::ended): Deleted.
(WebCore::MediaStream::setEnded): Deleted.
(WebCore::MediaStream::streamDidEnd): Deleted.
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/MediaStream.idl:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::didRemoveRemoteStream): Replaced setEnded()
with setActive().
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::MediaStreamPrivate):
(WebCore::MediaStreamPrivate::setActive): Updated comment from bug
https://bugs.webkit.org/show_bug.cgi?id=131973
(WebCore::MediaStreamPrivate::setEnded): Deleted.
* platform/mediastream/MediaStreamPrivate.h:
(WebCore::MediaStreamPrivate::ended): Deleted.
LayoutTests:
.ended is not part of MediaStream IDL. Updated test case.
* 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="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</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 (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/LayoutTests/ChangeLog 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-27 Praveen R Jadhav <praveen.j@samsung.com>
+
+ [MediaStream] .ended shouldn't be part of MediaStream IDL
+ https://bugs.webkit.org/show_bug.cgi?id=132104
+
+ Reviewed by Eric Carlson.
+
+ .ended is not part of MediaStream IDL. Updated test case.
+
+ * fast/mediastream/MediaStream-add-remove-tracks-expected.txt:
+ * fast/mediastream/MediaStream-add-remove-tracks.html:
+
</ins><span class="cx"> 2014-04-27 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (167840): Layout Test fast/events/shadow-event-path[-2].html is failing
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddremovetracksexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks-expected.txt 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> *** remove all tracks, stream.ended should return true
</span><span class="cx"> PASS stream2.getAudioTracks().length is 0
</span><span class="cx"> PASS stream2.getVideoTracks().length is 0
</span><del>-PASS stream2.ended is true
</del><span class="cx">
</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></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddremovetrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -129,7 +129,6 @@
</span><span class="cx"> tryRemoveTrack(stream2, stream2.getVideoTracks()[0]);
</span><span class="cx"> shouldBe('stream2.getAudioTracks().length', '0');
</span><span class="cx"> shouldBe('stream2.getVideoTracks().length', '0');
</span><del>- shouldBeTrue('stream2.ended');
</del><span class="cx">
</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></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-04-27 Praveen R Jadhav <praveen.j@samsung.com>
+
+ [MediaStream] .ended shouldn't be part of MediaStream IDL
+ https://bugs.webkit.org/show_bug.cgi?id=132104
+
+ Reviewed by Eric Carlson.
+
+ .ended attribute is spec'ed out of MediaStream IDL. Instead, .active
+ is introduced to handle more scenarios. This patch replaces all 'ended'
+ attribute calls with corresponding 'active' attributes.
+
+ MediaStream-add-remove-tracks.html is updated.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::addTrack): Replaced ended() with active().
+ (WebCore::MediaStream::removeTrack): setEnded() isn't called. setActive()
+ is retained which propagates oninactive event.
+ (WebCore::MediaStream::trackDidEnd): setEnded() isn't called.
+ (WebCore::MediaStream::removeRemoteSource): Replaced ended() with active().
+ (WebCore::MediaStream::addRemoteTrack): Replaced ended() with active().
+ (WebCore::MediaStream::removeRemoteTrack): Replaced ended() with active().
+ (WebCore::MediaStream::ended): Deleted.
+ (WebCore::MediaStream::setEnded): Deleted.
+ (WebCore::MediaStream::streamDidEnd): Deleted.
+ * Modules/mediastream/MediaStream.h:
+ * Modules/mediastream/MediaStream.idl:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::didRemoveRemoteStream): Replaced setEnded()
+ with setActive().
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::MediaStreamPrivate):
+ (WebCore::MediaStreamPrivate::setActive): Updated comment from bug
+ https://bugs.webkit.org/show_bug.cgi?id=131973
+ (WebCore::MediaStreamPrivate::setEnded): Deleted.
+ * platform/mediastream/MediaStreamPrivate.h:
+ (WebCore::MediaStreamPrivate::ended): Deleted.
+
</ins><span class="cx"> 2014-04-25 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Stop creating a WKWebResourceQuickLookDelegate for every WebResourceLoader
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -114,18 +114,6 @@
</span><span class="cx"> m_private->setClient(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStream::ended() const
-{
- return m_private->ended();
-}
-
-void MediaStream::setEnded()
-{
- if (ended())
- return;
- m_private->setEnded();
-}
-
</del><span class="cx"> bool MediaStream::active() const
</span><span class="cx"> {
</span><span class="cx"> return m_private->active();
</span><span class="lines">@@ -155,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (ended()) {
</del><ins>+ if (!active()) {
</ins><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -190,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (ended()) {
</del><ins>+ if (!active()) {
</ins><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -227,10 +215,8 @@
</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(); // FIXME : to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
</del><ins>+ if (!m_audioTracks.size() && !m_videoTracks.size())
</ins><span class="cx"> setActive(false);
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -279,20 +265,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setEnded(); // FIXME : to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
-
</del><span class="cx"> if (!m_audioTracks.size() && !m_videoTracks.size())
</span><span class="cx"> setActive(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStream::streamDidEnd()
-{
- if (ended())
- return;
-
- scheduleDispatchEvent(Event::create(eventNames().endedEvent, false, false));
-}
-
</del><span class="cx"> void MediaStream::setStreamIsActive(bool streamActive)
</span><span class="cx"> {
</span><span class="cx"> if (streamActive)
</span><span class="lines">@@ -315,7 +291,7 @@
</span><span class="cx"> void MediaStream::removeRemoteSource(MediaStreamSource* source)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(source);
</span><del>- if (ended())
</del><ins>+ if (!active())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>>* tracks = trackVectorForType(source->type());
</span><span class="lines">@@ -337,7 +313,7 @@
</span><span class="cx"> void MediaStream::addRemoteTrack(MediaStreamTrackPrivate* privateTrack)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(privateTrack);
</span><del>- if (ended())
</del><ins>+ if (!active())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrack> track;
</span><span class="lines">@@ -363,7 +339,7 @@
</span><span class="cx"> void MediaStream::removeRemoteTrack(MediaStreamTrackPrivate* privateTrack)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(privateTrack);
</span><del>- if (ended())
</del><ins>+ if (!active())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrack> track = getTrackById(privateTrack->id());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -67,11 +67,8 @@
</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><span class="cx">
</span><del>- bool ended() const;
- void setEnded();
</del><span class="cx"> PassRefPtr<MediaStream> clone();
</span><span class="cx">
</span><del>- DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
</del><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
</span><span class="cx">
</span><span class="lines">@@ -109,7 +106,6 @@
</span><span class="cx">
</span><span class="cx"> // MediaStreamPrivateClient
</span><span class="cx"> virtual void trackDidEnd() override final;
</span><del>- virtual void streamDidEnd() override final;
</del><span class="cx"> virtual void setStreamIsActive(bool) override final;
</span><span class="cx"> virtual void addRemoteSource(MediaStreamSource*) override final;
</span><span class="cx"> virtual void removeRemoteSource(MediaStreamSource*) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.idl (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -42,16 +42,12 @@
</span><span class="cx"> MediaStreamTrack getTrackById(DOMString trackId);
</span><span class="cx"> MediaStream clone();
</span><span class="cx">
</span><del>- readonly attribute boolean ended;
-
- attribute EventListener onended;
- attribute EventListener onaddtrack;
- attribute EventListener onremovetrack;
-
</del><span class="cx"> readonly attribute boolean active;
</span><span class="cx">
</span><span class="cx"> attribute EventListener onactive;
</span><span class="cx"> attribute EventListener oninactive;
</span><ins>+ attribute EventListener onaddtrack;
+ attribute EventListener onremovetrack;
</ins><span class="cx">
</span><span class="cx"> // EventTarget interface
</span><span class="cx"> void addEventListener(DOMString type,
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: this class shouldn't know that the private stream client is a MediaStream!
</span><span class="cx"> RefPtr<MediaStream> stream = static_cast<MediaStream*>(privateStream->client());
</span><del>- stream->setEnded();
</del><ins>+ stream->setActive(false);
</ins><span class="cx">
</span><span class="cx"> if (m_signalingState == SignalingStateClosed)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> MediaStreamPrivate::MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
</span><span class="cx"> : m_client(0)
</span><span class="cx"> , m_id(id)
</span><del>- , m_ended(false)
</del><span class="cx"> , m_isActive(false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_id.length());
</span><span class="lines">@@ -140,11 +139,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned providedSourcesSize = audioSources.size() + videoSources.size();
</span><span class="cx"> unsigned tracksSize = m_audioPrivateTracks.size() + m_videoPrivateTracks.size();
</span><del>- // If sources were provided and no track was added to the MediaStreamPrivate's tracks, this means
- // that the tracks were all ended.
- // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
- if (providedSourcesSize > 0 && !tracksSize)
- m_ended = true;
</del><span class="cx">
</span><span class="cx"> if (providedSourcesSize > 0 && tracksSize > 0)
</span><span class="cx"> m_isActive = true;
</span><span class="lines">@@ -153,7 +147,6 @@
</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><del>- , m_ended(false)
</del><span class="cx"> , m_isActive(false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_id.length());
</span><span class="lines">@@ -165,32 +158,20 @@
</span><span class="cx">
</span><span class="cx"> unsigned providedTracksSize = audioPrivateTracks.size() + videoPrivateTracks.size();
</span><span class="cx"> unsigned tracksSize = m_audioPrivateTracks.size() + m_videoPrivateTracks.size();
</span><del>- // If tracks were provided and no one was added to the MediaStreamPrivate's tracks, this means
- // that the tracks were all ended
- // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
- if (providedTracksSize > 0 && !tracksSize)
- m_ended = true;
</del><span class="cx">
</span><span class="cx"> if (providedTracksSize > 0 && tracksSize > 0)
</span><span class="cx"> m_isActive = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::setEnded()
-{
- if (m_client)
- m_client->streamDidEnd();
-
- m_ended = true;
-}
-
</del><span class="cx"> void MediaStreamPrivate::setActive(bool active)
</span><span class="cx"> {
</span><del>- if (m_isActive != active) {
- m_isActive = active;
</del><ins>+ if (m_isActive == active)
+ return;
</ins><span class="cx">
</span><del>- if (m_client)
- m_client->setStreamIsActive(active);
- }
</del><ins>+ m_isActive = active;
+
+ if (m_client)
+ m_client->setStreamIsActive(active);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::addTrack(PassRefPtr<MediaStreamTrackPrivate> prpTrack)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (167867 => 167868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2014-04-28 02:09:02 UTC (rev 167867)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2014-04-28 02:37:42 UTC (rev 167868)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaStreamPrivateClient() { }
</span><span class="cx">
</span><del>- virtual void streamDidEnd() = 0;
</del><span class="cx"> virtual void setStreamIsActive(bool) = 0;
</span><span class="cx"> virtual void addRemoteSource(MediaStreamSource*) = 0;
</span><span class="cx"> virtual void removeRemoteSource(MediaStreamSource*) = 0;
</span><span class="lines">@@ -87,10 +86,6 @@
</span><span class="cx"> void addRemoteSource(MediaStreamSource*);
</span><span class="cx"> void removeRemoteSource(MediaStreamSource*);
</span><span class="cx">
</span><del>- // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
- bool ended() const { return m_ended; }
- void setEnded();
-
</del><span class="cx"> bool active() const { return m_isActive; }
</span><span class="cx"> void setActive(bool);
</span><span class="cx">
</span><span class="lines">@@ -111,7 +106,6 @@
</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; // Deprecated. to be removed in bug https://bugs.webkit.org/show_bug.cgi?id=132104
</del><span class="cx"> bool m_isActive;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>