<!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>[160181] 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/160181">160181</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-05 11:23:03 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Firing negotiationneeded event upon track add/remove on MediaStream
https://bugs.webkit.org/show_bug.cgi?id=125243
Patch by Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> on 2013-12-05
Reviewed by Eric Carlson.
Spec states that: In particular, if an RTCPeerConnection object is consuming a MediaStream on which a track is
added, by, e.g., the addTrack() method being invoked, the RTCPeerConnection object must fire the
"negotiationneeded" event. Removal of media components must also trigger "negotiationneeded".
Source/WebCore:
Existing tests updated.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::addTrack):
(WebCore::MediaStream::removeTrack):
(WebCore::MediaStream::addObserver):
(WebCore::MediaStream::removeObserver):
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::~RTCPeerConnection):
(WebCore::RTCPeerConnection::addStream):
(WebCore::RTCPeerConnection::removeStream):
(WebCore::RTCPeerConnection::didAddOrRemoveTrack):
* Modules/mediastream/RTCPeerConnection.h:
* platform/mock/RTCPeerConnectionHandlerMock.cpp:
(WebCore::RTCPeerConnectionHandlerMock::addStream):
LayoutTests:
* fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt:
* fast/mediastream/RTCPeerConnection-AddRemoveStream.html:
* fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt:
* fast/mediastream/RTCPeerConnection-onnegotiationneeded.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionAddRemoveStreamexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionAddRemoveStreamhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiononnegotiationneededexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiononnegotiationneededhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded.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="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/LayoutTests/ChangeLog 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-05 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [MediaStream] Firing negotiationneeded event upon track add/remove on MediaStream
+ https://bugs.webkit.org/show_bug.cgi?id=125243
+
+ Reviewed by Eric Carlson.
+
+ Spec states that: In particular, if an RTCPeerConnection object is consuming a MediaStream on which a track is
+ added, by, e.g., the addTrack() method being invoked, the RTCPeerConnection object must fire the
+ "negotiationneeded" event. Removal of media components must also trigger "negotiationneeded".
+
+ * fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt:
+ * fast/mediastream/RTCPeerConnection-AddRemoveStream.html:
+ * fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt:
+ * fast/mediastream/RTCPeerConnection-onnegotiationneeded.html:
+
</ins><span class="cx"> 2013-12-05 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Fix inset when only a subset of the arguments are defined
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionAddRemoveStreamexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS Got a stream.
</span><ins>+PASS pc.addStream(stream, {mandatory:{invalid:1}}) threw exception Error: SyntaxError: DOM Exception 12.
+PASS pc.getLocalStreams().length is 0
</ins><span class="cx"> PASS Got another stream.
</span><span class="cx"> PASS stream.id === stream2.id is false
</span><span class="cx"> PASS onAddStream was called.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionAddRemoveStreamhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -11,12 +11,14 @@
</span><span class="cx"> var stream2 = null;
</span><span class="cx"> var pc = null;
</span><span class="cx">
</span><del>- function error() {
</del><ins>+ function error()
+ {
</ins><span class="cx"> testFailed('Stream generation failed.');
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function getUserMedia(dictionary, callback) {
</del><ins>+ function getUserMedia(dictionary, callback)
+ {
</ins><span class="cx"> try {
</span><span class="cx"> navigator.webkitGetUserMedia(dictionary, callback, error);
</span><span class="cx"> } catch (e) {
</span><span class="lines">@@ -25,12 +27,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function onErroneousNegotiationNeeded() {
</del><ins>+ function onErroneousNegotiationNeeded()
+ {
</ins><span class="cx"> testFailed('onErroneousNegotiationNeeded was called.');
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function onRemoveStream(event) {
</del><ins>+ function onRemoveStream(event)
+ {
</ins><span class="cx"> testPassed('onRemoveStream was called.');
</span><span class="cx">
</span><span class="cx"> shouldBe('pc.getLocalStreams().length', '0');
</span><span class="lines">@@ -38,7 +42,8 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function onAddStream(event) {
</del><ins>+ function onAddStream(event)
+ {
</ins><span class="cx"> testPassed('onAddStream was called.');
</span><span class="cx">
</span><span class="cx"> shouldBe('pc.getStreamById(stream.id)', 'stream');
</span><span class="lines">@@ -54,21 +59,28 @@
</span><span class="cx"> pc.removeStream(stream);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function gotStream2(s) {
</del><ins>+ function gotStream2(s)
+ {
</ins><span class="cx"> testPassed('Got another stream.');
</span><span class="cx"> stream2 = s;
</span><span class="cx">
</span><span class="cx"> shouldBeFalse("stream.id === stream2.id");
</span><span class="cx">
</span><del>- pc = new webkitRTCPeerConnection({iceServers:[]});
</del><span class="cx"> pc.onnegotiationneeded = onAddStream;
</span><span class="cx"> pc.addStream(stream);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function gotStream1(s) {
</del><ins>+ function gotStream1(s)
+ {
</ins><span class="cx"> testPassed('Got a stream.');
</span><span class="cx"> stream = s;
</span><span class="cx">
</span><ins>+ pc = new webkitRTCPeerConnection({iceServers:[]});
+ pc.onnegotiationneeded = onErroneousNegotiationNeeded;
+ shouldThrow("pc.addStream(stream, {mandatory:{invalid:1}})");
+
+ shouldBe('pc.getLocalStreams().length', '0');
+
</ins><span class="cx"> getUserMedia({audio:true, video:true}, gotStream2);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiononnegotiationneededexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -5,6 +5,12 @@
</span><span class="cx">
</span><span class="cx"> PASS Got a stream.
</span><span class="cx"> PASS onNegotiationNeeded was called.
</span><ins>+PASS stream.getAudioTracks().length is 1
+PASS stream.getAudioTracks().length is 0
+PASS onNegotiationNeeded was called when track was removed.
+PASS stream.getAudioTracks().length is 0
+PASS stream.getAudioTracks().length is 1
+PASS onNegotiationNeeded was called when track was added.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiononnegotiationneededhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded.html (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded.html 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded.html 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -9,13 +9,16 @@
</span><span class="cx">
</span><span class="cx"> var stream = null;
</span><span class="cx"> var pc = null;
</span><ins>+ var track = null;
</ins><span class="cx">
</span><del>- function error() {
</del><ins>+ function error()
+ {
</ins><span class="cx"> testFailed('Stream generation failed.');
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function getUserMedia(dictionary, callback) {
</del><ins>+ function getUserMedia(dictionary, callback)
+ {
</ins><span class="cx"> try {
</span><span class="cx"> navigator.webkitGetUserMedia(dictionary, callback, error);
</span><span class="cx"> } catch (e) {
</span><span class="lines">@@ -24,13 +27,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function onNegotiationNeeded(event) {
</del><ins>+ function onNegotiationNeeded(event)
+ {
</ins><span class="cx"> testPassed('onNegotiationNeeded was called.');
</span><ins>+ removeTrack();
+ }
</ins><span class="cx">
</span><ins>+ function onNegotiationNeeded2(event)
+ {
+ testPassed('onNegotiationNeeded was called when track was removed.');
+ addTrack();
+ }
+
+ function onNegotiationNeeded3(event)
+ {
+ testPassed('onNegotiationNeeded was called when track was added.');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function gotStream(s) {
</del><ins>+ function gotStream(s)
+ {
</ins><span class="cx"> testPassed('Got a stream.');
</span><span class="cx"> stream = s;
</span><span class="cx">
</span><span class="lines">@@ -40,6 +56,23 @@
</span><span class="cx"> pc.addStream(stream);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function removeTrack()
+ {
+ pc.onnegotiationneeded = onNegotiationNeeded2;
+ shouldBe('stream.getAudioTracks().length', '1');
+ track = stream.getAudioTracks()[0];
+ stream.removeTrack(track);
+ shouldBe('stream.getAudioTracks().length', '0');
+ }
+
+ function addTrack()
+ {
+ pc.onnegotiationneeded = onNegotiationNeeded3;
+ shouldBe('stream.getAudioTracks().length', '0');
+ stream.addTrack(track);
+ shouldBe('stream.getAudioTracks().length', '1');
+ }
+
</ins><span class="cx"> getUserMedia({audio:true, video:true}, gotStream);
</span><span class="cx">
</span><span class="cx"> window.jsTestIsAsync = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/Source/WebCore/ChangeLog 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-05 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [MediaStream] Firing negotiationneeded event upon track add/remove on MediaStream
+ https://bugs.webkit.org/show_bug.cgi?id=125243
+
+ Reviewed by Eric Carlson.
+
+ Spec states that: In particular, if an RTCPeerConnection object is consuming a MediaStream on which a track is
+ added, by, e.g., the addTrack() method being invoked, the RTCPeerConnection object must fire the
+ "negotiationneeded" event. Removal of media components must also trigger "negotiationneeded".
+
+ Existing tests updated.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::addTrack):
+ (WebCore::MediaStream::removeTrack):
+ (WebCore::MediaStream::addObserver):
+ (WebCore::MediaStream::removeObserver):
+ * Modules/mediastream/MediaStream.h:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::~RTCPeerConnection):
+ (WebCore::RTCPeerConnection::addStream):
+ (WebCore::RTCPeerConnection::removeStream):
+ (WebCore::RTCPeerConnection::didAddOrRemoveTrack):
+ * Modules/mediastream/RTCPeerConnection.h:
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp:
+ (WebCore::RTCPeerConnectionHandlerMock::addStream):
+
</ins><span class="cx"> 2013-12-05 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Bad repaints on twitter when the tile cache has a margin
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -153,7 +153,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addTrack(prpTrack);
</del><ins>+ if (addTrack(prpTrack)) {
+ for (auto observer = m_observers.begin(), end = m_observers.end(); observer != end; ++observer)
+ (*observer)->didAddOrRemoveTrack();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack)
</span><span class="lines">@@ -184,7 +187,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- removeTrack(prpTrack);
</del><ins>+ if (removeTrack(prpTrack)) {
+ for (auto observer = m_observers.begin(), end = m_observers.end(); observer != end; ++observer)
+ (*observer)->didAddOrRemoveTrack();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack)
</span><span class="lines">@@ -376,6 +382,19 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStream::addObserver(MediaStream::Observer* observer)
+{
+ if (m_observers.find(observer) == notFound)
+ m_observers.append(observer);
+}
+
+void MediaStream::removeObserver(MediaStream::Observer* observer)
+{
+ size_t pos = m_observers.find(observer);
+ if (pos != notFound)
+ m_observers.remove(pos);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx">
</span><span class="cx"> class MediaStream FINAL : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamPrivateClient, public EventTargetWithInlineData, public ContextDestructionObserver {
</span><span class="cx"> public:
</span><ins>+ class Observer {
+ public:
+ virtual void didAddOrRemoveTrack() = 0;
+ };
+
</ins><span class="cx"> static PassRefPtr<MediaStream> create(ScriptExecutionContext&);
</span><span class="cx"> static PassRefPtr<MediaStream> create(ScriptExecutionContext&, PassRefPtr<MediaStream>);
</span><span class="cx"> static PassRefPtr<MediaStream> create(ScriptExecutionContext&, const Vector<RefPtr<MediaStreamTrack>>&);
</span><span class="lines">@@ -82,6 +87,9 @@
</span><span class="cx"> // URLRegistrable
</span><span class="cx"> virtual URLRegistry& registry() const OVERRIDE;
</span><span class="cx">
</span><ins>+ void addObserver(Observer*);
+ void removeObserver(Observer*);
+
</ins><span class="cx"> protected:
</span><span class="cx"> MediaStream(ScriptExecutionContext&, PassRefPtr<MediaStreamPrivate>);
</span><span class="cx">
</span><span class="lines">@@ -119,6 +127,8 @@
</span><span class="cx">
</span><span class="cx"> Timer<MediaStream> m_scheduledEventTimer;
</span><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span><ins>+
+ Vector<Observer*> m_observers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<MediaStream>> MediaStreamVector;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -165,6 +165,9 @@
</span><span class="cx"> RTCPeerConnection::~RTCPeerConnection()
</span><span class="cx"> {
</span><span class="cx"> stop();
</span><ins>+
+ for (auto stream = m_localStreams.begin(), end = m_localStreams.end(); stream != end; ++stream)
+ (*stream)->removeObserver(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
</span><span class="lines">@@ -383,11 +386,13 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_localStreams.append(stream);
-
</del><span class="cx"> bool valid = m_peerHandler->addStream(stream->privateStream(), constraints);
</span><span class="cx"> if (!valid)
</span><span class="cx"> ec = SYNTAX_ERR;
</span><ins>+ else {
+ m_localStreams.append(stream);
+ stream->addObserver(this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::removeStream(PassRefPtr<MediaStream> prpStream, ExceptionCode& ec)
</span><span class="lines">@@ -409,7 +414,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_localStreams.remove(pos);
</span><del>-
</del><ins>+ stream->removeObserver(this);
</ins><span class="cx"> m_peerHandler->removeStream(stream->privateStream());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -601,6 +606,11 @@
</span><span class="cx"> (*i)->stop();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RTCPeerConnection::didAddOrRemoveTrack()
+{
+ negotiationNeeded();
+}
+
</ins><span class="cx"> void RTCPeerConnection::changeSignalingState(SignalingState signalingState)
</span><span class="cx"> {
</span><span class="cx"> if (m_signalingState != SignalingStateClosed && m_signalingState != signalingState) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> class RTCStatsCallback;
</span><span class="cx"> class VoidCallback;
</span><span class="cx">
</span><del>-class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject {
</del><ins>+class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject, public MediaStream::Observer {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext&, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
</span><span class="cx"> ~RTCPeerConnection();
</span><span class="lines">@@ -127,6 +127,9 @@
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> virtual void stop() OVERRIDE;
</span><span class="cx">
</span><ins>+ // MediaStream::Observer
+ virtual void didAddOrRemoveTrack() OVERRIDE;
+
</ins><span class="cx"> using RefCounted<RTCPeerConnection>::ref;
</span><span class="cx"> using RefCounted<RTCPeerConnection>::deref;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (160180 => 160181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2013-12-05 18:32:44 UTC (rev 160180)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2013-12-05 19:23:03 UTC (rev 160181)
</span><span class="lines">@@ -135,8 +135,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnectionHandlerMock::addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints>)
</del><ins>+bool RTCPeerConnectionHandlerMock::addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints> constraints)
</ins><span class="cx"> {
</span><ins>+ String invalidQuery = MediaConstraintsMock::verifyConstraints(constraints);
+ if (!invalidQuery.isEmpty())
+ return false;
+
</ins><span class="cx"> // Spec states that every time a stream is added, a negotiationneeded event must be fired.
</span><span class="cx"> m_client->negotiationNeeded();
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>