<!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>[165321] 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/165321">165321</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-07 19:36:23 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Throw SYNTAX_ERROR when maxRetransmits and maxRetransmitTime are both set in RTCDataChannelInit
https://bugs.webkit.org/show_bug.cgi?id=129894
Reviewed by Eric Carlson.
Source/WebCore:
Existing test was updated.
* Modules/mediastream/RTCDataChannel.cpp:
(WebCore::RTCDataChannel::create):
LayoutTests:
* fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
* fast/mediastream/RTCPeerConnection-datachannel.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiondatachannelexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt</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="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165320 => 165321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-08 03:33:44 UTC (rev 165320)
+++ trunk/LayoutTests/ChangeLog 2014-03-08 03:36:23 UTC (rev 165321)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-07 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Throw SYNTAX_ERROR when maxRetransmits and maxRetransmitTime are both set in RTCDataChannelInit
+ https://bugs.webkit.org/show_bug.cgi?id=129894
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
+ * fast/mediastream/RTCPeerConnection-datachannel.html:
+
</ins><span class="cx"> 2014-03-07 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline some tests for WebKitGTK+
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiondatachannelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt (165320 => 165321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt 2014-03-08 03:33:44 UTC (rev 165320)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt 2014-03-08 03:36:23 UTC (rev 165321)
</span><span class="lines">@@ -3,6 +3,7 @@
</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><ins>+PASS dc = pc.createDataChannel("label", {maxRetransmitTime:0, maxRetransmits:0}); threw exception Error: SyntaxError: DOM Exception 12.
</ins><span class="cx"> PASS dc = pc.createDataChannel("label1"); did not throw exception.
</span><span class="cx"> PASS dc = pc.createDataChannel("label2", {}); did not throw exception.
</span><span class="cx"> PASS dc = pc.createDataChannel("label3", {ordered:true}); did not throw exception.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiondatachannelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html (165320 => 165321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2014-03-08 03:33:44 UTC (rev 165320)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2014-03-08 03:36:23 UTC (rev 165321)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
</span><ins>+ shouldThrow('dc = pc.createDataChannel("label", {maxRetransmitTime:0, maxRetransmits:0});');
</ins><span class="cx"> shouldNotThrow('dc = pc.createDataChannel("label1");');
</span><span class="cx"> shouldNotThrow('dc = pc.createDataChannel("label2", {});');
</span><span class="cx"> shouldNotThrow('dc = pc.createDataChannel("label3", {ordered:true});');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165320 => 165321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-08 03:33:44 UTC (rev 165320)
+++ trunk/Source/WebCore/ChangeLog 2014-03-08 03:36:23 UTC (rev 165321)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-07 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Throw SYNTAX_ERROR when maxRetransmits and maxRetransmitTime are both set in RTCDataChannelInit
+ https://bugs.webkit.org/show_bug.cgi?id=129894
+
+ Reviewed by Eric Carlson.
+
+ Existing test was updated.
+
+ * Modules/mediastream/RTCDataChannel.cpp:
+ (WebCore::RTCDataChannel::create):
+
</ins><span class="cx"> 2014-03-07 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the regression introduced by r165288
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (165320 => 165321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2014-03-08 03:33:44 UTC (rev 165320)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2014-03-08 03:36:23 UTC (rev 165321)
</span><span class="lines">@@ -57,13 +57,24 @@
</span><span class="cx"> PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, const Dictionary& options, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> RTCDataChannelInit initData;
</span><ins>+ String maxRetransmitsStr;
+ String maxRetransmitTimeStr;
</ins><span class="cx"> options.get("ordered", initData.ordered);
</span><span class="cx"> options.get("negotiated", initData.negotiated);
</span><span class="cx"> options.get("id", initData.id);
</span><del>- options.get("maxRetransmits", initData.maxRetransmits);
- options.get("maxRetransmitTime", initData.maxRetransmitTime);
</del><ins>+ options.get("maxRetransmits", maxRetransmitsStr);
+ options.get("maxRetransmitTime", maxRetransmitTimeStr);
</ins><span class="cx"> options.get("protocol", initData.protocol);
</span><span class="cx">
</span><ins>+ bool maxRetransmitsConversion;
+ bool maxRetransmitTimeConversion;
+ initData.maxRetransmits = maxRetransmitsStr.toUIntStrict(&maxRetransmitsConversion);
+ initData.maxRetransmitTime = maxRetransmitTimeStr.toUIntStrict(&maxRetransmitTimeConversion);
+ if (maxRetransmitsConversion && maxRetransmitTimeConversion) {
+ ec = SYNTAX_ERR;
+ return nullptr;
+ }
+
</ins><span class="cx"> std::unique_ptr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData);
</span><span class="cx"> if (!handler) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span></span></pre>
</div>
</div>
</body>
</html>