<!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>[214441] 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/214441">214441</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-27 16:36:36 -0700 (Mon, 27 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>addIceCandidate should not throw if passed null or undefined
https://bugs.webkit.org/show_bug.cgi?id=170118
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-27
Reviewed by Eric Carlson.
LayoutTests/imported/w3c:
* web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt:
Source/WebCore:
Covered by updated test.
A null/undefined candidate passed to addIceCandidate means end of Ice candidate..
* Modules/mediastream/PeerConnectionBackend.cpp:
(WebCore::PeerConnectionBackend::addIceCandidate):
* Modules/mediastream/PeerConnectionBackend.h:
(WebCore::PeerConnectionBackend::endOfIceCandidates):
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::queuedAddIceCandidate):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCPeerConnection.idl:
* Modules/mediastream/RTCPeerConnection.js:
(addIceCandidate):
LayoutTests:
Updating test to log addIceCandidate rejection.
* webrtc/datachannel/basic.html:
* webrtc/routines.js:
(iceCallback1):
(iceCallback2):
(onAddIceCandidateError):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionidlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionidlhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelbasichtml">trunk/LayoutTests/webrtc/datachannel/basic.html</a></li>
<li><a href="#trunkLayoutTestswebrtcroutinesjs">trunk/LayoutTests/webrtc/routines.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionjs">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/LayoutTests/ChangeLog 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-27 Youenn Fablet <youenn@apple.com>
+
+ addIceCandidate should not throw if passed null or undefined
+ https://bugs.webkit.org/show_bug.cgi?id=170118
+
+ Reviewed by Eric Carlson.
+
+ Updating test to log addIceCandidate rejection.
+
+ * webrtc/datachannel/basic.html:
+ * webrtc/routines.js:
+ (iceCallback1):
+ (iceCallback2):
+ (onAddIceCandidateError):
+
</ins><span class="cx"> 2017-03-27 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline svg/css/getComputedStyle-basic.xhtml for macOS.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-03-27 Youenn Fablet <youenn@apple.com>
+
+ addIceCandidate should not throw if passed null or undefined
+ https://bugs.webkit.org/show_bug.cgi?id=170118
+
+ Reviewed by Eric Carlson.
+
+ * web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt:
+
</ins><span class="cx"> 2017-03-22 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Support RTCPeerConnectionState
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionidlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> PASS RTCPeerConnection interface: attribute remoteDescription
</span><span class="cx"> PASS RTCPeerConnection interface: attribute currentRemoteDescription
</span><span class="cx"> PASS RTCPeerConnection interface: attribute pendingRemoteDescription
</span><del>-FAIL RTCPeerConnection interface: operation addIceCandidate(RTCIceCandidate) assert_equals: property has wrong .length expected 1 but got 0
</del><ins>+FAIL RTCPeerConnection interface: operation addIceCandidate([object Object],[object Object]) assert_equals: property has wrong .length expected 1 but got 0
</ins><span class="cx"> PASS RTCPeerConnection interface: attribute signalingState
</span><span class="cx"> PASS RTCPeerConnection interface: attribute iceGatheringState
</span><span class="cx"> PASS RTCPeerConnection interface: attribute iceConnectionState
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> PASS RTCPeerConnection interface: pc must inherit property "currentRemoteDescription" with the proper type (8)
</span><span class="cx"> PASS RTCPeerConnection interface: pc must inherit property "pendingRemoteDescription" with the proper type (9)
</span><span class="cx"> PASS RTCPeerConnection interface: pc must inherit property "addIceCandidate" with the proper type (10)
</span><del>-PASS RTCPeerConnection interface: calling addIceCandidate(RTCIceCandidate) on pc with too few arguments must throw TypeError
</del><ins>+FAIL RTCPeerConnection interface: calling addIceCandidate([object Object],[object Object]) on pc with too few arguments must throw TypeError assert_unreached: Should have rejected: undefined Reached unreachable code
</ins><span class="cx"> FAIL RTCPeerConnection interface: pc must inherit property "signalingState" with the proper type (11) Unrecognized type RTCSignalingState
</span><span class="cx"> FAIL RTCPeerConnection interface: pc must inherit property "iceGatheringState" with the proper type (12) Unrecognized type RTCIceGatheringState
</span><span class="cx"> FAIL RTCPeerConnection interface: pc must inherit property "iceConnectionState" with the proper type (13) Unrecognized type RTCIceConnectionState
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionidlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl.html 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> readonly attribute RTCSessionDescription? remoteDescription;
</span><span class="cx"> readonly attribute RTCSessionDescription? currentRemoteDescription;
</span><span class="cx"> readonly attribute RTCSessionDescription? pendingRemoteDescription;
</span><del>- Promise<void> addIceCandidate (RTCIceCandidate candidate);
</del><ins>+ Promise<void> addIceCandidate ((RTCIceCandidateInit or RTCIceCandidate) candidate);
</ins><span class="cx"> readonly attribute RTCSignalingState signalingState;
</span><span class="cx"> readonly attribute RTCIceGatheringState iceGatheringState;
</span><span class="cx"> readonly attribute RTCIceConnectionState iceConnectionState;
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/basic.html (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/basic.html 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/LayoutTests/webrtc/datachannel/basic.html 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> remoteChannel = event.channel;
</span><span class="cx"> remoteChannel.onmessage = receiveMessages;
</span><span class="cx"> };
</span><del>- }, (candidate) => { return candidate.candidate.toLowerCase().indexOf("udp") == -1; });
</del><ins>+ }, (candidate) => { return candidate && candidate.candidate.toLowerCase().indexOf("udp") == -1; });
</ins><span class="cx"> });
</span><span class="cx"> }, "Basic data channel exchange from offerer to receiver using UDP only");
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> remoteChannel = event.channel;
</span><span class="cx"> remoteChannel.onmessage = receiveMessages;
</span><span class="cx"> };
</span><del>- }, (candidate) => { return candidate.candidate.toLowerCase().indexOf("tcp") == -1; });
</del><ins>+ }, (candidate) => { return candidate && candidate.candidate.toLowerCase().indexOf("tcp") == -1; });
</ins><span class="cx"> });
</span><span class="cx"> }, "Basic data channel exchange from offerer to receiver using TCP only");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcroutinesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/routines.js (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/routines.js 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/LayoutTests/webrtc/routines.js 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -42,9 +42,6 @@
</span><span class="cx">
</span><span class="cx"> function iceCallback1(event, filterOutICECandidate)
</span><span class="cx"> {
</span><del>- if (!event.candidate)
- return;
-
</del><span class="cx"> if (filterOutICECandidate && filterOutICECandidate(event.candidate))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -53,14 +50,10 @@
</span><span class="cx">
</span><span class="cx"> function iceCallback2(event, filterOutICECandidate)
</span><span class="cx"> {
</span><del>- if (!event.candidate)
- return;
-
</del><span class="cx"> if (filterOutICECandidate && filterOutICECandidate(event.candidate))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (event.candidate)
- localConnection.addIceCandidate(event.candidate).then(onAddIceCandidateSuccess, onAddIceCandidateError);
</del><ins>+ localConnection.addIceCandidate(event.candidate).then(onAddIceCandidateSuccess, onAddIceCandidateError);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onAddIceCandidateSuccess()
</span><span class="lines">@@ -69,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> function onAddIceCandidateError(error)
</span><span class="cx"> {
</span><ins>+ console.log("addIceCandidate error: " + error)
</ins><span class="cx"> assert_unreached();
</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 (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/ChangeLog 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-03-27 Youenn Fablet <youenn@apple.com>
+
+ addIceCandidate should not throw if passed null or undefined
+ https://bugs.webkit.org/show_bug.cgi?id=170118
+
+ Reviewed by Eric Carlson.
+
+ Covered by updated test.
+
+ A null/undefined candidate passed to addIceCandidate means end of Ice candidate..
+
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ (WebCore::PeerConnectionBackend::addIceCandidate):
+ * Modules/mediastream/PeerConnectionBackend.h:
+ (WebCore::PeerConnectionBackend::endOfIceCandidates):
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::queuedAddIceCandidate):
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * Modules/mediastream/RTCPeerConnection.js:
+ (addIceCandidate):
+
</ins><span class="cx"> 2017-03-27 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow the page to render before <link> stylesheet tags in body
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -225,16 +225,22 @@
</span><span class="cx"> m_setDescriptionPromise = std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PeerConnectionBackend::addIceCandidate(RTCIceCandidate& iceCandidate, DOMPromise<void>&& promise)
</del><ins>+void PeerConnectionBackend::addIceCandidate(RTCIceCandidate* iceCandidate, DOMPromise<void>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_peerConnection.signalingState() != RTCSignalingState::Closed);
</span><span class="cx">
</span><del>- if (iceCandidate.sdpMid().isNull() && !iceCandidate.sdpMLineIndex()) {
</del><ins>+ if (!iceCandidate) {
+ endOfIceCandidates(WTFMove(promise));
+ return;
+ }
+
+ // FIXME: As per https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-addicecandidate(), this check should be done before enqueuing the task.
+ if (iceCandidate->sdpMid().isNull() && !iceCandidate->sdpMLineIndex()) {
</ins><span class="cx"> promise.reject(Exception { TypeError, ASCIILiteral("Trying to add a candidate that is missing both sdpMid and sdpMLineIndex") });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_addIceCandidatePromise = WTFMove(promise);
</span><del>- doAddIceCandidate(iceCandidate);
</del><ins>+ doAddIceCandidate(*iceCandidate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PeerConnectionBackend::addIceCandidateSucceeded()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx">
</span><span class="cx"> using CreatePeerConnectionBackend = std::unique_ptr<PeerConnectionBackend> (*)(RTCPeerConnection&);
</span><span class="cx">
</span><del>-// FIXME: What is the value of this abstract class? There is only one concrete class derived from it.
</del><span class="cx"> class PeerConnectionBackend {
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static CreatePeerConnectionBackend create;
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx"> void createAnswer(RTCAnswerOptions&&, PeerConnection::SessionDescriptionPromise&&);
</span><span class="cx"> void setLocalDescription(RTCSessionDescription&, DOMPromise<void>&&);
</span><span class="cx"> void setRemoteDescription(RTCSessionDescription&, DOMPromise<void>&&);
</span><del>- void addIceCandidate(RTCIceCandidate&, DOMPromise<void>&&);
</del><ins>+ void addIceCandidate(RTCIceCandidate*, DOMPromise<void>&&);
</ins><span class="cx">
</span><span class="cx"> virtual std::unique_ptr<RTCDataChannelHandler> createDataChannelHandler(const String&, const RTCDataChannelInit&) = 0;
</span><span class="cx">
</span><span class="lines">@@ -137,6 +136,7 @@
</span><span class="cx"> virtual void doSetLocalDescription(RTCSessionDescription&) = 0;
</span><span class="cx"> virtual void doSetRemoteDescription(RTCSessionDescription&) = 0;
</span><span class="cx"> virtual void doAddIceCandidate(RTCIceCandidate&) = 0;
</span><ins>+ virtual void endOfIceCandidates(DOMPromise<void>&& promise) { promise.resolve(); }
</ins><span class="cx"> virtual void doStop() = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> return m_backend->pendingRemoteDescription();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::queuedAddIceCandidate(RTCIceCandidate& rtcCandidate, DOMPromise<void>&& promise)
</del><ins>+void RTCPeerConnection::queuedAddIceCandidate(RTCIceCandidate* rtcCandidate, DOMPromise<void>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == RTCSignalingState::Closed) {
</span><span class="cx"> promise.reject(INVALID_STATE_ERR);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> RefPtr<RTCSessionDescription> currentRemoteDescription() const;
</span><span class="cx"> RefPtr<RTCSessionDescription> pendingRemoteDescription() const;
</span><span class="cx">
</span><del>- void queuedAddIceCandidate(RTCIceCandidate&, DOMPromise<void>&&);
</del><ins>+ void queuedAddIceCandidate(RTCIceCandidate*, DOMPromise<void>&&);
</ins><span class="cx">
</span><span class="cx"> RTCSignalingState signalingState() const { return m_signalingState; }
</span><span class="cx"> RTCIceGatheringState iceGatheringState() const { return m_iceGatheringState; }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> [PrivateIdentifier] Promise<RTCSessionDescriptionInit> queuedCreateAnswer(optional RTCAnswerOptions answerOptions);
</span><span class="cx"> [PrivateIdentifier] Promise<void> queuedSetLocalDescription(RTCSessionDescription description);
</span><span class="cx"> [PrivateIdentifier] Promise<void> queuedSetRemoteDescription(RTCSessionDescription description);
</span><del>- [PrivateIdentifier] Promise<void> queuedAddIceCandidate(RTCIceCandidate candidate);
</del><ins>+ [PrivateIdentifier] Promise<void> queuedAddIceCandidate(RTCIceCandidate? candidate);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // 4.11 Certificate management
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js (214440 => 214441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js 2017-03-27 23:32:56 UTC (rev 214440)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js 2017-03-27 23:36:36 UTC (rev 214441)
</span><span class="lines">@@ -250,7 +250,8 @@
</span><span class="cx"> "constructor": @RTCIceCandidate,
</span><span class="cx"> "argName": "candidate",
</span><span class="cx"> "argType": "RTCIceCandidate",
</span><del>- "maybeDictionary": "true"
</del><ins>+ "maybeDictionary": "true",
+ "defaultsToNull" : "true"
</ins><span class="cx"> };
</span><span class="cx"> return @objectAndCallbacksOverload(arguments, "addIceCandidate", objectInfo, function (candidate) {
</span><span class="cx"> // Promise mode
</span></span></pre>
</div>
</div>
</body>
</html>