<!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>[164839] 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/164839">164839</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-02-27 15:58:28 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Removing MediaConstraints argument from RTCPeerConnection addStream, updateIce methods and constructor
https://bugs.webkit.org/show_bug.cgi?id=129449
Reviewed by Eric Carlson.
According to WebRTC editor's draft, MediaConstraints will no longer be an argument of those methods and
constructor.
Source/WebCore:
Existing tests were updated.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::create):
(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::updateIce):
(WebCore::RTCPeerConnection::addStream):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCPeerConnection.idl:
* bindings/js/JSRTCPeerConnectionCustom.cpp:
(WebCore::JSRTCPeerConnectionConstructor::constructJSRTCPeerConnection):
* platform/mediastream/RTCPeerConnectionHandler.h:
* platform/mock/RTCPeerConnectionHandlerMock.cpp:
(WebCore::RTCPeerConnectionHandlerMock::initialize):
(WebCore::RTCPeerConnectionHandlerMock::updateIce):
(WebCore::RTCPeerConnectionHandlerMock::addStream):
* platform/mock/RTCPeerConnectionHandlerMock.h:
LayoutTests:
* fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt:
* fast/mediastream/RTCPeerConnection-AddRemoveStream.html:
* fast/mediastream/RTCPeerConnection-expected.txt:
* fast/mediastream/RTCPeerConnection.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="#trunkLayoutTestsfastmediastreamRTCPeerConnectionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorebindingsjsJSRTCPeerConnectionCustomcpp">trunk/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-27 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Removing MediaConstraints argument from RTCPeerConnection addStream, updateIce methods and constructor
+ https://bugs.webkit.org/show_bug.cgi?id=129449
+
+ Reviewed by Eric Carlson.
+
+ According to WebRTC editor's draft, MediaConstraints will no longer be an argument of those methods and
+ constructor.
+
+ * fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt:
+ * fast/mediastream/RTCPeerConnection-AddRemoveStream.html:
+ * fast/mediastream/RTCPeerConnection-expected.txt:
+ * fast/mediastream/RTCPeerConnection.html:
+
</ins><span class="cx"> 2014-02-27 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: model tests should use a special Test.html inspector page
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionAddRemoveStreamexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS Got a stream.
</span><del>-PASS pc.addStream(stream, {mandatory:{invalid:1}}) threw exception Error: SyntaxError: DOM Exception 12.
</del><ins>+PASS pc.addStream(null) threw exception Error: TypeMismatchError: DOM Exception 17.
</ins><span class="cx"> PASS pc.getLocalStreams().length is 0
</span><span class="cx"> PASS Got another stream.
</span><span class="cx"> PASS stream.id === stream2.id is false
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionAddRemoveStreamhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
</span><span class="cx"> pc.onnegotiationneeded = onErroneousNegotiationNeeded;
</span><del>- shouldThrow("pc.addStream(stream, {mandatory:{invalid:1}})");
</del><ins>+ shouldThrow("pc.addStream(null)");
</ins><span class="cx">
</span><span class="cx"> shouldBe('pc.getLocalStreams().length', '0');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -3,32 +3,17 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS new webkitRTCPeerConnection(null); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection(null, null); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection(undefined); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection(undefined, undefined); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
</del><ins>+PASS new webkitRTCPeerConnection(null); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
+PASS new webkitRTCPeerConnection(undefined); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
</ins><span class="cx"> PASS new webkitRTCPeerConnection(); threw exception TypeError: Not enough arguments.
</span><del>-PASS new webkitRTCPeerConnection(''); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection(null, ''); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
</del><ins>+PASS new webkitRTCPeerConnection(''); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
</ins><span class="cx"> PASS new webkitRTCPeerConnection({}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
</span><del>-PASS new webkitRTCPeerConnection({}, ''); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({}, {}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection('', {}); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection(null, {}); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection(undefined, {}); threw exception TypeError: First argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]}, null); threw exception TypeError: Optional constraints argument of RTCPeerConnection must be a valid Dictionary.
</del><ins>+PASS new webkitRTCPeerConnection({iceServers:[]}); threw exception TypeError: Error creating RTCPeerConnection.
</ins><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'http:foo.com'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span><del>-PASS new webkitRTCPeerConnection({iceServers:[]}); threw exception TypeError: Error creating RTCPeerConnection.
</del><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}); did not throw exception.
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:foo.com']}]}); did not throw exception.
</span><ins>+PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:foo.com', 'turn:bar.com']}]}); did not throw exception.
</ins><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'none'}); did not throw exception.
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'relay'}); did not throw exception.
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'all'}); did not throw exception.
</span><span class="lines">@@ -47,48 +32,22 @@
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'all', requestIdentity:'yes'}); did not throw exception.
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'all', requestIdentity:'no'}); did not throw exception.
</span><span class="cx"> PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
</span><del>-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:bar.com']}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:foo.com', 'turn:bar.com']}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}]}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {}); did not throw exception.
-PASS new webkitRTCPeerConnection({fooServers:[]}, {}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection({iceServers:true}, {}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, {}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection({iceServers:[{}]}, {}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'foo'}]}, {}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {mandatory:true}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:false}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:{}}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {mandatory:{valid_and_supported_1:1}}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:[{valid_and_supported_1:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {mandatory:{valid_and_supported_1:1}}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {optional:[{valid_and_supported_1:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{valid_and_supported_1:66}}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{invalid:1}}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{valid_but_unsupported_1:1}}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {optional:{valid_and_supported_1:0}}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {optional:[{invalid:0}]}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {valid_and_supported_1:1}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {valid_but_unsupported_1:1}); threw exception TypeError: Error creating RTCPeerConnection.
-PASS new webkitRTCPeerConnection({iceServers:[]}, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception TypeError: Error creating RTCPeerConnection.
</del><ins>+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}]}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}]}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}]}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}]}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}]}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
+PASS new webkitRTCPeerConnection({fooServers:[]}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
+PASS new webkitRTCPeerConnection({iceServers:true}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
+PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
+PASS new webkitRTCPeerConnection({iceServers:[{}]}); threw exception TypeError: Error creating RTCPeerConnection.
+PASS new webkitRTCPeerConnection({iceServers:[{urls:'foo'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -8,32 +8,17 @@
</span><span class="cx"> description("Tests the RTCPeerConnection constructor.");
</span><span class="cx">
</span><span class="cx"> shouldThrow("new webkitRTCPeerConnection(null);");
</span><del>- shouldThrow("new webkitRTCPeerConnection(null, null);");
</del><span class="cx"> shouldThrow("new webkitRTCPeerConnection(undefined);");
</span><del>- shouldThrow("new webkitRTCPeerConnection(undefined, undefined);");
</del><span class="cx"> shouldThrow("new webkitRTCPeerConnection();");
</span><span class="cx"> shouldThrow("new webkitRTCPeerConnection('');");
</span><del>- shouldThrow("new webkitRTCPeerConnection(null, '');");
</del><span class="cx"> shouldThrow("new webkitRTCPeerConnection({});");
</span><del>- shouldThrow("new webkitRTCPeerConnection({}, '');");
- shouldThrow("new webkitRTCPeerConnection({}, null);");
- shouldThrow("new webkitRTCPeerConnection({}, {});");
- shouldThrow("new webkitRTCPeerConnection('', {});");
- shouldThrow("new webkitRTCPeerConnection(null, {});");
- shouldThrow("new webkitRTCPeerConnection(undefined, {});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, null);");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, null);");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}]}, null);");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null);");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}]}, null);");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}]}, null);");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]}, null);")
</del><ins>+ shouldThrow("new webkitRTCPeerConnection({iceServers:[]});");
</ins><span class="cx"> shouldThrow("new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]});");
</span><span class="cx"> shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'http:foo.com'}]});");
</span><del>- shouldThrow("new webkitRTCPeerConnection({iceServers:[]});");
</del><span class="cx">
</span><span class="cx"> shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});");
</span><span class="cx"> shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:foo.com']}]});");
</span><ins>+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:foo.com', 'turn:bar.com']}]});");
</ins><span class="cx">
</span><span class="cx"> shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'none'});");
</span><span class="cx"> shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'relay'});");
</span><span class="lines">@@ -54,53 +39,24 @@
</span><span class="cx"> shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'all', requestIdentity:'no'});");
</span><span class="cx"> shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
</span><span class="cx">
</span><del>- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:bar.com']}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:foo.com', 'turn:bar.com']}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}]}, {});");
</del><ins>+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}]});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}]});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}]});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}]});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}]});");
</ins><span class="cx">
</span><del>- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}, {});");
</del><ins>+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', credential:'x'},{urls:'stun:bar.com'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
+ shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
</ins><span class="cx">
</span><del>- shouldThrow("new webkitRTCPeerConnection({fooServers:[]}, {});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:true}, {});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, {});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{}]}, {});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'foo'}]}, {});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {mandatory:true});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:false});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:{}});");
-
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {mandatory:{valid_and_supported_1:1}});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:[{valid_and_supported_1:0}]});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]});");
-
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {mandatory:{valid_and_supported_1:1}});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {optional:[{valid_and_supported_1:0}]});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]});");
- shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}, {urls:['stun:bar.com', 'turn:foo.com']}]}, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]});");
-
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{valid_and_supported_1:66}});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{invalid:1}});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{valid_but_unsupported_1:1}});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {optional:{valid_and_supported_1:0}});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {optional:[{invalid:0}]});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {valid_and_supported_1:1});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {valid_but_unsupported_1:1});");
- shouldThrow("new webkitRTCPeerConnection({iceServers:[]}, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}});");
</del><ins>+ shouldThrow("new webkitRTCPeerConnection({fooServers:[]});");
+ shouldThrow("new webkitRTCPeerConnection({iceServers:true});");
+ shouldThrow("new webkitRTCPeerConnection({iceServers:[1, 2, 3]});");
+ shouldThrow("new webkitRTCPeerConnection({iceServers:[{}]});");
+ shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:'foo'}]});");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-27 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Removing MediaConstraints argument from RTCPeerConnection addStream, updateIce methods and constructor
+ https://bugs.webkit.org/show_bug.cgi?id=129449
+
+ Reviewed by Eric Carlson.
+
+ According to WebRTC editor's draft, MediaConstraints will no longer be an argument of those methods and
+ constructor.
+
+ Existing tests were updated.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::create):
+ (WebCore::RTCPeerConnection::RTCPeerConnection):
+ (WebCore::RTCPeerConnection::updateIce):
+ (WebCore::RTCPeerConnection::addStream):
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * bindings/js/JSRTCPeerConnectionCustom.cpp:
+ (WebCore::JSRTCPeerConnectionConstructor::constructJSRTCPeerConnection):
+ * platform/mediastream/RTCPeerConnectionHandler.h:
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp:
+ (WebCore::RTCPeerConnectionHandlerMock::initialize):
+ (WebCore::RTCPeerConnectionHandlerMock::updateIce):
+ (WebCore::RTCPeerConnectionHandlerMock::addStream):
+ * platform/mock/RTCPeerConnectionHandlerMock.h:
+
</ins><span class="cx"> 2014-02-27 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Move named-flow specific method decorationsClipRectForBoxInRegion to RenderNamedFlowThread
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -152,17 +152,13 @@
</span><span class="cx"> return rtcConfiguration.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<RTCPeerConnection> RTCPeerConnection::create(ScriptExecutionContext& context, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode& ec)
</del><ins>+PassRefPtr<RTCPeerConnection> RTCPeerConnection::create(ScriptExecutionContext& context, const Dictionary& rtcConfiguration, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<RTCConfiguration> configuration = parseConfiguration(rtcConfiguration, ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<MediaConstraints> constraints = MediaConstraintsImpl::create(mediaConstraints, ec);
- if (ec)
- return nullptr;
-
- RefPtr<RTCPeerConnection> peerConnection = adoptRef(new RTCPeerConnection(context, configuration.release(), constraints.release(), ec));
</del><ins>+ RefPtr<RTCPeerConnection> peerConnection = adoptRef(new RTCPeerConnection(context, configuration.release(), ec));
</ins><span class="cx"> peerConnection->suspendIfNeeded();
</span><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -170,7 +166,7 @@
</span><span class="cx"> return peerConnection.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCPeerConnection::RTCPeerConnection(ScriptExecutionContext& context, PassRefPtr<RTCConfiguration> configuration, PassRefPtr<MediaConstraints> constraints, ExceptionCode& ec)
</del><ins>+RTCPeerConnection::RTCPeerConnection(ScriptExecutionContext& context, PassRefPtr<RTCConfiguration> configuration, ExceptionCode& ec)
</ins><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_signalingState(SignalingStateStable)
</span><span class="cx"> , m_iceGatheringState(IceGatheringStateNew)
</span><span class="lines">@@ -193,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> document.frame()->loader().client().dispatchWillStartUsingPeerConnectionHandler(m_peerHandler.get());
</span><span class="cx">
</span><del>- if (!m_peerHandler->initialize(configuration, constraints)) {
</del><ins>+ if (!m_peerHandler->initialize(configuration)) {
</ins><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -345,7 +341,7 @@
</span><span class="cx"> return desc.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode& ec)
</del><ins>+void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == SignalingStateClosed) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="lines">@@ -356,11 +352,7 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<MediaConstraints> constraints = MediaConstraintsImpl::create(mediaConstraints, ec);
- if (ec)
- return;
-
- bool valid = m_peerHandler->updateIce(configuration, constraints);
</del><ins>+ bool valid = m_peerHandler->updateIce(configuration);
</ins><span class="cx"> if (!valid)
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> }
</span><span class="lines">@@ -443,7 +435,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::addStream(PassRefPtr<MediaStream> prpStream, const Dictionary& mediaConstraints, ExceptionCode& ec)
</del><ins>+void RTCPeerConnection::addStream(PassRefPtr<MediaStream> prpStream, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == SignalingStateClosed) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="lines">@@ -459,11 +451,7 @@
</span><span class="cx"> if (m_localStreams.contains(stream))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<MediaConstraints> constraints = MediaConstraintsImpl::create(mediaConstraints, ec);
- if (ec)
- return;
-
- bool valid = m_peerHandler->addStream(stream->privateStream(), constraints);
</del><ins>+ bool valid = m_peerHandler->addStream(stream->privateStream());
</ins><span class="cx"> if (!valid)
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> class RTCPeerConnection final : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject, public MediaStream::Observer {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext&, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
</del><ins>+ static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext&, const Dictionary& rtcConfiguration, ExceptionCode&);
</ins><span class="cx"> ~RTCPeerConnection();
</span><span class="cx">
</span><span class="cx"> void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> String signalingState() const;
</span><span class="cx">
</span><del>- void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
</del><ins>+ void updateIce(const Dictionary& rtcConfiguration, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void addIceCandidate(RTCIceCandidate*, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, ExceptionCode&);
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> MediaStream* getStreamById(const String& streamId);
</span><span class="cx">
</span><del>- void addStream(PassRefPtr<MediaStream>, const Dictionary& mediaConstraints, ExceptionCode&);
</del><ins>+ void addStream(PassRefPtr<MediaStream>, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void removeStream(PassRefPtr<MediaStream>, ExceptionCode&);
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> using RefCounted<RTCPeerConnection>::deref;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCPeerConnection(ScriptExecutionContext&, PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>, ExceptionCode&);
</del><ins>+ RTCPeerConnection(ScriptExecutionContext&, PassRefPtr<RTCConfiguration>, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<RTCConfiguration> parseConfiguration(const Dictionary& configuration, ExceptionCode&);
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=MEDIA_STREAM,
</span><span class="cx"> ActiveDOMObject,
</span><del>- CustomConstructor(Dictionary rtcIceServers, optional Dictionary mediaConstraints),
</del><ins>+ CustomConstructor(Dictionary rtcConfiguration),
</ins><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="cx"> ConstructorRaisesException,
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute DOMString signalingState;
</span><span class="cx">
</span><del>- [RaisesException] void updateIce(optional Dictionary configuration, optional Dictionary mediaConstraints);
</del><ins>+ [RaisesException] void updateIce(optional Dictionary configuration);
</ins><span class="cx">
</span><span class="cx"> [RaisesException] void addIceCandidate(RTCIceCandidate candidate, VoidCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> sequence<MediaStream> getRemoteStreams();
</span><span class="cx"> MediaStream getStreamById(DOMString streamId);
</span><span class="cx">
</span><del>- [StrictTypeChecking, RaisesException] void addStream(MediaStream stream, optional Dictionary mediaConstraints);
</del><ins>+ [StrictTypeChecking, RaisesException] void addStream(MediaStream stream);
</ins><span class="cx"> [StrictTypeChecking, RaisesException] void removeStream(MediaStream stream);
</span><span class="cx">
</span><span class="cx"> void getStats(RTCStatsCallback successCallback, [Default=Undefined] optional MediaStreamTrack selector);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSRTCPeerConnectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -47,24 +47,14 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (!rtcConfiguration.isObject())
</span><del>- return throwVMError(exec, createTypeError(exec, "First argument of RTCPeerConnection must be a valid Dictionary"));
</del><ins>+ return throwVMError(exec, createTypeError(exec, "RTCPeerConnection argument must be a valid Dictionary"));
</ins><span class="cx">
</span><del>- Dictionary mediaConstraints;
- if (exec->argumentCount() > 1) {
- mediaConstraints = Dictionary(exec, exec->argument(1));
- if (!mediaConstraints.isObject())
- return throwVMError(exec, createTypeError(exec, "Optional constraints argument of RTCPeerConnection must be a valid Dictionary"));
-
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- }
-
</del><span class="cx"> JSRTCPeerConnectionConstructor* jsConstructor = jsCast<JSRTCPeerConnectionConstructor*>(exec->callee());
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext = jsConstructor->scriptExecutionContext();
</span><span class="cx"> if (!scriptExecutionContext)
</span><span class="cx"> return throwVMError(exec, createReferenceError(exec, "RTCPeerConnection constructor associated document is unavailable"));
</span><span class="cx">
</span><del>- RefPtr<RTCPeerConnection> peerConnection = RTCPeerConnection::create(*scriptExecutionContext, rtcConfiguration, mediaConstraints, ec);
</del><ins>+ RefPtr<RTCPeerConnection> peerConnection = RTCPeerConnection::create(*scriptExecutionContext, rtcConfiguration, ec);
</ins><span class="cx"> if (ec == TYPE_MISMATCH_ERR) {
</span><span class="cx"> setDOMException(exec, ec);
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, "Invalid RTCPeerConnection constructor arguments"));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> static const AtomicString& incompatibleSessionDescriptionErrorName();
</span><span class="cx"> static const AtomicString& internalErrorName();
</span><span class="cx">
</span><del>- virtual bool initialize(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) = 0;
</del><ins>+ virtual bool initialize(PassRefPtr<RTCConfiguration>) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) = 0;
</span><span class="cx"> virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) = 0;
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx"> virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) = 0;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> localDescription() = 0;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() = 0;
</span><del>- virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) = 0;
</del><ins>+ virtual bool updateIce(PassRefPtr<RTCConfiguration>) = 0;
</ins><span class="cx"> virtual bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) = 0;
</span><del>- virtual bool addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints>) = 0;
</del><ins>+ virtual bool addStream(PassRefPtr<MediaStreamPrivate>) = 0;
</ins><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span><span class="cx"> virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;
</span><span class="cx"> virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -51,12 +51,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnectionHandlerMock::initialize(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints> constraints)
</del><ins>+bool RTCPeerConnectionHandlerMock::initialize(PassRefPtr<RTCConfiguration>)
</ins><span class="cx"> {
</span><del>- String invalidQuery = MediaConstraintsMock::verifyConstraints(constraints);
- if (!invalidQuery.isEmpty())
- return false;
-
</del><span class="cx"> RefPtr<IceConnectionNotifier> notifier = adoptRef(new IceConnectionNotifier(m_client, RTCPeerConnectionHandlerClient::IceConnectionStateCompleted, RTCPeerConnectionHandlerClient::IceGatheringStateComplete));
</span><span class="cx"> m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
</span><span class="cx"> return true;
</span><span class="lines">@@ -143,7 +139,7 @@
</span><span class="cx"> return m_remoteSessionDescription;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnectionHandlerMock::updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>)
</del><ins>+bool RTCPeerConnectionHandlerMock::updateIce(PassRefPtr<RTCConfiguration>)
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -155,12 +151,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnectionHandlerMock::addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints> constraints)
</del><ins>+bool RTCPeerConnectionHandlerMock::addStream(PassRefPtr<MediaStreamPrivate>)
</ins><span class="cx"> {
</span><del>- String invalidQuery = MediaConstraintsMock::verifyConstraints(constraints);
- if (!invalidQuery.isEmpty())
- return false;
-
</del><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>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h (164838 => 164839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2014-02-27 23:56:06 UTC (rev 164838)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2014-02-27 23:58:28 UTC (rev 164839)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~RTCPeerConnectionHandlerMock() { }
</span><span class="cx">
</span><del>- virtual bool initialize(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) override;
</del><ins>+ virtual bool initialize(PassRefPtr<RTCConfiguration>) override;
</ins><span class="cx">
</span><span class="cx"> virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) override;
</span><span class="cx"> virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) override;
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) override;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> localDescription() override;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() override;
</span><del>- virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) override;
</del><ins>+ virtual bool updateIce(PassRefPtr<RTCConfiguration>) override;
</ins><span class="cx"> virtual bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) override;
</span><del>- virtual bool addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints>) override;
</del><ins>+ virtual bool addStream(PassRefPtr<MediaStreamPrivate>) override;
</ins><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) override;
</span><span class="cx"> virtual void getStats(PassRefPtr<RTCStatsRequest>) override;
</span><span class="cx"> virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) override;
</span></span></pre>
</div>
</div>
</body>
</html>