<!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>[214527] 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/214527">214527</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-28 21:09:14 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] After <a href="http://trac.webkit.org/projects/webkit/changeset/214441">r214441</a> addIceCandidate no longer accepts an RTCIceCandidateInit dictionary
https://bugs.webkit.org/show_bug.cgi?id=170192
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-28
Reviewed by Jon Lee.
Source/WebCore:
Covered by updated tests.
* Modules/mediastream/RTCIceCandidate.idl: Candidate is no longer a required field in RTCIceCandidateInit.
* Modules/mediastream/RTCPeerConnectionInternals.js: Reworking defaultsToNull to handle both undefined and null cases.
LayoutTests:
* fast/mediastream/RTCIceCandidate-expected.txt:
* fast/mediastream/RTCIceCandidate.html: Removing no longer valid tests.
* fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt:
* fast/mediastream/RTCPeerConnection-addIceCandidate.html: Adding more tests to cover null/undefined cases.
Ensuring sdpMid has a valid value.
* fast/mediastream/resources/promise-utils.js: Improving error logging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCIceCandidateexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCIceCandidatehtml">trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionaddIceCandidateexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionaddIceCandidatehtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamresourcespromiseutilsjs">trunk/LayoutTests/fast/mediastream/resources/promise-utils.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionInternalsjs">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/LayoutTests/ChangeLog 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-28 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] After r214441 addIceCandidate no longer accepts an RTCIceCandidateInit dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=170192
+
+ Reviewed by Jon Lee.
+
+ * fast/mediastream/RTCIceCandidate-expected.txt:
+ * fast/mediastream/RTCIceCandidate.html: Removing no longer valid tests.
+ * fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt:
+ * fast/mediastream/RTCPeerConnection-addIceCandidate.html: Adding more tests to cover null/undefined cases.
+ Ensuring sdpMid has a valid value.
+ * fast/mediastream/resources/promise-utils.js: Improving error logging.
+
</ins><span class="cx"> 2017-03-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Only attach Attributes to a given element one time
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCIceCandidateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -33,12 +33,6 @@
</span><span class="cx">
</span><span class="cx"> Dictionary argument is mandatory.
</span><span class="cx"> PASS new RTCIceCandidate(); threw exception TypeError: Not enough arguments.
</span><del>-Dictionary member 'candidate' is required.
-PASS new RTCIceCandidate({}); threw exception TypeError: Member RTCIceCandidateInit.candidate is required and must be an instance of DOMString.
-PASS new RTCIceCandidate({sdpMid:"bar", sdpMLineIndex:6}); threw exception TypeError: Member RTCIceCandidateInit.candidate is required and must be an instance of DOMString.
-PASS new RTCIceCandidate({sdpMid:"bar"}); threw exception TypeError: Member RTCIceCandidateInit.candidate is required and must be an instance of DOMString.
-PASS new RTCIceCandidate({sdpMLineIndex:6}); threw exception TypeError: Member RTCIceCandidateInit.candidate is required and must be an instance of DOMString.
-
</del><span class="cx"> One of the 'sdpMid' or 'sdpMLineIndex' members must be present (and not null or undefined).
</span><span class="cx"> PASS new RTCIceCandidate({candidate:"foo"}); threw exception TypeError: Type error.
</span><span class="cx"> PASS new RTCIceCandidate({candidate:"foo", sdpMid: null}); threw exception TypeError: Type error.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCIceCandidatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -54,13 +54,6 @@
</span><span class="cx"> debug("Dictionary argument is mandatory.");
</span><span class="cx"> shouldThrow('new RTCIceCandidate();');
</span><span class="cx">
</span><del>- debug("Dictionary member 'candidate' is required.");
- shouldThrow('new RTCIceCandidate({});');
- shouldThrow('new RTCIceCandidate({sdpMid:"bar", sdpMLineIndex:6});');
- shouldThrow('new RTCIceCandidate({sdpMid:"bar"});');
- shouldThrow('new RTCIceCandidate({sdpMLineIndex:6});');
- debug("");
-
</del><span class="cx"> debug("One of the 'sdpMid' or 'sdpMLineIndex' members must be present (and not null or undefined).");
</span><span class="cx"> shouldThrow('new RTCIceCandidate({candidate:"foo"});');
</span><span class="cx"> shouldThrow('new RTCIceCandidate({candidate:"foo", sdpMid: null});');
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionaddIceCandidateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -18,12 +18,17 @@
</span><span class="cx"> *** A (bad) sdpMid takes precedesce over valid sdpMLineIndex
</span><span class="cx"> FAIL promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: badSdpMid, sdpMLineIndex: sdpMLineIndex})) fulfilled unexpectedly.
</span><span class="cx"> *** Test bad candidate content with valid sdpMid
</span><del>-FAIL evaluating pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMid: sdpMid})) threw exception TypeError: Type error
</del><ins>+PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMid: sdpMid})) rejected with OperationError (DOM Exception 34): Expect line: candidate:<candidate-str>
</ins><span class="cx"> *** Test bad candidate content with valid sdpMLineIndex
</span><span class="cx"> PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMLineIndex: sdpMLineIndex})) rejected with OperationError (DOM Exception 34): Expect line: candidate:<candidate-str>
</span><ins>+*** Test valid candidate with no mid and mlineindex
+PASS promise pc.addIceCandidate({candidate: validCandidate}) rejected with TypeError: Argument 1 ('candidate') to RTCPeerConnection.addIceCandidate must be an instance of RTCIceCandidate
</ins><span class="cx">
</span><span class="cx"> *** Test some OK input
</span><del>-FAIL promise pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid}) rejected unexpectedly.
</del><ins>+PASS promise pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid}) fulfilled with undefined
+PASS promise pc.addIceCandidate({candidate: validCandidate, sdpMLineIndex: sdpMLineIndex}) fulfilled with undefined
+PASS promise pc.addIceCandidate(undefined) fulfilled with undefined
+PASS promise pc.addIceCandidate(null) fulfilled with undefined
</ins><span class="cx"> PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMLineIndex: sdpMLineIndex})) fulfilled with undefined
</span><span class="cx"> *** A valid sdpMid takes precedesce over a bad sdpMLineIndex
</span><span class="cx"> PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: sdpMid, sdpMLineIndex: badSdpMLineIndex})) fulfilled with undefined
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionaddIceCandidatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate.html (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate.html 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate.html 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> badSdpMid = sdpMid + "_foo";
</span><span class="cx"> shouldNotBe("sdpMid", "badSdpMid");
</span><span class="cx">
</span><ins>+ sdpMid = 1;
+
</ins><span class="cx"> return promiseShouldReject("pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: badSdpMid}))");
</span><span class="cx"> })
</span><span class="cx"> .then(function () {
</span><span class="lines">@@ -73,11 +75,24 @@
</span><span class="cx"> return promiseShouldReject("pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMLineIndex: sdpMLineIndex}))");
</span><span class="cx"> })
</span><span class="cx"> .then(function () {
</span><ins>+ debug("*** Test valid candidate with no mid and mlineindex");
+ return promiseShouldReject("pc.addIceCandidate({candidate: validCandidate})");
+ })
+ .then(function () {
</ins><span class="cx"> debug("<br>*** Test some OK input");
</span><span class="cx"> // Testing passing a RTCIceCandidateInit
</span><span class="cx"> return promiseShouldResolve("pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid})");
</span><span class="cx"> })
</span><span class="cx"> .then(function () {
</span><ins>+ return promiseShouldResolve("pc.addIceCandidate({candidate: validCandidate, sdpMLineIndex: sdpMLineIndex})");
+ })
+ .then(function () {
+ return promiseShouldResolve("pc.addIceCandidate(undefined)");
+ })
+ .then(function () {
+ return promiseShouldResolve("pc.addIceCandidate(null)");
+ })
+ .then(function () {
</ins><span class="cx"> // Testing passing a RTCIceCandidate
</span><span class="cx"> return promiseShouldResolve("pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMLineIndex: sdpMLineIndex}))");
</span><span class="cx"> })
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamresourcespromiseutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/resources/promise-utils.js (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/resources/promise-utils.js 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/LayoutTests/fast/mediastream/resources/promise-utils.js 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> done();
</span><span class="cx"> })
</span><span class="cx"> .catch(function (reason) {
</span><del>- testFailed("promise " + expr + " rejected unexpectedly.");
</del><ins>+ testFailed("promise " + expr + " rejected unexpectedly:" + reason);
</ins><span class="cx"> done();
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/Source/WebCore/ChangeLog 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2017-03-28 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [WebRTC] After r214441 addIceCandidate no longer accepts an RTCIceCandidateInit dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=170192
+
+ Reviewed by Jon Lee.
+
+ Covered by updated tests.
+
+ * Modules/mediastream/RTCIceCandidate.idl: Candidate is no longer a required field in RTCIceCandidateInit.
+ * Modules/mediastream/RTCPeerConnectionInternals.js: Reworking defaultsToNull to handle both undefined and null cases.
+
+2017-03-28 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> LibWebRTCProvider should allow setting encoder and decoder factories
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170212
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -61,8 +61,7 @@
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> EnabledAtRuntime=PeerConnection
</span><span class="cx"> ] dictionary RTCIceCandidateInit {
</span><del>- // FIXME 169662: no longer required, with default string
- required DOMString candidate;
</del><ins>+ DOMString candidate = "";
</ins><span class="cx"> DOMString? sdpMid = null;
</span><span class="cx"> unsigned short? sdpMLineIndex = null;
</span><span class="cx"> // FIXME 169662: missing ufrag
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js (214526 => 214527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js 2017-03-29 04:02:17 UTC (rev 214526)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js 2017-03-29 04:09:14 UTC (rev 214527)
</span><span class="lines">@@ -62,26 +62,18 @@
</span><span class="cx"> let objectArg = args[0];
</span><span class="cx"> let objectArgOk = false;
</span><span class="cx">
</span><del>- if (!argsCount) {
- if (!objectInfo.defaultsToNull)
- return @Promise.@reject(new @TypeError("Not enough arguments"));
-
</del><ins>+ const hasMatchingType = objectArg instanceof objectInfo.constructor;
+ if (hasMatchingType)
+ objectArgOk = true;
+ else if (objectArg == null && objectInfo.defaultsToNull) {
+ objectArgOk = true;
</ins><span class="cx"> objectArg = null;
</span><del>- objectArgOk = true;
- argsCount = 1;
- } else {
- const hasMatchingType = objectArg instanceof objectInfo.constructor;
- if (hasMatchingType)
</del><ins>+ } else if (objectInfo.maybeDictionary) {
+ try {
+ objectArg = new objectInfo.constructor(objectArg);
</ins><span class="cx"> objectArgOk = true;
</span><del>- else if (objectInfo.defaultsToNull)
- objectArgOk = objectArg === null || typeof objectArg === "undefined";
- else if (objectInfo.maybeDictionary) {
- try {
- objectArg = new objectInfo.constructor(objectArg);
- objectArgOk = true;
- } catch (e) {
- objectArgOk = false;
- }
</del><ins>+ } catch (e) {
+ objectArgOk = false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>