<!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>[200231] 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/200231">200231</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-04-29 00:18:30 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop [UsePointersEvenForNonNullableObjectArguments] from MediaStream interfaces
https://bugs.webkit.org/show_bug.cgi?id=156905
Reviewed by Darin Adler.
Source/WebCore:
Removing UsePointersEvenForNonNullableObjectArguments from MediaStream, RTCPeerConnection and RTCRtpSender.
Updating methods to take references and making some related refactoring.
Test: fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html
Changes also covered by updated tests.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::createOfferTask):
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::create):
(WebCore::MediaStream::addTrack):
(WebCore::MediaStream::removeTrack):
(WebCore::MediaStream::didAddTrack):
(WebCore::MediaStream::didRemoveTrack):
(WebCore::MediaStream::internalAddTrack):
(WebCore::MediaStream::internalRemoveTrack):
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/MediaStream.idl:
* Modules/mediastream/RTCDataChannel.cpp:
(WebCore::RTCDataChannel::send):
* Modules/mediastream/RTCDataChannel.h:
* Modules/mediastream/RTCDataChannel.idl:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::addTrack):
(WebCore::RTCPeerConnection::removeTrack):
(WebCore::RTCPeerConnection::queuedSetLocalDescription):
(WebCore::RTCPeerConnection::queuedSetRemoteDescription):
(WebCore::RTCPeerConnection::queuedAddIceCandidate):
(WebCore::RTCPeerConnection::privateGetStats):
(WebCore::RTCPeerConnection::queuedCreateOffer): Deleted.
(WebCore::RTCPeerConnection::localDescription): Deleted.
(WebCore::RTCPeerConnection::currentLocalDescription): Deleted.
(WebCore::RTCPeerConnection::remoteDescription): Deleted.
(WebCore::RTCPeerConnection::currentRemoteDescription): Deleted.
(WebCore::RTCPeerConnection::signalingState): Deleted.
(WebCore::RTCPeerConnection::createDataChannel): Deleted.
(WebCore::RTCPeerConnection::close): Deleted.
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCPeerConnection.idl:
* Modules/mediastream/RTCRtpReceiver.cpp:
(WebCore::RTCRtpReceiver::RTCRtpReceiver):
* Modules/mediastream/RTCRtpReceiver.h:
(WebCore::RTCRtpReceiver::create):
* Modules/mediastream/RTCRtpSender.cpp:
(WebCore::RTCRtpSender::RTCRtpSender):
(WebCore::RTCRtpSender::replaceTrack):
* Modules/mediastream/RTCRtpSender.h:
(WebCore::RTCRtpSender::create):
* Modules/mediastream/RTCRtpSender.idl:
* Modules/mediastream/RTCRtpSenderReceiverBase.h:
(WebCore::RTCRtpSenderReceiverBase::track):
(WebCore::RTCRtpSenderReceiverBase::RTCRtpSenderReceiverBase):
LayoutTests:
* fast/mediastream/MediaStream-add-remove-null-undefined-tracks-expected.txt: Added.
* fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html: Added.
* fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt: Rebasing.
* fast/mediastream/RTCPeerConnection-add-removeTrack.html: Adding null/undefined tests for addTrack/removeTrack.
* fast/mediastream/RTCPeerConnection-datachannel.html: Adding test for send() method.
Test expectation is not rebased as test is timing out and marked as skip.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionaddremoveTrackexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionaddremoveTrackhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiondatachannelhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</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="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelh">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelidl">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl</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="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpReceivercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpReceiverh">trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderh">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderReceiverBaseh">trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamaddremovenullundefinedtracksexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamaddremovenullundefinedtrackshtml">trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/LayoutTests/ChangeLog 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from MediaStream interfaces
+ https://bugs.webkit.org/show_bug.cgi?id=156905
+
+ Reviewed by Darin Adler.
+
+ * fast/mediastream/MediaStream-add-remove-null-undefined-tracks-expected.txt: Added.
+ * fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html: Added.
+ * fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt: Rebasing.
+ * fast/mediastream/RTCPeerConnection-add-removeTrack.html: Adding null/undefined tests for addTrack/removeTrack.
+ * fast/mediastream/RTCPeerConnection-datachannel.html: Adding test for send() method.
+ Test expectation is not rebased as test is timing out and marked as skip.
+
</ins><span class="cx"> 2016-04-28 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Expose subscript and superscript format style groups using ATK_ROLE_SUBSCRIPT and ATK_ROLE_SUPERSCRIPT
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddremovenullundefinedtracksexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks-expected.txt (0 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks-expected.txt 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Test adding and removing null and undefined tracks.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+Calling addTrack with null and undefined parameters
+PASS stream.addTrack(null); threw exception TypeError: Type error.
+PASS stream.addTrack(undefined); threw exception TypeError: Type error.
+
+Calling removeTrack with null and undefined parameters
+PASS stream.removeTrack(null); threw exception TypeError: Type error.
+PASS stream.removeTrack(undefined); threw exception TypeError: Type error.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddremovenullundefinedtrackshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html (0 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script src="./resources/getUserMedia-helper.js"></script>
+ </head>
+ <body>
+ <p id="description"></p>
+ <div id="console"></div>
+ <script>
+ description("Test adding and removing null and undefined tracks.");
+
+ var stream;
+
+ function gotStream(s) {
+ stream = s;
+
+ debug("<br>Calling addTrack with null and undefined parameters");
+ shouldThrow("stream.addTrack(null);");
+ shouldThrow("stream.addTrack(undefined);");
+
+ debug("<br>Calling removeTrack with null and undefined parameters");
+ shouldThrow("stream.removeTrack(null);");
+ shouldThrow("stream.removeTrack(undefined);");
+
+ finishJSTest();
+ }
+
+ getUserMedia("allow", {audio:true, video:true}, gotStream);
+
+ window.jsTestIsAsync = true;
+ window.successfullyParsed = true;
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionaddremoveTrackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -21,6 +21,10 @@
</span><span class="cx"> PASS senderFromPc2 = pc2.addTrack(track, stream) did not throw exception.
</span><span class="cx"> removeTrack() with 'foreign' sender must be ignored (not throw)
</span><span class="cx"> PASS pc.removeTrack(senderFromPc2) did not throw exception.
</span><ins>+PASS pc.addTrack(null); threw exception TypeError: Type error.
+PASS pc.addTrack(undefined); threw exception TypeError: Type error.
+PASS pc.removeTrack(null); threw exception TypeError: Type error.
+PASS pc.removeTrack(undefined); threw exception TypeError: Type error.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionaddremoveTrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack.html (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack.html 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack.html 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> debug("removeTrack() with 'foreign' sender must be ignored (not throw)");
</span><span class="cx"> shouldNotThrow("pc.removeTrack(senderFromPc2)");
</span><span class="cx">
</span><ins>+ shouldThrow("pc.addTrack(null);");
+ shouldThrow("pc.addTrack(undefined);");
+ shouldThrow("pc.removeTrack(null);");
+ shouldThrow("pc.removeTrack(undefined);");
+
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> })
</span><span class="cx"> .catch(function (error) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiondatachannelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx">
</span><span class="cx"> dc.onmessage = dc_onmessage_string;
</span><span class="cx"> shouldNotThrow("dc.send('xyzzy');");
</span><ins>+
+ shouldThrow("dc.send(null);");
+ shouldThrow("dc.send(undefined);");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function pc_ondatachannel(e) {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/ChangeLog 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2016-04-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from MediaStream interfaces
+ https://bugs.webkit.org/show_bug.cgi?id=156905
+
+ Reviewed by Darin Adler.
+
+ Removing UsePointersEvenForNonNullableObjectArguments from MediaStream, RTCPeerConnection and RTCRtpSender.
+ Updating methods to take references and making some related refactoring.
+
+ Test: fast/mediastream/MediaStream-add-remove-null-undefined-tracks.html
+ Changes also covered by updated tests.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::createOfferTask):
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::create):
+ (WebCore::MediaStream::addTrack):
+ (WebCore::MediaStream::removeTrack):
+ (WebCore::MediaStream::didAddTrack):
+ (WebCore::MediaStream::didRemoveTrack):
+ (WebCore::MediaStream::internalAddTrack):
+ (WebCore::MediaStream::internalRemoveTrack):
+ * Modules/mediastream/MediaStream.h:
+ * Modules/mediastream/MediaStream.idl:
+ * Modules/mediastream/RTCDataChannel.cpp:
+ (WebCore::RTCDataChannel::send):
+ * Modules/mediastream/RTCDataChannel.h:
+ * Modules/mediastream/RTCDataChannel.idl:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::addTrack):
+ (WebCore::RTCPeerConnection::removeTrack):
+ (WebCore::RTCPeerConnection::queuedSetLocalDescription):
+ (WebCore::RTCPeerConnection::queuedSetRemoteDescription):
+ (WebCore::RTCPeerConnection::queuedAddIceCandidate):
+ (WebCore::RTCPeerConnection::privateGetStats):
+ (WebCore::RTCPeerConnection::queuedCreateOffer): Deleted.
+ (WebCore::RTCPeerConnection::localDescription): Deleted.
+ (WebCore::RTCPeerConnection::currentLocalDescription): Deleted.
+ (WebCore::RTCPeerConnection::remoteDescription): Deleted.
+ (WebCore::RTCPeerConnection::currentRemoteDescription): Deleted.
+ (WebCore::RTCPeerConnection::signalingState): Deleted.
+ (WebCore::RTCPeerConnection::createDataChannel): Deleted.
+ (WebCore::RTCPeerConnection::close): Deleted.
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * Modules/mediastream/RTCRtpReceiver.cpp:
+ (WebCore::RTCRtpReceiver::RTCRtpReceiver):
+ * Modules/mediastream/RTCRtpReceiver.h:
+ (WebCore::RTCRtpReceiver::create):
+ * Modules/mediastream/RTCRtpSender.cpp:
+ (WebCore::RTCRtpSender::RTCRtpSender):
+ (WebCore::RTCRtpSender::replaceTrack):
+ * Modules/mediastream/RTCRtpSender.h:
+ (WebCore::RTCRtpSender::create):
+ * Modules/mediastream/RTCRtpSender.idl:
+ * Modules/mediastream/RTCRtpSenderReceiverBase.h:
+ (WebCore::RTCRtpSenderReceiverBase::track):
+ (WebCore::RTCRtpSenderReceiverBase::RTCRtpSenderReceiverBase):
+
</ins><span class="cx"> 2016-04-28 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove extraneous space characters from parameter list for RenderListBox::paintItem()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -139,12 +139,12 @@
</span><span class="cx"> // Add media descriptions for senders.
</span><span class="cx"> for (auto& sender : senders) {
</span><span class="cx"> RefPtr<PeerMediaDescription> mediaDescription = PeerMediaDescription::create();
</span><del>- MediaStreamTrack* track = sender->track();
</del><ins>+ MediaStreamTrack& track = sender->track();
</ins><span class="cx">
</span><span class="cx"> mediaDescription->setMediaStreamId(sender->mediaStreamIds()[0]);
</span><del>- mediaDescription->setMediaStreamTrackId(track->id());
- mediaDescription->setType(track->kind());
- mediaDescription->setPayloads(track->kind() == "audio" ? m_defaultAudioPayloads : m_defaultVideoPayloads);
</del><ins>+ mediaDescription->setMediaStreamTrackId(track.id());
+ mediaDescription->setType(track.kind());
+ mediaDescription->setPayloads(track.kind() == "audio" ? m_defaultAudioPayloads : m_defaultVideoPayloads);
</ins><span class="cx"> mediaDescription->setDtlsFingerprintHashFunction(m_dtlsFingerprintFunction);
</span><span class="cx"> mediaDescription->setDtlsFingerprint(m_dtlsFingerprint);
</span><span class="cx"> mediaDescription->setCname(m_cname);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -47,11 +47,9 @@
</span><span class="cx"> return MediaStream::create(context, MediaStreamPrivate::create(Vector<RefPtr<MediaStreamTrackPrivate>>()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context, MediaStream* stream)
</del><ins>+Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context, MediaStream& stream)
</ins><span class="cx"> {
</span><del>- ASSERT(stream);
-
- return adoptRef(*new MediaStream(context, stream->getTracks()));
</del><ins>+ return adoptRef(*new MediaStream(context, stream.getTracks()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context, const MediaStreamTrackVector& tracks)
</span><span class="lines">@@ -97,7 +95,7 @@
</span><span class="cx"> MediaStreamRegistry::shared().registerStream(*this);
</span><span class="cx">
</span><span class="cx"> for (auto& trackPrivate : m_private->tracks()) {
</span><del>- RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(context, *trackPrivate);
</del><ins>+ auto track = MediaStreamTrack::create(context, *trackPrivate);
</ins><span class="cx"> track->addObserver(this);
</span><span class="cx"> m_trackSet.add(track->id(), WTFMove(track));
</span><span class="cx"> }
</span><span class="lines">@@ -128,18 +126,18 @@
</span><span class="cx"> return MediaStream::create(*scriptExecutionContext(), clonedTracks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStream::addTrack(RefPtr<MediaStreamTrack>&& track)
</del><ins>+void MediaStream::addTrack(MediaStreamTrack& track)
</ins><span class="cx"> {
</span><del>- if (!internalAddTrack(WTFMove(track), StreamModifier::DomAPI))
</del><ins>+ if (!internalAddTrack(track, StreamModifier::DomAPI))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& observer : m_observers)
</span><span class="cx"> observer->didAddOrRemoveTrack();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStream::removeTrack(MediaStreamTrack* track)
</del><ins>+void MediaStream::removeTrack(MediaStreamTrack& track)
</ins><span class="cx"> {
</span><del>- if (!internalRemoveTrack(track, StreamModifier::DomAPI))
</del><ins>+ if (!internalRemoveTrack(track.id(), StreamModifier::DomAPI))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& observer : m_observers)
</span><span class="lines">@@ -203,30 +201,31 @@
</span><span class="cx">
</span><span class="cx"> void MediaStream::didRemoveTrack(MediaStreamTrackPrivate& trackPrivate)
</span><span class="cx"> {
</span><del>- RefPtr<MediaStreamTrack> track = getTrackById(trackPrivate.id());
- ASSERT(track);
- internalRemoveTrack(WTFMove(track), StreamModifier::Platform);
</del><ins>+ internalRemoveTrack(trackPrivate.id(), StreamModifier::Platform);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStream::internalAddTrack(RefPtr<MediaStreamTrack>&& track, StreamModifier streamModifier)
</del><ins>+bool MediaStream::internalAddTrack(Ref<MediaStreamTrack>&& trackToAdd, StreamModifier streamModifier)
</ins><span class="cx"> {
</span><del>- if (getTrackById(track->id()))
</del><ins>+ auto result = m_trackSet.add(trackToAdd->id(), WTFMove(trackToAdd));
+ if (!result.isNewEntry)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_trackSet.add(track->id(), track);
- track->addObserver(this);
</del><ins>+ ASSERT(result.iterator->value);
+ auto& track = *result.iterator->value;
+ track.addObserver(this);
</ins><span class="cx">
</span><span class="cx"> if (streamModifier == StreamModifier::DomAPI)
</span><del>- m_private->addTrack(&track->privateTrack(), MediaStreamPrivate::NotifyClientOption::DontNotify);
</del><ins>+ m_private->addTrack(&track.privateTrack(), MediaStreamPrivate::NotifyClientOption::DontNotify);
</ins><span class="cx"> else
</span><del>- dispatchEvent(MediaStreamTrackEvent::create(eventNames().addtrackEvent, false, false, WTFMove(track)));
</del><ins>+ dispatchEvent(MediaStreamTrackEvent::create(eventNames().addtrackEvent, false, false, &track));
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStream::internalRemoveTrack(RefPtr<MediaStreamTrack>&& track, StreamModifier streamModifier)
</del><ins>+bool MediaStream::internalRemoveTrack(const String& trackId, StreamModifier streamModifier)
</ins><span class="cx"> {
</span><del>- if (!m_trackSet.remove(track->id()))
</del><ins>+ auto track = m_trackSet.take(trackId);
+ if (!track)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> track->removeObserver(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -56,15 +56,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&);
</span><del>- static Ref<MediaStream> create(ScriptExecutionContext&, MediaStream*);
</del><ins>+ static Ref<MediaStream> create(ScriptExecutionContext&, MediaStream&);
</ins><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&, const MediaStreamTrackVector&);
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&, RefPtr<MediaStreamPrivate>&&);
</span><span class="cx"> virtual ~MediaStream();
</span><span class="cx">
</span><span class="cx"> String id() const { return m_private->id(); }
</span><span class="cx">
</span><del>- void addTrack(RefPtr<MediaStreamTrack>&&);
- void removeTrack(MediaStreamTrack*);
</del><ins>+ void addTrack(MediaStreamTrack&);
+ void removeTrack(MediaStreamTrack&);
</ins><span class="cx"> MediaStreamTrack* getTrackById(String);
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackVector getAudioTracks() const;
</span><span class="lines">@@ -118,8 +118,8 @@
</span><span class="cx"> void pageMutedStateDidChange() final;
</span><span class="cx"> MediaProducer::MediaStateFlags mediaState() const final;
</span><span class="cx">
</span><del>- bool internalAddTrack(RefPtr<MediaStreamTrack>&&, StreamModifier);
- bool internalRemoveTrack(RefPtr<MediaStreamTrack>&&, StreamModifier);
</del><ins>+ bool internalAddTrack(Ref<MediaStreamTrack>&&, StreamModifier);
+ bool internalRemoveTrack(const String&, StreamModifier);
</ins><span class="cx">
</span><span class="cx"> void scheduleActiveStateChange();
</span><span class="cx"> void activityEventTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.idl (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> Constructor(MediaStream stream),
</span><span class="cx"> Constructor(MediaStreamTrack[] tracks),
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><span class="cx"> ] interface MediaStream : EventTarget {
</span><span class="cx">
</span><span class="cx"> readonly attribute DOMString id;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -202,20 +202,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(PassRefPtr<ArrayBuffer> prpData, ExceptionCode& ec)
</del><ins>+void RTCDataChannel::send(ArrayBuffer& data, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (m_readyState != ReadyStateOpen) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<ArrayBuffer> data = prpData;
-
- size_t dataLength = data->byteLength();
</del><ins>+ size_t dataLength = data.byteLength();
</ins><span class="cx"> if (!dataLength)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const char* dataPointer = static_cast<const char*>(data->data());
</del><ins>+ const char* dataPointer = static_cast<const char*>(data.data());
</ins><span class="cx">
</span><span class="cx"> if (!m_handler->sendRawData(dataPointer, dataLength)) {
</span><span class="cx"> // FIXME: Decide what the right exception here is.
</span><span class="lines">@@ -223,13 +221,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(PassRefPtr<ArrayBufferView> data, ExceptionCode& ec)
</del><ins>+void RTCDataChannel::send(ArrayBufferView* data, ExceptionCode& ec)
</ins><span class="cx"> {
</span><ins>+ ASSERT(data);
</ins><span class="cx"> RefPtr<ArrayBuffer> arrayBuffer(data->buffer());
</span><del>- send(arrayBuffer.release(), ec);
</del><ins>+ ASSERT(arrayBuffer);
+ send(*arrayBuffer, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCDataChannel::send(PassRefPtr<Blob>, ExceptionCode& ec)
</del><ins>+void RTCDataChannel::send(Blob&, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> void setBinaryType(const AtomicString&, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void send(const String&, ExceptionCode&);
</span><del>- void send(PassRefPtr<JSC::ArrayBuffer>, ExceptionCode&);
- void send(PassRefPtr<JSC::ArrayBufferView>, ExceptionCode&);
- void send(PassRefPtr<Blob>, ExceptionCode&);
</del><ins>+ void send(JSC::ArrayBuffer&, ExceptionCode&);
+ void send(JSC::ArrayBufferView*, ExceptionCode&);
+ void send(Blob&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -23,9 +23,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEB_RTC,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface RTCDataChannel : EventTarget {
</span><span class="cx"> readonly attribute DOMString label;
</span><span class="cx"> readonly attribute boolean ordered;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -101,13 +101,8 @@
</span><span class="cx"> stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpSender> RTCPeerConnection::addTrack(RefPtr<MediaStreamTrack>&& track, Vector<MediaStream*> streams, ExceptionCode& ec)
</del><ins>+RefPtr<RTCRtpSender> RTCPeerConnection::addTrack(Ref<MediaStreamTrack>&& track, Vector<MediaStream*> streams, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!track) {
- ec = TypeError;
- return nullptr;
- }
-
</del><span class="cx"> if (m_signalingState == SignalingState::Closed) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -139,22 +134,17 @@
</span><span class="cx"> return sender;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::removeTrack(RTCRtpSender* sender, ExceptionCode& ec)
</del><ins>+void RTCPeerConnection::removeTrack(RTCRtpSender& sender, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!sender) {
- ec = TypeError;
- return;
- }
-
</del><span class="cx"> if (m_signalingState == SignalingState::Closed) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_senderSet.contains(sender))
</del><ins>+ if (!m_senderSet.contains(&sender))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- sender->stop();
</del><ins>+ sender.stop();
</ins><span class="cx">
</span><span class="cx"> m_backend->markAsNeedingNegotiation();
</span><span class="cx"> }
</span><span class="lines">@@ -194,15 +184,14 @@
</span><span class="cx"> m_backend->createAnswer(*options, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::queuedSetLocalDescription(RTCSessionDescription* description, PeerConnection::VoidPromise&& promise)
</del><ins>+void RTCPeerConnection::queuedSetLocalDescription(RTCSessionDescription& description, PeerConnection::VoidPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == SignalingState::Closed) {
</span><span class="cx"> promise.reject(DOMError::create("InvalidStateError"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(description);
- m_backend->setLocalDescription(*description, WTFMove(promise));
</del><ins>+ m_backend->setLocalDescription(description, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCSessionDescription> RTCPeerConnection::localDescription() const
</span><span class="lines">@@ -220,15 +209,14 @@
</span><span class="cx"> return m_backend->pendingLocalDescription();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::queuedSetRemoteDescription(RTCSessionDescription* description, PeerConnection::VoidPromise&& promise)
</del><ins>+void RTCPeerConnection::queuedSetRemoteDescription(RTCSessionDescription& description, PeerConnection::VoidPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == SignalingState::Closed) {
</span><span class="cx"> promise.reject(DOMError::create("InvalidStateError"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(description);
- m_backend->setRemoteDescription(*description, WTFMove(promise));
</del><ins>+ m_backend->setRemoteDescription(description, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCSessionDescription> RTCPeerConnection::remoteDescription() const
</span><span class="lines">@@ -246,15 +234,14 @@
</span><span class="cx"> return m_backend->pendingRemoteDescription();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::queuedAddIceCandidate(RTCIceCandidate* rtcCandidate, VoidPromise&& promise)
</del><ins>+void RTCPeerConnection::queuedAddIceCandidate(RTCIceCandidate& rtcCandidate, VoidPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == SignalingState::Closed) {
</span><span class="cx"> promise.reject(DOMError::create("InvalidStateError"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(rtcCandidate);
- m_backend->addIceCandidate(*rtcCandidate, WTFMove(promise));
</del><ins>+ m_backend->addIceCandidate(rtcCandidate, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String RTCPeerConnection::signalingState() const
</span><span class="lines">@@ -341,14 +328,14 @@
</span><span class="cx"> m_backend->setConfiguration(*m_configuration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::privateGetStats(MediaStreamTrack* selector, PeerConnection::StatsPromise&& promise)
</del><ins>+void RTCPeerConnection::privateGetStats(MediaStreamTrack& selector, PeerConnection::StatsPromise&& promise)
</ins><span class="cx"> {
</span><del>- m_backend->getStats(selector, WTFMove(promise));
</del><ins>+ m_backend->getStats(&selector, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::privateGetStats(PeerConnection::StatsPromise&& promise)
</span><span class="cx"> {
</span><del>- privateGetStats(nullptr, WTFMove(promise));
</del><ins>+ m_backend->getStats(nullptr, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCDataChannel> RTCPeerConnection::createDataChannel(String, const Dictionary&, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -67,25 +67,25 @@
</span><span class="cx"> Vector<RefPtr<RTCRtpSender>> getSenders() const override { return m_senderSet; }
</span><span class="cx"> Vector<RefPtr<RTCRtpReceiver>> getReceivers() const { return m_receiverSet; }
</span><span class="cx">
</span><del>- RefPtr<RTCRtpSender> addTrack(RefPtr<MediaStreamTrack>&&, Vector<MediaStream*>, ExceptionCode&);
- void removeTrack(RTCRtpSender*, ExceptionCode&);
</del><ins>+ RefPtr<RTCRtpSender> addTrack(Ref<MediaStreamTrack>&&, Vector<MediaStream*>, ExceptionCode&);
+ void removeTrack(RTCRtpSender&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void queuedCreateOffer(const Dictionary& offerOptions, PeerConnection::SessionDescriptionPromise&&);
</span><span class="cx"> void queuedCreateAnswer(const Dictionary& answerOptions, PeerConnection::SessionDescriptionPromise&&);
</span><span class="cx">
</span><del>- void queuedSetLocalDescription(RTCSessionDescription*, PeerConnection::VoidPromise&&);
</del><ins>+ void queuedSetLocalDescription(RTCSessionDescription&, PeerConnection::VoidPromise&&);
</ins><span class="cx"> RefPtr<RTCSessionDescription> localDescription() const;
</span><span class="cx"> RefPtr<RTCSessionDescription> currentLocalDescription() const;
</span><span class="cx"> RefPtr<RTCSessionDescription> pendingLocalDescription() const;
</span><span class="cx">
</span><del>- void queuedSetRemoteDescription(RTCSessionDescription*, PeerConnection::VoidPromise&&);
</del><ins>+ void queuedSetRemoteDescription(RTCSessionDescription&, PeerConnection::VoidPromise&&);
</ins><span class="cx"> RefPtr<RTCSessionDescription> remoteDescription() const;
</span><span class="cx"> RefPtr<RTCSessionDescription> currentRemoteDescription() const;
</span><span class="cx"> RefPtr<RTCSessionDescription> pendingRemoteDescription() const;
</span><span class="cx">
</span><span class="cx"> String signalingState() const;
</span><span class="cx">
</span><del>- void queuedAddIceCandidate(RTCIceCandidate*, PeerConnection::VoidPromise&&);
</del><ins>+ void queuedAddIceCandidate(RTCIceCandidate&, PeerConnection::VoidPromise&&);
</ins><span class="cx">
</span><span class="cx"> String iceGatheringState() const;
</span><span class="cx"> String iceConnectionState() const;
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> RTCConfiguration* getConfiguration() const;
</span><span class="cx"> void setConfiguration(const Dictionary& configuration, ExceptionCode&);
</span><span class="cx">
</span><del>- void privateGetStats(MediaStreamTrack*, PeerConnection::StatsPromise&&);
</del><ins>+ void privateGetStats(MediaStreamTrack&, PeerConnection::StatsPromise&&);
</ins><span class="cx"> void privateGetStats(PeerConnection::StatsPromise&&);
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -31,13 +31,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=WEB_RTC,
</del><span class="cx"> ActiveDOMObject,
</span><del>- CustomConstructor(Dictionary rtcConfiguration),
</del><ins>+ Conditional=WEB_RTC,
</ins><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="cx"> ConstructorRaisesException,
</span><ins>+ CustomConstructor(Dictionary rtcConfiguration),
</ins><span class="cx"> InterfaceName=webkitRTCPeerConnection,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><span class="cx"> ] interface RTCPeerConnection : EventTarget {
</span><span class="cx">
</span><span class="cx"> // Private functions called by runQueuedOperation() (RTCPeerConnectionInternals.js)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpReceivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RTCRtpReceiver::RTCRtpReceiver(RefPtr<MediaStreamTrack>&& track)
</del><ins>+RTCRtpReceiver::RTCRtpReceiver(Ref<MediaStreamTrack>&& track)
</ins><span class="cx"> : RTCRtpSenderReceiverBase(WTFMove(track))
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpReceiverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -39,13 +39,13 @@
</span><span class="cx">
</span><span class="cx"> class RTCRtpReceiver : public RTCRtpSenderReceiverBase {
</span><span class="cx"> public:
</span><del>- static Ref<RTCRtpReceiver> create(RefPtr<MediaStreamTrack>&& track)
</del><ins>+ static Ref<RTCRtpReceiver> create(Ref<MediaStreamTrack>&& track)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new RTCRtpReceiver(WTFMove(track)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RTCRtpReceiver(RefPtr<MediaStreamTrack>&&);
</del><ins>+ explicit RTCRtpReceiver(Ref<MediaStreamTrack>&&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RTCRtpSender::RTCRtpSender(RefPtr<MediaStreamTrack>&& track, Vector<String>&& mediaStreamIds, RTCRtpSenderClient& client)
</del><ins>+RTCRtpSender::RTCRtpSender(Ref<MediaStreamTrack>&& track, Vector<String>&& mediaStreamIds, RTCRtpSenderClient& client)
</ins><span class="cx"> : RTCRtpSenderReceiverBase(WTFMove(track))
</span><span class="cx"> , m_mediaStreamIds(WTFMove(mediaStreamIds))
</span><span class="cx"> , m_client(&client)
</span><span class="lines">@@ -48,24 +48,19 @@
</span><span class="cx"> m_trackId = m_track->id();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCRtpSender::replaceTrack(MediaStreamTrack* withTrack, PeerConnection::VoidPromise&& promise, ExceptionCode& ec)
</del><ins>+void RTCRtpSender::replaceTrack(MediaStreamTrack& withTrack, PeerConnection::VoidPromise&& promise, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!withTrack) {
- ec = TypeError;
- return;
- }
-
</del><span class="cx"> if (!m_client) {
</span><span class="cx"> promise.reject(DOMError::create("InvalidStateError"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_track->kind() != withTrack->kind()) {
</del><ins>+ if (m_track->kind() != withTrack.kind()) {
</ins><span class="cx"> ec = TypeError;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_client->replaceTrack(*this, *withTrack, WTFMove(promise));
</del><ins>+ m_client->replaceTrack(*this, withTrack, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class RTCRtpSender : public RTCRtpSenderReceiverBase {
</span><span class="cx"> public:
</span><del>- static Ref<RTCRtpSender> create(RefPtr<MediaStreamTrack>&& track, Vector<String>&& mediaStreamIds, RTCRtpSenderClient& client)
</del><ins>+ static Ref<RTCRtpSender> create(Ref<MediaStreamTrack>&& track, Vector<String>&& mediaStreamIds, RTCRtpSenderClient& client)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new RTCRtpSender(WTFMove(track), WTFMove(mediaStreamIds), client));
</span><span class="cx"> }
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx">
</span><span class="cx"> void stop() { m_client = nullptr; }
</span><span class="cx">
</span><del>- void replaceTrack(MediaStreamTrack*, PeerConnection::VoidPromise&&, ExceptionCode&);
</del><ins>+ void replaceTrack(MediaStreamTrack&, PeerConnection::VoidPromise&&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCRtpSender(RefPtr<MediaStreamTrack>&&, Vector<String>&& mediaStreamIds, RTCRtpSenderClient&);
</del><ins>+ RTCRtpSender(Ref<MediaStreamTrack>&&, Vector<String>&& mediaStreamIds, RTCRtpSenderClient&);
</ins><span class="cx">
</span><span class="cx"> String m_trackId;
</span><span class="cx"> Vector<String> m_mediaStreamIds;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><span class="cx"> ] interface RTCRtpSender {
</span><span class="cx"> readonly attribute MediaStreamTrack track;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderReceiverBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h (200230 => 200231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h 2016-04-29 06:04:06 UTC (rev 200230)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h 2016-04-29 07:18:30 UTC (rev 200231)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~RTCRtpSenderReceiverBase() { }
</span><span class="cx">
</span><del>- MediaStreamTrack* track() const { return m_track.get(); }
</del><ins>+ MediaStreamTrack& track() { return m_track; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- RTCRtpSenderReceiverBase(RefPtr<MediaStreamTrack>&& track)
- : m_track(track)
</del><ins>+ RTCRtpSenderReceiverBase(Ref<MediaStreamTrack>&& track)
+ : m_track(WTFMove(track))
</ins><span class="cx"> { }
</span><span class="cx">
</span><del>- RefPtr<MediaStreamTrack> m_track;
</del><ins>+ Ref<MediaStreamTrack> m_track;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>