<!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>[209695] 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/209695">209695</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-12-11 18:50:06 -0800 (Sun, 11 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove uses of Dictionary in WebRTC IDL files
https://bugs.webkit.org/show_bug.cgi?id=165736
Reviewed by Sam Weinig.
Source/WebCore:
Also removed quite a bit of unused code. There were some mocks that were out of date and
no longer matched the types used in the real code, that also were no longer hooked up,
and other types of dead code. We will have to implement anew when we want to restore tests
like the ones these were intended to enable.
* CMakeLists.txt: Updated for all the removed files.
* Modules/mediastream/MediaEndpointPeerConnection.cpp: Moved some types in here
that don't need to be in the header.
(WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection): Use make_unique.
(WebCore::MediaEndpointPeerConnection::setConfiguration): Changed argument type,
obviating the need for most of the code that was here.
* Modules/mediastream/MediaEndpointPeerConnection.h: Updated for the above. Made more
things private and final. Marked the constructor explicit. Removed unneeded includes.
* Modules/mediastream/PeerConnectionBackend.h: Removed unneeded includes and forward
declarations. Changed the argument type for setConfiguration (see above).
* Modules/mediastream/RTCConfiguration.cpp: Removed.
None of the code here was needed except for the ICE server validation, and that was
moved into RTCPeerConnection::setConfiguration.
* Modules/mediastream/RTCConfiguration.h: Changed this from a class to a struct since
this is now a dictionary rather than an interface.
* Modules/mediastream/RTCConfiguration.idl: Changed this from an interface to a dictionary.
* Modules/mediastream/RTCDTMFSender.cpp: Removed some of the code from this file. This
class currently isn't implemented, but was depending on RTCPeerConnectionHandler. I removed
some of the dead code. Someone will have to straighten this out so we can turn it back on.
* Modules/mediastream/RTCDTMFSender.h: Ditto.
* Modules/mediastream/RTCDataChannel.cpp: Updated includes.
* Modules/mediastream/RTCIceCandidate.cpp:
(WebCore::RTCIceCandidate::create): Removed most of the code, since this now takes
a structure rather than a WebCore::Dictionary, and so the bindings take care of the work.
* Modules/mediastream/RTCIceCandidate.h: Updated for the above.
* Modules/mediastream/RTCIceCandidate.idl: Changed the constructor to take a
RTCIceCandidateInit instead of a Dictionary.
* Modules/mediastream/RTCIceServer.h: Changed this from a class to a struct since
this is now a dictionary rather than an interface.
* Modules/mediastream/RTCIceServer.idl: Changed this from an interface to a dictionary.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::initializeWith): Take an RTCConfiguration rather than
a Dictionary.
(WebCore::RTCPeerConnection::getConfiguration): Moved to header, now an inline.
(WebCore::RTCPeerConnection::setConfiguration): Use the configuration dictionary now instead
of the configuration class. Also moved validation of server URLs here, formerly in the
RTCConfiguration RTCConfiguration::initialize function. Also moved code to convert from
RTCConfiguration to MediaEndpointConfiguration here, formerly in
MediaEndpointPeerConnection::setConfiguration.
* Modules/mediastream/RTCPeerConnection.h: Updated for the above.
* Modules/mediastream/RTCPeerConnection.idl: Changed argument to initializeWith and
setConfiguration from Dictionary to RTCConfiguration.
* Modules/mediastream/RTCSessionDescription.cpp:
(WebCore::parseTypeString): Deleted.
(WebCore::RTCSessionDescription::create): Changed to take struct instead of Dictionary.
* Modules/mediastream/RTCSessionDescription.h: Added Init struct and changed create to
take it.
* Modules/mediastream/RTCSessionDescription.idl: Changed constructor argument to take
RTCSessionDescriptionInit dictionary instead of Dictionary.
* Modules/webaudio/MediaStreamAudioDestinationNode.cpp: Updated includes.
* WebCore.xcodeproj/project.pbxproj: Updated for all the removed files.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDictionaryImplementationContent): Fixed convertDictionaryToJS to work with other
nullable types besides RefPtr.
* bindings/scripts/test/JS/JSTestObj.cpp: Regenerated.
* platform/mediastream/RTCConfigurationPrivate.h: Removed.
* platform/mediastream/RTCIceServerPrivate.h: Removed.
* platform/mediastream/RTCPeerConnectionHandler.cpp: Removed.
* platform/mediastream/RTCPeerConnectionHandler.h: Removed.
* platform/mock/RTCDTMFSenderHandlerMock.cpp: Removed.
* platform/mock/RTCDTMFSenderHandlerMock.h: Removed.
* platform/mock/RTCDataChannelHandlerMock.h: Updated includes, made more things private and final.
* platform/mock/RTCPeerConnectionHandlerMock.cpp: Removed.
* platform/mock/RTCPeerConnectionHandlerMock.h: Removed.
* testing/Internals.cpp:
(WebCore::Internals::Internals): Removed call to enableMockRTCPeerConnectionHandler.
(WebCore::Internals::enableMockRTCPeerConnectionHandler): Deleted.
LayoutTests:
* fast/mediastream/RTCIceCandidate-expected.txt: Regenerated; no new failures.
* fast/mediastream/RTCIceCandidate.html: Updated test to expect the WebIDL rules for parsing
unsigned short for sdpMLineIndex. The old code expected additional range checking which is
not expected behavior.
* fast/mediastream/RTCPeerConnection-expected.txt: Regenerated; no new failures.
* fast/mediastream/RTCPeerConnection.html: Updated test to not expect an exception when
iceServers is entirely omitted or when it is an empty array. This is a progression and is
closer to the specification.
* fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt: Regenerated; no new failures.
* fast/mediastream/RTCPeerConnection-getConfiguration.html: Updated test to expect the username
and credential fields to round trip as missing rather than turning from missing into empty strings.
Also updated the tests to pass in sequences of strings for "urls" since they expect sequences on
the way back out. We could also test round tripping of single strings, which should go in and come
back out as individual strings, but for now I did not bother adding that to this test.
* fast/mediastream/RTCSessionDescription-expected.txt: Regenerated; some exception messages are
now more specific than they were before.
* imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt:
Updated expected results. The new code correctly allows callers of the RTCPeerConnection constructor
to omit iceServers, pass undefined, or pass an empty array, as specified. Thuis change leads to
a couple tests that now correctly pass instead of failing. And it also leads to some other tests
failing that were passing before. These were passing because they expected an exception for some
other reason, however the exception was actually occurring because of incorrect handling of iceServers.</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="#trunkLayoutTestsfastmediastreamRTCPeerConnectionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCSessionDescriptionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionconstructorexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationh">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationidl">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelh">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidatecpp">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateh">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceServerh">trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceServeridl">trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCDataChannelHandlerMockh">trunk/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationcpp">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCConfigurationPrivateh">trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceServerPrivateh">trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlercpp">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCDTMFSenderHandlerMockcpp">trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCDTMFSenderHandlerMockh">trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.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 (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/ChangeLog 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-12-11 Darin Adler <darin@apple.com>
+
+ Remove uses of Dictionary in WebRTC IDL files
+ https://bugs.webkit.org/show_bug.cgi?id=165736
+
+ Reviewed by Sam Weinig.
+
+ * fast/mediastream/RTCIceCandidate-expected.txt: Regenerated; no new failures.
+ * fast/mediastream/RTCIceCandidate.html: Updated test to expect the WebIDL rules for parsing
+ unsigned short for sdpMLineIndex. The old code expected additional range checking which is
+ not expected behavior.
+
+ * fast/mediastream/RTCPeerConnection-expected.txt: Regenerated; no new failures.
+ * fast/mediastream/RTCPeerConnection.html: Updated test to not expect an exception when
+ iceServers is entirely omitted or when it is an empty array. This is a progression and is
+ closer to the specification.
+
+ * fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt: Regenerated; no new failures.
+ * fast/mediastream/RTCPeerConnection-getConfiguration.html: Updated test to expect the username
+ and credential fields to round trip as missing rather than turning from missing into empty strings.
+ Also updated the tests to pass in sequences of strings for "urls" since they expect sequences on
+ the way back out. We could also test round tripping of single strings, which should go in and come
+ back out as individual strings, but for now I did not bother adding that to this test.
+
+ * fast/mediastream/RTCSessionDescription-expected.txt: Regenerated; some exception messages are
+ now more specific than they were before.
+
+ * imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt:
+ Updated expected results. The new code correctly allows callers of the RTCPeerConnection constructor
+ to omit iceServers, pass undefined, or pass an empty array, as specified. Thuis change leads to
+ a couple tests that now correctly pass instead of failing. And it also leads to some other tests
+ failing that were passing before. These were passing because they expected an exception for some
+ other reason, however the exception was actually occurring because of incorrect handling of iceServers.
+
</ins><span class="cx"> 2016-12-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] Add tests for wrap/unwrap SPKI/PKCS8 keys
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCIceCandidateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx"> Dictionary argument is mandatory.
</span><span class="cx"> PASS new RTCIceCandidate(); threw exception TypeError: Not enough arguments.
</span><span class="cx"> Dictionary member 'candidate' is required.
</span><del>-PASS new RTCIceCandidate({}); threw exception TypeError: Type error.
-PASS new RTCIceCandidate({sdpMid:"bar", sdpMLineIndex:6}); threw exception TypeError: Type error.
-PASS new RTCIceCandidate({sdpMid:"bar"}); threw exception TypeError: Type error.
-PASS new RTCIceCandidate({sdpMLineIndex:6}); threw exception TypeError: Type error.
</del><ins>+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.
</ins><span class="cx">
</span><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="lines">@@ -70,10 +70,13 @@
</span><span class="cx"> PASS candidate.sdpMid is null
</span><span class="cx"> PASS candidate.sdpMLineIndex is 6
</span><span class="cx">
</span><ins>+Conversion of sdpMLineIndex to unsigned short, following WebIDL rules without [Clamp] or [EnforceRange]
+PASS (new RTCIceCandidate({candidate:"foo", sdpMLineIndex:"a"})).sdpMLineIndex is 0
+PASS (new RTCIceCandidate({candidate:"foo", sdpMLineIndex:-1})).sdpMLineIndex is 65535
+PASS (new RTCIceCandidate({candidate:"foo", sdpMLineIndex:65536})).sdpMLineIndex is 0
+PASS (new RTCIceCandidate({candidate:"foo", sdpMLineIndex:65537})).sdpMLineIndex is 1
+
</ins><span class="cx"> Some bad input
</span><del>-PASS new RTCIceCandidate({candidate:"foo", sdpMLineIndex:"a"}); threw exception TypeError: Type error.
-PASS new RTCIceCandidate({candidate:"foo", sdpMLineIndex:-1}); threw exception TypeError: Type error.
-PASS new RTCIceCandidate({candidate:"foo", sdpMLineIndex:65536}); threw exception TypeError: Type error.
</del><span class="cx"> PASS new RTCIceCandidate(5); threw exception TypeError: Type error.
</span><span class="cx"> PASS new RTCIceCandidate("foobar"); threw exception TypeError: Type error.
</span><span class="cx"> PASS new RTCIceCandidate(candidate:""); threw exception SyntaxError: Unexpected token ':'. Expected ')' to end an argument list..
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCIceCandidatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -98,10 +98,14 @@
</span><span class="cx"> shouldBe('candidate.sdpMLineIndex', '6');
</span><span class="cx"> debug("");
</span><span class="cx">
</span><ins>+ debug("Conversion of sdpMLineIndex to unsigned short, following WebIDL rules without [Clamp] or [EnforceRange]");
+ shouldBe('(new RTCIceCandidate({candidate:"foo", sdpMLineIndex:"a"})).sdpMLineIndex', '0');
+ shouldBe('(new RTCIceCandidate({candidate:"foo", sdpMLineIndex:-1})).sdpMLineIndex', '65535');
+ shouldBe('(new RTCIceCandidate({candidate:"foo", sdpMLineIndex:65536})).sdpMLineIndex', '0');
+ shouldBe('(new RTCIceCandidate({candidate:"foo", sdpMLineIndex:65537})).sdpMLineIndex', '1');
+ debug("");
+
</ins><span class="cx"> debug("Some bad input");
</span><del>- shouldThrow('new RTCIceCandidate({candidate:"foo", sdpMLineIndex:"a"});');
- shouldThrow('new RTCIceCandidate({candidate:"foo", sdpMLineIndex:-1});');
- shouldThrow('new RTCIceCandidate({candidate:"foo", sdpMLineIndex:65536});');
</del><span class="cx"> shouldThrow('new RTCIceCandidate(5);');
</span><span class="cx"> shouldThrow('new RTCIceCandidate("foobar");');
</span><span class="cx"> shouldThrow('new RTCIceCandidate(candidate:"");');
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> PASS new RTCPeerConnection(undefined); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
</span><span class="cx"> PASS new RTCPeerConnection(); threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS new RTCPeerConnection(''); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
</span><del>-PASS new RTCPeerConnection({}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new RTCPeerConnection({iceServers:[]}); threw exception TypeError: Error creating RTCPeerConnection.
</del><ins>+PASS new RTCPeerConnection({}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[]}); did not throw exception.
</ins><span class="cx"> PASS new RTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[{urls:'http:foo.com'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}); did not throw exception.
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[{urls:'stun:foo.com', username:'user'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'}); did not throw exception.
</span><span class="cx"> PASS new RTCPeerConnection({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.
</span><del>-PASS new RTCPeerConnection({fooServers:[]}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new RTCPeerConnection({iceServers:true}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
-PASS new RTCPeerConnection({iceServers:[1, 2, 3]}); threw exception TypeError: Invalid RTCPeerConnection constructor arguments.
</del><ins>+PASS new RTCPeerConnection({fooServers:[]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:true}); threw exception TypeError: Error creating RTCPeerConnection.
+PASS new RTCPeerConnection({iceServers:[1, 2, 3]}); threw exception TypeError: Error creating RTCPeerConnection.
</ins><span class="cx"> PASS new RTCPeerConnection({iceServers:[{}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[{urls:'foo'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> PASS iceServers.length is 1
</span><span class="cx"> PASS configuration.iceTransportPolicy is "all"
</span><span class="cx"> PASS configuration.bundlePolicy is "balanced"
</span><del>-PASS iceServers[i].username is ""
-PASS iceServers[i].credential is ""
</del><ins>+PASS "username" in iceServers[i] is false
+PASS "credential" in iceServers[i] is false
</ins><span class="cx"> PASS urls[j] is "stun:foo.com"
</span><span class="cx"> PASS iceServers.length is 2
</span><span class="cx"> PASS configuration.iceTransportPolicy is "all"
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx"> PASS iceServers.length is 1
</span><span class="cx"> PASS configuration.iceTransportPolicy is "relay"
</span><span class="cx"> PASS configuration.bundlePolicy is "balanced"
</span><del>-PASS iceServers[i].username is ""
-PASS iceServers[i].credential is ""
</del><ins>+PASS "username" in iceServers[i] is false
+PASS "credential" in iceServers[i] is false
</ins><span class="cx"> PASS urls[j] is "stun:foo.com"
</span><span class="cx"> PASS iceServers.length is 1
</span><span class="cx"> PASS configuration.iceTransportPolicy is "relay"
</span><span class="cx"> PASS configuration.bundlePolicy is "max-compat"
</span><del>-PASS iceServers[i].username is ""
-PASS iceServers[i].credential is ""
</del><ins>+PASS "username" in iceServers[i] is false
+PASS "credential" in iceServers[i] is false
</ins><span class="cx"> PASS urls[j] is "stun:foo.com"
</span><span class="cx"> PASS iceServers.length is 2
</span><span class="cx"> PASS configuration.iceTransportPolicy is "relay"
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> PASS iceServers.length is 1
</span><span class="cx"> PASS configuration.iceTransportPolicy is "all"
</span><span class="cx"> PASS configuration.bundlePolicy is "balanced"
</span><del>-PASS iceServers[i].username is ""
-PASS iceServers[i].credential is ""
</del><ins>+PASS "username" in iceServers[i] is false
+PASS "credential" in iceServers[i] is false
</ins><span class="cx"> PASS urls[j] is "stun:foo.com"
</span><span class="cx"> PASS iceServers.length is 2
</span><span class="cx"> PASS configuration.iceTransportPolicy is "all"
</span><span class="lines">@@ -81,14 +81,14 @@
</span><span class="cx"> PASS iceServers.length is 1
</span><span class="cx"> PASS configuration.iceTransportPolicy is "relay"
</span><span class="cx"> PASS configuration.bundlePolicy is "balanced"
</span><del>-PASS iceServers[i].username is ""
-PASS iceServers[i].credential is ""
</del><ins>+PASS "username" in iceServers[i] is false
+PASS "credential" in iceServers[i] is false
</ins><span class="cx"> PASS urls[j] is "stun:foo.com"
</span><span class="cx"> PASS iceServers.length is 1
</span><span class="cx"> PASS configuration.iceTransportPolicy is "relay"
</span><span class="cx"> PASS configuration.bundlePolicy is "max-compat"
</span><del>-PASS iceServers[i].username is ""
-PASS iceServers[i].credential is ""
</del><ins>+PASS "username" in iceServers[i] is false
+PASS "credential" in iceServers[i] is false
</ins><span class="cx"> PASS urls[j] is "stun:foo.com"
</span><span class="cx"> PASS iceServers.length is 2
</span><span class="cx"> PASS configuration.iceTransportPolicy is "relay"
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -19,8 +19,14 @@
</span><span class="cx"> shouldBeEqualToString('configuration.iceTransportPolicy', iceTransportPolicy);
</span><span class="cx"> shouldBeEqualToString('configuration.bundlePolicy', bundlePolicy);
</span><span class="cx"> for (i = 0; i < iceServers.length; ++i) {
</span><del>- shouldBeEqualToString('iceServers[i].username', serversList[i].username);
- shouldBeEqualToString('iceServers[i].credential', serversList[i].credential);
</del><ins>+ if ("username" in serversList[i])
+ shouldBeEqualToString('iceServers[i].username', serversList[i].username);
+ else
+ shouldBeFalse('"username" in iceServers[i]');
+ if ("credential" in serversList[i])
+ shouldBeEqualToString('iceServers[i].credential', serversList[i].credential);
+ else
+ shouldBeFalse('"credential" in iceServers[i]');
</ins><span class="cx">
</span><span class="cx"> urls = iceServers[i].urls;
</span><span class="cx"> for (j = 0; j < urls.length; ++j)
</span><span class="lines">@@ -28,62 +34,62 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pc = new RTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
- var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
</del><ins>+ pc = new RTCPeerConnection({iceServers:[{urls:['stun:foo.com']}]});
+ var servers = [{urls:['stun:foo.com']}];
</ins><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'all', 'balanced');
</span><span class="cx">
</span><del>- pc = new RTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]});
</del><ins>+ pc = new RTCPeerConnection({iceServers:[{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com'], username:'user2', credential:'x'}]});
</ins><span class="cx"> servers = [{urls:['turn:foo.com'], username:'user', credential:'x'}, {urls:['stun:bar.com'], username:'user2', credential:'x'}];
</span><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'all', 'balanced');
</span><span class="cx">
</span><del>- pc = new RTCPeerConnection({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>+ pc = new RTCPeerConnection({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"> servers = [{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}];
</span><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'all', 'balanced');
</span><span class="cx">
</span><del>- pc = new RTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransportPolicy:'relay', bundlePolicy:'balanced'});
- var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
</del><ins>+ pc = new RTCPeerConnection({iceServers:[{urls:['stun:foo.com']}], iceTransportPolicy:'relay', bundlePolicy:'balanced'});
+ var servers = [{urls:['stun:foo.com']}];
</ins><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'relay', 'balanced');
</span><span class="cx">
</span><del>- pc = new RTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransportPolicy:'relay', bundlePolicy:'max-compat'});
- var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
</del><ins>+ pc = new RTCPeerConnection({iceServers:[{urls:['stun:foo.com']}], iceTransportPolicy:'relay', bundlePolicy:'max-compat'});
+ var servers = [{urls:['stun:foo.com']}];
</ins><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'relay', 'max-compat');
</span><span class="cx">
</span><del>- pc = new RTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}], iceTransportPolicy:'relay', bundlePolicy:'max-bundle'});
</del><ins>+ pc = new RTCPeerConnection({iceServers:[{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}], iceTransportPolicy:'relay', bundlePolicy:'max-bundle'});
</ins><span class="cx"> servers = [{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}];
</span><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'relay', 'max-bundle');
</span><span class="cx">
</span><del>- pc.setConfiguration({iceServers:[{urls:'stun:foo.com'}]});
- var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
</del><ins>+ pc.setConfiguration({iceServers:[{urls:['stun:foo.com']}]});
+ var servers = [{urls:['stun:foo.com']}];
</ins><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'all', 'balanced');
</span><span class="cx">
</span><del>- pc.setConfiguration({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]});
</del><ins>+ pc.setConfiguration({iceServers:[{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com'], username:'user2', credential:'x'}]});
</ins><span class="cx"> servers = [{urls:['turn:foo.com'], username:'user', credential:'x'}, {urls:['stun:bar.com'], username:'user2', credential:'x'}];
</span><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'all', 'balanced');
</span><span class="cx">
</span><del>- pc.setConfiguration({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>+ pc.setConfiguration({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"> servers = [{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}];
</span><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'all', 'balanced');
</span><span class="cx">
</span><del>- pc.setConfiguration({iceServers:[{urls:'stun:foo.com'}], iceTransportPolicy:'relay', bundlePolicy:'balanced'});
- var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
</del><ins>+ pc.setConfiguration({iceServers:[{urls:['stun:foo.com']}], iceTransportPolicy:'relay', bundlePolicy:'balanced'});
+ var servers = [{urls:['stun:foo.com']}];
</ins><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'relay', 'balanced');
</span><span class="cx">
</span><del>- pc.setConfiguration({iceServers:[{urls:'stun:foo.com'}], iceTransportPolicy:'relay', bundlePolicy:'max-compat'});
- var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
</del><ins>+ pc.setConfiguration({iceServers:[{urls:['stun:foo.com']}], iceTransportPolicy:'relay', bundlePolicy:'max-compat'});
+ var servers = [{urls:['stun:foo.com']}];
</ins><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'relay', 'max-compat');
</span><span class="cx">
</span><del>- pc.setConfiguration({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}], iceTransportPolicy:'relay', bundlePolicy:'max-bundle'});
</del><ins>+ pc.setConfiguration({iceServers:[{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}], iceTransportPolicy:'relay', bundlePolicy:'max-bundle'});
</ins><span class="cx"> servers = [{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}];
</span><span class="cx"> configuration = pc.getConfiguration();
</span><span class="cx"> checkConfiguration(servers, 'relay', 'max-bundle');
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> shouldThrow("new RTCPeerConnection(undefined);");
</span><span class="cx"> shouldThrow("new RTCPeerConnection();");
</span><span class="cx"> shouldThrow("new RTCPeerConnection('');");
</span><del>- shouldThrow("new RTCPeerConnection({});");
- shouldThrow("new RTCPeerConnection({iceServers:[]});");
</del><ins>+ shouldNotThrow("new RTCPeerConnection({});");
+ shouldNotThrow("new RTCPeerConnection({iceServers:[]});");
</ins><span class="cx"> shouldThrow("new RTCPeerConnection({iceServers:[{url:'stun:foo.com'}]});");
</span><span class="cx"> shouldThrow("new RTCPeerConnection({iceServers:[{urls:'http:foo.com'}]});");
</span><span class="cx">
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> shouldNotThrow("new RTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
</span><span class="cx"> shouldNotThrow("new RTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}], iceTransports:'all', requestIdentity:'ifconfigured'});");
</span><span class="cx">
</span><del>- shouldThrow("new RTCPeerConnection({fooServers:[]});");
</del><ins>+ shouldNotThrow("new RTCPeerConnection({fooServers:[]});");
</ins><span class="cx"> shouldThrow("new RTCPeerConnection({iceServers:true});");
</span><span class="cx"> shouldThrow("new RTCPeerConnection({iceServers:[1, 2, 3]});");
</span><span class="cx"> shouldThrow("new RTCPeerConnection({iceServers:[{}]});");
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCSessionDescriptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -15,11 +15,11 @@
</span><span class="cx"> *** Argument is mandatory
</span><span class="cx"> PASS new RTCSessionDescription(); threw exception TypeError: Not enough arguments.
</span><span class="cx"> *** Dictionary member type is required
</span><del>-PASS new RTCSessionDescription({}); threw exception TypeError: Type error.
-PASS new RTCSessionDescription({sdp:'x'}); threw exception TypeError: Type error.
-PASS new RTCSessionDescription({foo:'bar'}); threw exception TypeError: Type error.
</del><ins>+PASS new RTCSessionDescription({}); threw exception TypeError: Member RTCSessionDescriptionInit.type is required and must be an instance of RTCSdpType.
+PASS new RTCSessionDescription({sdp:'x'}); threw exception TypeError: Member RTCSessionDescriptionInit.type is required and must be an instance of RTCSdpType.
+PASS new RTCSessionDescription({foo:'bar'}); threw exception TypeError: Member RTCSessionDescriptionInit.type is required and must be an instance of RTCSdpType.
</ins><span class="cx"> PASS new RTCSessionDescription({type:'offer'}); did not throw exception.
</span><del>-PASS new RTCSessionDescription(null); threw exception TypeError: Type error.
</del><ins>+PASS new RTCSessionDescription(null); threw exception TypeError: Member RTCSessionDescriptionInit.type is required and must be an instance of RTCSdpType.
</ins><span class="cx"> PASS new RTCSessionDescription(5); threw exception TypeError: Type error.
</span><span class="cx"> PASS new RTCSessionDescription('foobar'); threw exception TypeError: Type error.
</span><span class="cx"> PASS new RTCSessionDescription({type:'foobar', sdp:'x'}); threw exception TypeError: Type error.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -3,15 +3,15 @@
</span><span class="cx"> FAIL new RTCPeerConnection() Not enough arguments
</span><span class="cx"> FAIL new RTCPeerConnection(null) RTCPeerConnection argument must be a valid Dictionary
</span><span class="cx"> FAIL new RTCPeerConnection(undefined) RTCPeerConnection argument must be a valid Dictionary
</span><del>-FAIL new RTCPeerConnection({}) Invalid RTCPeerConnection constructor arguments
</del><ins>+PASS new RTCPeerConnection({})
</ins><span class="cx"> PASS new RTCPeerConnection({ iceServers: null })
</span><del>-FAIL new RTCPeerConnection({ iceServers: undefined }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ iceServers: [] }) Error creating RTCPeerConnection
</del><ins>+PASS new RTCPeerConnection({ iceServers: undefined })
+PASS new RTCPeerConnection({ iceServers: [] })
</ins><span class="cx"> PASS new RTCPeerConnection({ iceServers: [{}] })
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: [null] })
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: [undefined] })
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: [{ urls: "stun:stun1.example.net" }] })
</span><del>-FAIL new RTCPeerConnection({ iceServers: [{ urls: [] }] }) Error creating RTCPeerConnection
</del><ins>+PASS new RTCPeerConnection({ iceServers: [{ urls: [] }] })
</ins><span class="cx"> PASS new RTCPeerConnection({ iceServers: [{ urls: ["stun:stun1.example.net"] }] })
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: [{ urls: ["stun:stun1.example.net", "stun:stun2.example.net"] }] })
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: [{ urls: "turns:turn.example.org", username: "user", credential: "cred" }] })
</span><span class="lines">@@ -43,38 +43,52 @@
</span><span class="cx"> FAIL new RTCPeerConnection({ iceServers: [{ urls: "http://example.com" }] }) assert_throws: function "function () {
</span><span class="cx"> eval(expr);
</span><span class="cx"> }" threw object "TypeError: Error creating RTCPeerConnection" that is not a DOMException SyntaxError: property "code" is equal to undefined, expected 12
</span><del>-FAIL new RTCPeerConnection({ iceServers: [{ urls: [], credentialType: "password" }] }) Error creating RTCPeerConnection
-FAIL new RTCPeerConnection({ iceServers: [{ urls: [], credentialType: "token" }] }) Error creating RTCPeerConnection
-PASS new RTCPeerConnection({ iceServers: [{ urls: [], credentialType: "invalid" }] })
</del><ins>+PASS new RTCPeerConnection({ iceServers: [{ urls: [], credentialType: "password" }] })
+PASS new RTCPeerConnection({ iceServers: [{ urls: [], credentialType: "token" }] })
+FAIL new RTCPeerConnection({ iceServers: [{ urls: [], credentialType: "invalid" }] }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
</ins><span class="cx"> PASS new RTCPeerConnection({ iceServers: [{ url: "stun:stun1.example.net" }] })
</span><span class="cx"> PASS new RTCPeerConnection({ iceTransportPolicy: null })
</span><del>-FAIL new RTCPeerConnection({ iceTransportPolicy: undefined }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ iceTransportPolicy: "relay" }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ iceTransportPolicy: "all" }) Invalid RTCPeerConnection constructor arguments
</del><ins>+PASS new RTCPeerConnection({ iceTransportPolicy: undefined })
+PASS new RTCPeerConnection({ iceTransportPolicy: "relay" })
+PASS new RTCPeerConnection({ iceTransportPolicy: "all" })
</ins><span class="cx"> PASS new RTCPeerConnection({ iceTransportPolicy: "invalid" })
</span><span class="cx"> PASS new RTCPeerConnection({ iceTransportPolicy: "none" })
</span><del>-FAIL new RTCPeerConnection({ iceTransports: "invalid" }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ iceTransports: "none" }) Invalid RTCPeerConnection constructor arguments
</del><ins>+PASS new RTCPeerConnection({ iceTransports: "invalid" })
+PASS new RTCPeerConnection({ iceTransports: "none" })
</ins><span class="cx"> PASS new RTCPeerConnection({ bundlePolicy: null })
</span><del>-FAIL new RTCPeerConnection({ bundlePolicy: undefined }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ bundlePolicy: "balanced" }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ bundlePolicy: "max-compat" }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ bundlePolicy: "max-bundle" }) Invalid RTCPeerConnection constructor arguments
</del><ins>+PASS new RTCPeerConnection({ bundlePolicy: undefined })
+PASS new RTCPeerConnection({ bundlePolicy: "balanced" })
+PASS new RTCPeerConnection({ bundlePolicy: "max-compat" })
+PASS new RTCPeerConnection({ bundlePolicy: "max-bundle" })
</ins><span class="cx"> PASS new RTCPeerConnection({ bundlePolicy: "invalid" })
</span><del>-PASS new RTCPeerConnection({ rtcpMuxPolicy: null })
-FAIL new RTCPeerConnection({ rtcpMuxPolicy: undefined }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ rtcpMuxPolicy: "negotiate" }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ rtcpMuxPolicy: "require" }) Invalid RTCPeerConnection constructor arguments
-PASS new RTCPeerConnection({ rtcpMuxPolicy: "invalid" })
</del><ins>+FAIL new RTCPeerConnection({ rtcpMuxPolicy: null }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
+PASS new RTCPeerConnection({ rtcpMuxPolicy: undefined })
+PASS new RTCPeerConnection({ rtcpMuxPolicy: "negotiate" })
+PASS new RTCPeerConnection({ rtcpMuxPolicy: "require" })
+FAIL new RTCPeerConnection({ rtcpMuxPolicy: "invalid" }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
</ins><span class="cx"> FAIL new RTCPeerConnection({ peerIdentity: toStringThrows }) assert_throws: function "function () {
</span><span class="cx"> eval(expr);
</span><del>- }" threw object "TypeError: Invalid RTCPeerConnection constructor arguments" ("TypeError") expected object "Error" ("Error")
-PASS new RTCPeerConnection({ certificates: null })
-FAIL new RTCPeerConnection({ certificates: undefined }) Invalid RTCPeerConnection constructor arguments
-FAIL new RTCPeerConnection({ certificates: [] }) Invalid RTCPeerConnection constructor arguments
-PASS new RTCPeerConnection({ certificates: [null] })
-PASS new RTCPeerConnection({ certificates: [undefined] })
-PASS new RTCPeerConnection({ iceCandidatePoolSize: toNumberThrows })
</del><ins>+ }" did not throw
+FAIL new RTCPeerConnection({ certificates: null }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
+PASS new RTCPeerConnection({ certificates: undefined })
+PASS new RTCPeerConnection({ certificates: [] })
+FAIL new RTCPeerConnection({ certificates: [null] }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
+FAIL new RTCPeerConnection({ certificates: [undefined] }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
+FAIL new RTCPeerConnection({ iceCandidatePoolSize: toNumberThrows }) assert_throws: function "function () {
+ eval(expr);
+ }" did not throw
</ins><span class="cx"> FAIL new RTCPeerConnection({ certificates: [certificate] }) RTCPeerConnection.generateCertificate is not a function. (In 'RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256" })', 'RTCPeerConnection.generateCertificate' is undefined)
</span><span class="cx"> FAIL new RTCPeerConnection({ certificates: [expiredCertificate] }) RTCPeerConnection.generateCertificate is not a function. (In 'RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires: 0 })', 'RTCPeerConnection.generateCertificate' is undefined)
</span><span class="cx"> FAIL localDescription initial value Not enough arguments
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -910,7 +910,6 @@
</span><span class="cx"> Modules/mediastream/MediaStreamTrackEvent.cpp
</span><span class="cx"> Modules/mediastream/NavigatorMediaDevices.cpp
</span><span class="cx"> Modules/mediastream/PeerConnectionBackend.cpp
</span><del>- Modules/mediastream/RTCConfiguration.cpp
</del><span class="cx"> Modules/mediastream/RTCDTMFSender.cpp
</span><span class="cx"> Modules/mediastream/RTCDTMFToneChangeEvent.cpp
</span><span class="cx"> Modules/mediastream/RTCDataChannel.cpp
</span><span class="lines">@@ -2335,7 +2334,6 @@
</span><span class="cx"> platform/mediastream/MediaStreamTrackPrivate.cpp
</span><span class="cx"> platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp
</span><span class="cx"> platform/mediastream/RTCIceCandidateDescriptor.cpp
</span><del>- platform/mediastream/RTCPeerConnectionHandler.cpp
</del><span class="cx"> platform/mediastream/RTCSessionDescriptionDescriptor.cpp
</span><span class="cx"> platform/mediastream/RealtimeMediaSource.cpp
</span><span class="cx"> platform/mediastream/RealtimeMediaSourceCenter.cpp
</span><span class="lines">@@ -2350,10 +2348,8 @@
</span><span class="cx"> platform/mock/MockRealtimeMediaSource.cpp
</span><span class="cx"> platform/mock/MockRealtimeMediaSourceCenter.cpp
</span><span class="cx"> platform/mock/MockRealtimeVideoSource.cpp
</span><del>- platform/mock/RTCDTMFSenderHandlerMock.cpp
</del><span class="cx"> platform/mock/RTCDataChannelHandlerMock.cpp
</span><span class="cx"> platform/mock/RTCNotifiersMock.cpp
</span><del>- platform/mock/RTCPeerConnectionHandlerMock.cpp
</del><span class="cx"> platform/mock/ScrollAnimatorMock.cpp
</span><span class="cx"> platform/mock/ScrollbarThemeMock.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/ChangeLog 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,5 +1,101 @@
</span><span class="cx"> 2016-12-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Remove uses of Dictionary in WebRTC IDL files
+ https://bugs.webkit.org/show_bug.cgi?id=165736
+
+ Reviewed by Sam Weinig.
+
+ Also removed quite a bit of unused code. There were some mocks that were out of date and
+ no longer matched the types used in the real code, that also were no longer hooked up,
+ and other types of dead code. We will have to implement anew when we want to restore tests
+ like the ones these were intended to enable.
+
+ * CMakeLists.txt: Updated for all the removed files.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp: Moved some types in here
+ that don't need to be in the header.
+ (WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection): Use make_unique.
+ (WebCore::MediaEndpointPeerConnection::setConfiguration): Changed argument type,
+ obviating the need for most of the code that was here.
+ * Modules/mediastream/MediaEndpointPeerConnection.h: Updated for the above. Made more
+ things private and final. Marked the constructor explicit. Removed unneeded includes.
+
+ * Modules/mediastream/PeerConnectionBackend.h: Removed unneeded includes and forward
+ declarations. Changed the argument type for setConfiguration (see above).
+
+ * Modules/mediastream/RTCConfiguration.cpp: Removed.
+ None of the code here was needed except for the ICE server validation, and that was
+ moved into RTCPeerConnection::setConfiguration.
+ * Modules/mediastream/RTCConfiguration.h: Changed this from a class to a struct since
+ this is now a dictionary rather than an interface.
+ * Modules/mediastream/RTCConfiguration.idl: Changed this from an interface to a dictionary.
+
+ * Modules/mediastream/RTCDTMFSender.cpp: Removed some of the code from this file. This
+ class currently isn't implemented, but was depending on RTCPeerConnectionHandler. I removed
+ some of the dead code. Someone will have to straighten this out so we can turn it back on.
+ * Modules/mediastream/RTCDTMFSender.h: Ditto.
+
+ * Modules/mediastream/RTCDataChannel.cpp: Updated includes.
+
+ * Modules/mediastream/RTCIceCandidate.cpp:
+ (WebCore::RTCIceCandidate::create): Removed most of the code, since this now takes
+ a structure rather than a WebCore::Dictionary, and so the bindings take care of the work.
+ * Modules/mediastream/RTCIceCandidate.h: Updated for the above.
+ * Modules/mediastream/RTCIceCandidate.idl: Changed the constructor to take a
+ RTCIceCandidateInit instead of a Dictionary.
+
+ * Modules/mediastream/RTCIceServer.h: Changed this from a class to a struct since
+ this is now a dictionary rather than an interface.
+ * Modules/mediastream/RTCIceServer.idl: Changed this from an interface to a dictionary.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::initializeWith): Take an RTCConfiguration rather than
+ a Dictionary.
+ (WebCore::RTCPeerConnection::getConfiguration): Moved to header, now an inline.
+ (WebCore::RTCPeerConnection::setConfiguration): Use the configuration dictionary now instead
+ of the configuration class. Also moved validation of server URLs here, formerly in the
+ RTCConfiguration RTCConfiguration::initialize function. Also moved code to convert from
+ RTCConfiguration to MediaEndpointConfiguration here, formerly in
+ MediaEndpointPeerConnection::setConfiguration.
+ * Modules/mediastream/RTCPeerConnection.h: Updated for the above.
+ * Modules/mediastream/RTCPeerConnection.idl: Changed argument to initializeWith and
+ setConfiguration from Dictionary to RTCConfiguration.
+
+ * Modules/mediastream/RTCSessionDescription.cpp:
+ (WebCore::parseTypeString): Deleted.
+ (WebCore::RTCSessionDescription::create): Changed to take struct instead of Dictionary.
+ * Modules/mediastream/RTCSessionDescription.h: Added Init struct and changed create to
+ take it.
+ * Modules/mediastream/RTCSessionDescription.idl: Changed constructor argument to take
+ RTCSessionDescriptionInit dictionary instead of Dictionary.
+
+ * Modules/webaudio/MediaStreamAudioDestinationNode.cpp: Updated includes.
+
+ * WebCore.xcodeproj/project.pbxproj: Updated for all the removed files.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDictionaryImplementationContent): Fixed convertDictionaryToJS to work with other
+ nullable types besides RefPtr.
+ * bindings/scripts/test/JS/JSTestObj.cpp: Regenerated.
+
+ * platform/mediastream/RTCConfigurationPrivate.h: Removed.
+ * platform/mediastream/RTCIceServerPrivate.h: Removed.
+ * platform/mediastream/RTCPeerConnectionHandler.cpp: Removed.
+ * platform/mediastream/RTCPeerConnectionHandler.h: Removed.
+ * platform/mock/RTCDTMFSenderHandlerMock.cpp: Removed.
+ * platform/mock/RTCDTMFSenderHandlerMock.h: Removed.
+
+ * platform/mock/RTCDataChannelHandlerMock.h: Updated includes, made more things private and final.
+
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp: Removed.
+ * platform/mock/RTCPeerConnectionHandlerMock.h: Removed.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals): Removed call to enableMockRTCPeerConnectionHandler.
+ (WebCore::Internals::enableMockRTCPeerConnectionHandler): Deleted.
+
+2016-12-11 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Use std::vsnprintf instead of vasprintf
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165740
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "JSRTCSessionDescription.h"
</span><span class="cx"> #include "MediaEndpointSessionConfiguration.h"
</span><ins>+#include "MediaEndpointSessionDescription.h"
</ins><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "MediaStreamEvent.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="lines">@@ -57,6 +58,9 @@
</span><span class="cx"> using namespace PeerConnection;
</span><span class="cx"> using namespace PeerConnectionStates;
</span><span class="cx">
</span><ins>+using MediaDescriptionVector = Vector<PeerMediaDescription>;
+using RtpTransceiverVector = Vector<RefPtr<RTCRtpTransceiver>>;
+
</ins><span class="cx"> // We use base64 to generate the random strings so we need a size that avoids padding to get ice-chars.
</span><span class="cx"> static const size_t cnameSize = 18;
</span><span class="cx"> // Size range from 4 to 256 ice-chars defined in RFC 5245.
</span><span class="lines">@@ -81,7 +85,7 @@
</span><span class="cx"> MediaEndpointPeerConnection::MediaEndpointPeerConnection(RTCPeerConnection& peerConnection)
</span><span class="cx"> : PeerConnectionBackend(peerConnection)
</span><span class="cx"> , m_mediaEndpoint(MediaEndpoint::create(*this))
</span><del>- , m_sdpProcessor(std::unique_ptr<SDPProcessor>(new SDPProcessor(m_peerConnection.scriptExecutionContext())))
</del><ins>+ , m_sdpProcessor(std::make_unique<SDPProcessor>(m_peerConnection.scriptExecutionContext()))
</ins><span class="cx"> , m_cname(randomString(cnameSize))
</span><span class="cx"> , m_iceUfrag(randomString(iceUfragSize))
</span><span class="cx"> , m_icePassword(randomString(icePasswordSize))
</span><span class="lines">@@ -594,21 +598,9 @@
</span><span class="cx"> return createRTCSessionDescription(m_pendingRemoteDescription.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaEndpointPeerConnection::setConfiguration(RTCConfiguration& configuration)
</del><ins>+void MediaEndpointPeerConnection::setConfiguration(MediaEndpointConfiguration&& configuration)
</ins><span class="cx"> {
</span><del>- Vector<MediaEndpointConfiguration::IceServerInfo> iceServers;
- if (configuration.iceServers().size()) {
- iceServers.reserveInitialCapacity(configuration.iceServers().size());
- for (auto& server : configuration.iceServers()) {
- Vector<URL> urls;
- urls.reserveInitialCapacity(server->urls().size());
- for (auto& url : server->urls())
- urls.uncheckedAppend(URL(URL(), url));
- iceServers.uncheckedAppend(MediaEndpointConfiguration::IceServerInfo { WTFMove(urls), server->credential(), server->username() });
- }
- }
-
- m_mediaEndpoint->setConfiguration({ WTFMove(iceServers), configuration.iceTransportPolicy(), configuration.bundlePolicy() });
</del><ins>+ m_mediaEndpoint->setConfiguration(WTFMove(configuration));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaEndpointPeerConnection::doAddIceCandidate(RTCIceCandidate& rtcCandidate)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -33,51 +33,43 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "MediaEndpoint.h"
</span><del>-#include "MediaEndpointSessionDescription.h"
</del><span class="cx"> #include "PeerConnectionBackend.h"
</span><ins>+#include "RTCSessionDescription.h"
</ins><span class="cx"> #include <wtf/Function.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaStream;
-class MediaStreamTrack;
</del><ins>+class MediaEndpointSessionDescription;
</ins><span class="cx"> class SDPProcessor;
</span><span class="cx">
</span><del>-struct PeerMediaDescription;
-
-using MediaDescriptionVector = Vector<PeerMediaDescription>;
-using RtpSenderVector = Vector<RefPtr<RTCRtpSender>>;
-using RtpTransceiverVector = Vector<RefPtr<RTCRtpTransceiver>>;
-
</del><span class="cx"> class MediaEndpointPeerConnection final : public PeerConnectionBackend, public MediaEndpointClient {
</span><span class="cx"> public:
</span><del>- MediaEndpointPeerConnection(RTCPeerConnection&);
</del><ins>+ explicit MediaEndpointPeerConnection(RTCPeerConnection&);
</ins><span class="cx">
</span><del>- RefPtr<RTCSessionDescription> localDescription() const override;
- RefPtr<RTCSessionDescription> currentLocalDescription() const override;
- RefPtr<RTCSessionDescription> pendingLocalDescription() const override;
</del><ins>+private:
+ RefPtr<RTCSessionDescription> localDescription() const final;
+ RefPtr<RTCSessionDescription> currentLocalDescription() const final;
+ RefPtr<RTCSessionDescription> pendingLocalDescription() const final;
</ins><span class="cx">
</span><del>- RefPtr<RTCSessionDescription> remoteDescription() const override;
- RefPtr<RTCSessionDescription> currentRemoteDescription() const override;
- RefPtr<RTCSessionDescription> pendingRemoteDescription() const override;
</del><ins>+ RefPtr<RTCSessionDescription> remoteDescription() const final;
+ RefPtr<RTCSessionDescription> currentRemoteDescription() const final;
+ RefPtr<RTCSessionDescription> pendingRemoteDescription() const final;
</ins><span class="cx">
</span><del>- void setConfiguration(RTCConfiguration&) override;
</del><ins>+ void setConfiguration(MediaEndpointConfiguration&&) final;
</ins><span class="cx">
</span><del>- void getStats(MediaStreamTrack*, PeerConnection::StatsPromise&&) override;
</del><ins>+ void getStats(MediaStreamTrack*, PeerConnection::StatsPromise&&) final;
</ins><span class="cx">
</span><del>- Vector<RefPtr<MediaStream>> getRemoteStreams() const override;
</del><ins>+ Vector<RefPtr<MediaStream>> getRemoteStreams() const final;
</ins><span class="cx">
</span><del>- Ref<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) override;
- void replaceTrack(RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromise<void>&&) override;
</del><ins>+ Ref<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) final;
+ void replaceTrack(RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromise<void>&&) final;
</ins><span class="cx">
</span><del>- bool isNegotiationNeeded() const override { return m_negotiationNeeded; };
- void markAsNeedingNegotiation() override;
- void clearNegotiationNeededState() override { m_negotiationNeeded = false; };
</del><ins>+ bool isNegotiationNeeded() const final { return m_negotiationNeeded; };
+ void markAsNeedingNegotiation() final;
+ void clearNegotiationNeededState() final { m_negotiationNeeded = false; };
</ins><span class="cx">
</span><del>- void emulatePlatformEvent(const String& action) override;
</del><ins>+ void emulatePlatformEvent(const String& action) final;
</ins><span class="cx">
</span><del>-private:
</del><span class="cx"> void runTask(Function<void ()>&&);
</span><span class="cx"> void startRunningTasks();
</span><span class="cx">
</span><span class="lines">@@ -106,10 +98,10 @@
</span><span class="cx"> RefPtr<RTCSessionDescription> createRTCSessionDescription(MediaEndpointSessionDescription*) const;
</span><span class="cx">
</span><span class="cx"> // MediaEndpointClient
</span><del>- void gotDtlsFingerprint(const String& fingerprint, const String& fingerprintFunction) override;
- void gotIceCandidate(const String& mid, IceCandidate&&) override;
- void doneGatheringCandidates(const String& mid) override;
- void iceTransportStateChanged(const String& mid, MediaEndpoint::IceTransportState) override;
</del><ins>+ void gotDtlsFingerprint(const String& fingerprint, const String& fingerprintFunction) final;
+ void gotIceCandidate(const String& mid, IceCandidate&&) final;
+ void doneGatheringCandidates(const String& mid) final;
+ void iceTransportStateChanged(const String& mid, MediaEndpoint::IceTransportState) final;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<RTCDataChannelHandler> createDataChannelHandler(const String&, const RTCDataChannelInit&) final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -34,28 +34,23 @@
</span><span class="cx">
</span><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "PeerConnectionStates.h"
</span><del>-#include "RTCDataChannel.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DOMError;
-class Event;
</del><span class="cx"> class MediaStream;
</span><span class="cx"> class MediaStreamTrack;
</span><span class="cx"> class PeerConnectionBackend;
</span><del>-class RTCConfiguration;
</del><span class="cx"> class RTCDataChannelHandler;
</span><span class="cx"> class RTCIceCandidate;
</span><span class="cx"> class RTCPeerConnection;
</span><span class="cx"> class RTCRtpReceiver;
</span><span class="cx"> class RTCRtpSender;
</span><del>-class RTCRtpSenderClient;
-class RTCRtpTransceiver;
</del><span class="cx"> class RTCSessionDescription;
</span><span class="cx"> class RTCStatsResponse;
</span><del>-class ScriptExecutionContext;
</del><span class="cx">
</span><ins>+struct MediaEndpointConfiguration;
</ins><span class="cx"> struct RTCAnswerOptions;
</span><ins>+struct RTCDataChannelInit;
</ins><span class="cx"> struct RTCOfferOptions;
</span><span class="cx">
</span><span class="cx"> namespace PeerConnection {
</span><span class="lines">@@ -63,8 +58,9 @@
</span><span class="cx"> using StatsPromise = DOMPromise<IDLInterface<RTCStatsResponse>>;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef std::unique_ptr<PeerConnectionBackend> (*CreatePeerConnectionBackend)(RTCPeerConnection&);
</del><ins>+using CreatePeerConnectionBackend = std::unique_ptr<PeerConnectionBackend> (*)(RTCPeerConnection&);
</ins><span class="cx">
</span><ins>+// FIXME: What is the value of this abstract class? There is only one concrete class derived from it.
</ins><span class="cx"> class PeerConnectionBackend {
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static CreatePeerConnectionBackend create;
</span><span class="lines">@@ -90,7 +86,7 @@
</span><span class="cx"> virtual RefPtr<RTCSessionDescription> currentRemoteDescription() const = 0;
</span><span class="cx"> virtual RefPtr<RTCSessionDescription> pendingRemoteDescription() const = 0;
</span><span class="cx">
</span><del>- virtual void setConfiguration(RTCConfiguration&) = 0;
</del><ins>+ virtual void setConfiguration(MediaEndpointConfiguration&&) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void getStats(MediaStreamTrack*, PeerConnection::StatsPromise&&) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,158 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2015 Ericsson AB. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Ericsson nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "RTCConfiguration.h"
-
-#if ENABLE(WEB_RTC)
-
-#include "ArrayValue.h"
-#include "Dictionary.h"
-#include "ExceptionCode.h"
-#include "URL.h"
-
-namespace WebCore {
-
-static bool validateIceServerURL(const String& iceURL)
-{
- URL url(URL(), iceURL);
- if (url.isEmpty() || !url.isValid() || !(url.protocolIs("turn") || url.protocolIs("turns") || url.protocolIs("stun")))
- return false;
-
- return true;
-}
-
-static ExceptionOr<Ref<RTCIceServer>> parseIceServer(const Dictionary& iceServer)
-{
- String credential, username;
- iceServer.get("credential", credential);
- iceServer.get("username", username);
-
- // Spec says that "urls" can be either a string or a sequence, so we must check for both.
- Vector<String> urlsList;
- String urlString;
- iceServer.get("urls", urlString);
- // This is the only way to check if "urls" is a sequence or a string. If we try to convert
- // to a sequence and it fails (in case it is a string), an exception will be set and the
- // RTCPeerConnection will fail.
- // So we convert to a string always, which converts a sequence to a string in the format: "foo, bar, ..",
- // then checking for a comma in the string assures that a string was a sequence and then we convert
- // it to a sequence safely.
- if (urlString.isEmpty())
- return Exception { INVALID_ACCESS_ERR };
-
- if (urlString.find(',') != notFound && iceServer.get("urls", urlsList) && urlsList.size()) {
- for (auto iter = urlsList.begin(); iter != urlsList.end(); ++iter) {
- if (!validateIceServerURL(*iter))
- return Exception { INVALID_ACCESS_ERR };
- }
- } else {
- if (!validateIceServerURL(urlString))
- return Exception { INVALID_ACCESS_ERR };
- urlsList.append(urlString);
- }
-
- return RTCIceServer::create(urlsList, credential, username);
-}
-
-ExceptionOr<RefPtr<RTCConfiguration>> RTCConfiguration::create(const Dictionary& configuration)
-{
- if (configuration.isUndefinedOrNull())
- return nullptr;
-
- auto result = adoptRef(*new RTCConfiguration);
- auto initializeResult = result->initialize(configuration);
- if (initializeResult.hasException())
- return initializeResult.releaseException();
-
- return RefPtr<RTCConfiguration> { WTFMove(result) };
-}
-
-RTCConfiguration::RTCConfiguration()
-{
-}
-
-ExceptionOr<void> RTCConfiguration::initialize(const Dictionary& configuration)
-{
- ArrayValue iceServers;
- bool ok = configuration.get("iceServers", iceServers);
- if (!ok || iceServers.isUndefinedOrNull())
- return Exception { TYPE_MISMATCH_ERR };
-
- size_t numberOfServers;
- ok = iceServers.length(numberOfServers);
- if (!ok)
- return Exception { TYPE_MISMATCH_ERR };
- if (!numberOfServers)
- return Exception { INVALID_ACCESS_ERR };
-
- for (size_t i = 0; i < numberOfServers; ++i) {
- Dictionary iceServerDict;
- ok = iceServers.get(i, iceServerDict);
- if (!ok)
- return Exception { TYPE_MISMATCH_ERR };
-
- auto server = parseIceServer(iceServerDict);
- if (server.hasException())
- return server.releaseException();
-
- m_iceServers.append(server.releaseReturnValue());
- }
-
- String iceTransportPolicy;
- if (configuration.get("iceTransportPolicy", iceTransportPolicy)) {
- if (iceTransportPolicy == "relay")
- m_iceTransportPolicy = IceTransportPolicy::Relay;
- else if (iceTransportPolicy == "all")
- m_iceTransportPolicy = IceTransportPolicy::All;
- else
- return Exception { TypeError };
- }
-
- String bundlePolicy;
- if (configuration.get("bundlePolicy", bundlePolicy)) {
- if (bundlePolicy == "balanced")
- m_bundlePolicy = BundlePolicy::Balanced;
- else if (bundlePolicy == "max-compat")
- m_bundlePolicy = BundlePolicy::MaxCompat;
- else if (bundlePolicy == "max-bundle")
- m_bundlePolicy = BundlePolicy::MaxBundle;
- else
- return Exception { TypeError };
- }
-
- return { };
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -32,36 +32,21 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "ExceptionOr.h"
</del><span class="cx"> #include "PeerConnectionStates.h"
</span><span class="cx"> #include "RTCIceServer.h"
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Dictionary;
</del><ins>+using RTCIceTransportPolicy = PeerConnectionStates::IceTransportPolicy;
+using RTCBundlePolicy = PeerConnectionStates::BundlePolicy;
</ins><span class="cx">
</span><del>-// FIXME: Why reference count this?
-class RTCConfiguration : public RefCounted<RTCConfiguration> {
-public:
- static ExceptionOr<RefPtr<RTCConfiguration>> create(const Dictionary& configuration);
</del><ins>+struct RTCConfiguration {
+ using IceTransportPolicy = RTCIceTransportPolicy;
+ using BundlePolicy = RTCBundlePolicy;
</ins><span class="cx">
</span><del>- using IceTransportPolicy = PeerConnectionStates::IceTransportPolicy;
- IceTransportPolicy iceTransportPolicy() const { return m_iceTransportPolicy; }
-
- using BundlePolicy = PeerConnectionStates::BundlePolicy;
- BundlePolicy bundlePolicy() const { return m_bundlePolicy; }
-
- Vector<RefPtr<RTCIceServer>> iceServers() const { return m_iceServers; }
-
-private:
- RTCConfiguration();
-
- ExceptionOr<void> initialize(const Dictionary& configuration);
-
- Vector<RefPtr<RTCIceServer>> m_iceServers;
- IceTransportPolicy m_iceTransportPolicy { IceTransportPolicy::All };
- BundlePolicy m_bundlePolicy { BundlePolicy::Balanced };
</del><ins>+ std::optional<Vector<RTCIceServer>> iceServers;
+ IceTransportPolicy iceTransportPolicy;
+ BundlePolicy bundlePolicy;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -28,10 +28,9 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><del>- ImplementationLacksVTable,
- NoInterfaceObject,
-] interface RTCConfiguration {
- readonly attribute sequence<RTCIceServer> iceServers;
- readonly attribute RTCIceTransportPolicy iceTransportPolicy;
- readonly attribute RTCBundlePolicy bundlePolicy;
</del><ins>+ JSGenerateToJSObject,
+] dictionary RTCConfiguration {
+ sequence<RTCIceServer> iceServers;
+ RTCIceTransportPolicy iceTransportPolicy = "all";
+ RTCBundlePolicy bundlePolicy = "balanced";
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -24,15 +24,13 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "RTCDTMFSender.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCDTMFSender.h"
-
</del><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "RTCDTMFSenderHandler.h"
</span><span class="cx"> #include "RTCDTMFToneChangeEvent.h"
</span><del>-#include "RTCPeerConnectionHandler.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,27 +41,14 @@
</span><span class="cx"> static const long minInterToneGapMs = 30;
</span><span class="cx"> static const long defaultInterToneGapMs = 70;
</span><span class="cx">
</span><del>-ExceptionOr<Ref<RTCDTMFSender>> RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, RefPtr<MediaStreamTrack>&& track)
-{
- auto handler = peerConnectionHandler->createDTMFSender(&track->source());
- if (!handler)
- return Exception { NOT_SUPPORTED_ERR };
-
- auto sender = adoptRef(*new RTCDTMFSender(*context, WTFMove(track), WTFMove(handler)));
- sender->suspendIfNeeded();
- return WTFMove(sender);
-}
-
-RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext& context, RefPtr<MediaStreamTrack>&& track, std::unique_ptr<RTCDTMFSenderHandler> handler)
</del><ins>+RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext& context, RefPtr<MediaStreamTrack>&& track)
</ins><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_track(WTFMove(track))
</span><span class="cx"> , m_duration(defaultToneDurationMs)
</span><span class="cx"> , m_interToneGap(defaultInterToneGapMs)
</span><del>- , m_handler(WTFMove(handler))
</del><span class="cx"> , m_stopped(false)
</span><span class="cx"> , m_scheduledEventTimer(*this, &RTCDTMFSender::scheduledEventTimerFired)
</span><span class="cx"> {
</span><del>- m_handler->setClient(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RTCDTMFSender::~RTCDTMFSender()
</span><span class="lines">@@ -72,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> bool RTCDTMFSender::canInsertDTMF() const
</span><span class="cx"> {
</span><del>- return m_handler->canInsertDTMF();
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamTrack* RTCDTMFSender::track() const
</span><span class="lines">@@ -82,10 +67,10 @@
</span><span class="cx">
</span><span class="cx"> String RTCDTMFSender::toneBuffer() const
</span><span class="cx"> {
</span><del>- return m_handler->currentToneBuffer();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> RTCDTMFSender::insertDTMF(const String& tones, std::optional<int> duration, std::optional<int> interToneGap)
</del><ins>+ExceptionOr<void> RTCDTMFSender::insertDTMF(const String&, std::optional<int> duration, std::optional<int> interToneGap)
</ins><span class="cx"> {
</span><span class="cx"> if (!canInsertDTMF())
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="lines">@@ -99,10 +84,7 @@
</span><span class="cx"> m_duration = duration.value_or(defaultToneDurationMs);
</span><span class="cx"> m_interToneGap = interToneGap.value_or(defaultInterToneGapMs);
</span><span class="cx">
</span><del>- if (!m_handler->insertDTMF(tones, m_duration, m_interToneGap))
- return Exception { SYNTAX_ERR };
-
- return { };
</del><ins>+ return Exception { SYNTAX_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCDTMFSender::didPlayTone(const String& tone)
</span><span class="lines">@@ -113,7 +95,6 @@
</span><span class="cx"> void RTCDTMFSender::stop()
</span><span class="cx"> {
</span><span class="cx"> m_stopped = true;
</span><del>- m_handler->setClient(nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* RTCDTMFSender::activeDOMObjectName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "ExceptionOr.h"
</span><del>-#include "RTCDTMFSenderHandlerClient.h"
</del><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx">
</span><span class="lines">@@ -37,19 +36,16 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MediaStreamTrack;
</span><del>-class RTCPeerConnectionHandler;
-class RTCDTMFSenderHandler;
</del><span class="cx">
</span><del>-class RTCDTMFSender final : public RefCounted<RTCDTMFSender>, public EventTargetWithInlineData, private RTCDTMFSenderHandlerClient, public ActiveDOMObject {
</del><ins>+class RTCDTMFSender final : public RefCounted<RTCDTMFSender>, public EventTargetWithInlineData, public ActiveDOMObject {
</ins><span class="cx"> public:
</span><del>- static ExceptionOr<Ref<RTCDTMFSender>> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, RefPtr<MediaStreamTrack>&&);
</del><span class="cx"> virtual ~RTCDTMFSender();
</span><span class="cx">
</span><span class="cx"> bool canInsertDTMF() const;
</span><span class="cx"> MediaStreamTrack* track() const;
</span><span class="cx"> String toneBuffer() const;
</span><del>- long duration() const { return m_duration; }
- long interToneGap() const { return m_interToneGap; }
</del><ins>+ int duration() const { return m_duration; }
+ int interToneGap() const { return m_interToneGap; }
</ins><span class="cx">
</span><span class="cx"> ExceptionOr<void> insertDTMF(const String& tones, std::optional<int> duration, std::optional<int> interToneGap);
</span><span class="cx">
</span><span class="lines">@@ -57,7 +53,7 @@
</span><span class="cx"> using RefCounted::deref;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCDTMFSender(ScriptExecutionContext&, RefPtr<MediaStreamTrack>&&, std::unique_ptr<RTCDTMFSenderHandler>);
</del><ins>+ RTCDTMFSender(ScriptExecutionContext&, RefPtr<MediaStreamTrack>&&);
</ins><span class="cx">
</span><span class="cx"> void stop() final;
</span><span class="cx"> const char* activeDOMObjectName() const final;
</span><span class="lines">@@ -69,17 +65,15 @@
</span><span class="cx"> void refEventTarget() final { ref(); }
</span><span class="cx"> void derefEventTarget() final { deref(); }
</span><span class="cx">
</span><del>- void didPlayTone(const String&) final;
</del><ins>+ void didPlayTone(const String&);
</ins><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(Ref<Event>&&);
</span><span class="cx"> void scheduledEventTimerFired();
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrack> m_track;
</span><del>- long m_duration;
- long m_interToneGap;
</del><ins>+ int m_duration;
+ int m_interToneGap;
</ins><span class="cx">
</span><del>- std::unique_ptr<RTCDTMFSenderHandler> m_handler;
-
</del><span class="cx"> bool m_stopped;
</span><span class="cx">
</span><span class="cx"> Timer m_scheduledEventTimer;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -23,17 +23,16 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "RTCDataChannel.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCDataChannel.h"
-
</del><span class="cx"> #include "Blob.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx"> #include "MessageEvent.h"
</span><span class="cx"> #include "RTCDataChannelHandler.h"
</span><del>-#include "RTCPeerConnectionHandler.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Blob;
</span><del>-class Dictionary;
</del><span class="cx"> class RTCPeerConnectionHandler;
</span><span class="cx">
</span><span class="cx"> class RTCDataChannel final : public RefCounted<RTCDataChannel>, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -35,35 +35,23 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "Dictionary.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ExceptionOr<Ref<RTCIceCandidate>> RTCIceCandidate::create(const Dictionary& dictionary)
</del><ins>+inline RTCIceCandidate::RTCIceCandidate(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex)
+ : m_candidate(candidate)
+ , m_sdpMid(sdpMid)
+ , m_sdpMLineIndex(sdpMLineIndex)
</ins><span class="cx"> {
</span><del>- String candidate;
- if (!dictionary.get("candidate", candidate))
- return Exception { TypeError };
</del><ins>+ ASSERT(!sdpMid.isNull() || sdpMLineIndex);
+}
</ins><span class="cx">
</span><del>- String sdpMid;
- dictionary.getWithUndefinedOrNullCheck("sdpMid", sdpMid);
-
- std::optional<unsigned short> sdpMLineIndex;
- String sdpMLineIndexString;
-
- if (dictionary.getWithUndefinedOrNullCheck("sdpMLineIndex", sdpMLineIndexString)) {
- bool intConversionOk;
- unsigned result = sdpMLineIndexString.toUIntStrict(&intConversionOk);
- if (!intConversionOk || result > USHRT_MAX)
- return Exception { TypeError };
- sdpMLineIndex = result;
- }
-
- if (sdpMid.isNull() && !sdpMLineIndex)
</del><ins>+ExceptionOr<Ref<RTCIceCandidate>> RTCIceCandidate::create(const Init& dictionary)
+{
+ if (dictionary.sdpMid.isNull() && !dictionary.sdpMLineIndex)
</ins><span class="cx"> return Exception { TypeError };
</span><del>-
- return adoptRef(*new RTCIceCandidate(candidate, sdpMid, sdpMLineIndex));
</del><ins>+ return create(dictionary.candidate, dictionary.sdpMid, dictionary.sdpMLineIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<RTCIceCandidate> RTCIceCandidate::create(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex)
</span><span class="lines">@@ -71,13 +59,6 @@
</span><span class="cx"> return adoptRef(*new RTCIceCandidate(candidate, sdpMid, sdpMLineIndex));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCIceCandidate::RTCIceCandidate(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex)
- : m_candidate(candidate)
- , m_sdpMid(sdpMid)
- , m_sdpMLineIndex(sdpMLineIndex)
-{
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -34,16 +34,18 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionOr.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><del>-#include <wtf/Optional.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Dictionary;
-class RTCIceCandidateDescriptor;
-
</del><span class="cx"> class RTCIceCandidate : public RefCounted<RTCIceCandidate>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- static ExceptionOr<Ref<RTCIceCandidate>> create(const Dictionary&);
</del><ins>+ struct Init {
+ String candidate;
+ String sdpMid;
+ std::optional<unsigned short> sdpMLineIndex;
+ };
+
+ static ExceptionOr<Ref<RTCIceCandidate>> create(const Init&);
</ins><span class="cx"> static Ref<RTCIceCandidate> create(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex);
</span><span class="cx">
</span><span class="cx"> const String& candidate() const { return m_candidate; }
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx"> std::optional<unsigned short> sdpMLineIndex() const { return m_sdpMLineIndex; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RTCIceCandidate(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex);
</del><ins>+ RTCIceCandidate(const String& candidate, const String& sdpMid, std::optional<unsigned short> sdpMLineIndex);
</ins><span class="cx">
</span><span class="cx"> String m_candidate;
</span><span class="cx"> String m_sdpMid;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><del>- Constructor(Dictionary dictionary),
</del><ins>+ Constructor(RTCIceCandidateInit candidateInitDict),
</ins><span class="cx"> ConstructorMayThrowException,
</span><span class="cx"> EnabledAtRuntime=peerConnection,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="lines">@@ -44,3 +44,9 @@
</span><span class="cx">
</span><span class="cx"> serializer = {candidate, sdpMid, sdpMLineIndex};
</span><span class="cx"> };
</span><ins>+
+dictionary RTCIceCandidateInit {
+ required DOMString candidate;
+ DOMString? sdpMid = null;
+ unsigned short? sdpMLineIndex = null;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -27,34 +27,16 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include <wtf/RefCounted.h>
</del><ins>+#include <wtf/Variant.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RTCIceServer : public RefCounted<RTCIceServer> {
-public:
- static Ref<RTCIceServer> create(const Vector<String>& urls, const String& credential, const String& username)
- {
- return adoptRef(*new RTCIceServer(urls, credential, username));
- }
- virtual ~RTCIceServer() { }
-
- const Vector<String>& urls() const { return m_urls; }
- const String& credential() const { return m_credential; }
- const String& username() const { return m_username; }
-
-private:
- RTCIceServer(const Vector<String>& urls, const String& credential, const String& username)
- : m_urls(urls)
- , m_credential(credential)
- , m_username(username)
- { }
-
- Vector<String> m_urls;
- String m_credential;
- String m_username;
</del><ins>+struct RTCIceServer {
+ Variant<String, Vector<String>> urls;
+ String credential;
+ String username;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceServeridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -25,10 +25,9 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><del>- NoInterfaceObject,
-] interface RTCIceServer {
- readonly attribute sequence<DOMString> urls;
- readonly attribute DOMString username;
- readonly attribute DOMString credential;
</del><ins>+ JSGenerateToJSObject,
+] dictionary RTCIceServer {
+ required (DOMString or sequence<DOMString>) urls;
+ DOMString username;
+ DOMString credential;
</ins><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -35,11 +35,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "Dictionary.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "MediaEndpointConfiguration.h"
</ins><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "RTCConfiguration.h"
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> RTCPeerConnection::initializeWith(Document& document, const Dictionary& rtcConfiguration)
</del><ins>+ExceptionOr<void> RTCPeerConnection::initializeWith(Document& document, RTCConfiguration&& configuration)
</ins><span class="cx"> {
</span><span class="cx"> if (!document.frame())
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> if (!m_backend)
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="cx">
</span><del>- return setConfiguration(rtcConfiguration);
</del><ins>+ return setConfiguration(WTFMove(configuration));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Ref<RTCRtpSender>> RTCPeerConnection::addTrack(Ref<MediaStreamTrack>&& track, const Vector<std::reference_wrapper<MediaStream>>& streams)
</span><span class="lines">@@ -348,25 +348,37 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCConfiguration* RTCPeerConnection::getConfiguration() const
</del><ins>+ExceptionOr<void> RTCPeerConnection::setConfiguration(RTCConfiguration&& configuration)
</ins><span class="cx"> {
</span><del>- return m_configuration.get();
-}
-
-ExceptionOr<void> RTCPeerConnection::setConfiguration(const Dictionary& configuration)
-{
- if (configuration.isUndefinedOrNull())
- return Exception { TypeError };
-
</del><span class="cx"> if (m_signalingState == SignalingState::Closed)
</span><span class="cx"> return Exception { INVALID_STATE_ERR };
</span><span class="cx">
</span><del>- auto newConfiguration = RTCConfiguration::create(configuration);
- if (newConfiguration.hasException())
- return newConfiguration.releaseException();
</del><ins>+ Vector<MediaEndpointConfiguration::IceServerInfo> servers;
+ if (configuration.iceServers) {
+ servers.reserveInitialCapacity(configuration.iceServers->size());
+ for (auto& server : configuration.iceServers.value()) {
+ Vector<URL> serverURLs;
+ WTF::switchOn(server.urls,
+ [&serverURLs] (const String& string) {
+ serverURLs.reserveInitialCapacity(1);
+ serverURLs.uncheckedAppend(URL { URL { }, string });
+ },
+ [&serverURLs] (const Vector<String>& vector) {
+ serverURLs.reserveInitialCapacity(vector.size());
+ for (auto& string : vector)
+ serverURLs.uncheckedAppend(URL { URL { }, string });
+ }
+ );
+ for (auto& serverURL : serverURLs) {
+ if (!(serverURL.protocolIs("turn") || serverURL.protocolIs("turns") || serverURL.protocolIs("stun")))
+ return Exception { INVALID_ACCESS_ERR };
+ }
+ servers.uncheckedAppend({ WTFMove(serverURLs), server.credential, server.username });
+ }
+ }
</ins><span class="cx">
</span><del>- m_configuration = newConfiguration.releaseReturnValue();
- m_backend->setConfiguration(*m_configuration);
</del><ins>+ m_backend->setConfiguration({ WTFMove(servers), configuration.iceTransportPolicy, configuration.bundlePolicy });
+ m_configuration = WTFMove(configuration);
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -37,19 +37,15 @@
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "MediaStream.h"
</span><ins>+#include "RTCConfiguration.h"
</ins><span class="cx"> #include "RTCDataChannel.h"
</span><span class="cx"> #include "RTCOfferAnswerOptions.h"
</span><span class="cx"> #include "RTCRtpTransceiver.h"
</span><del>-#include "ScriptWrappable.h"
-#include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Dictionary;
</del><span class="cx"> class MediaStreamTrack;
</span><span class="cx"> class PeerConnectionBackend;
</span><del>-class RTCConfiguration;
</del><span class="cx"> class RTCIceCandidate;
</span><span class="cx"> class RTCPeerConnectionErrorCallback;
</span><span class="cx"> class RTCSessionDescription;
</span><span class="lines">@@ -58,7 +54,7 @@
</span><span class="cx"> class RTCPeerConnection final : public RefCounted<RTCPeerConnection>, public RTCRtpSenderClient, public EventTargetWithInlineData, public ActiveDOMObject {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<RTCPeerConnection> create(ScriptExecutionContext&);
</span><del>- ~RTCPeerConnection();
</del><ins>+ virtual ~RTCPeerConnection();
</ins><span class="cx">
</span><span class="cx"> using AnswerOptions = RTCAnswerOptions;
</span><span class="cx"> using DataChannelInit = RTCDataChannelInit;
</span><span class="lines">@@ -65,7 +61,7 @@
</span><span class="cx"> using OfferAnswerOptions = RTCOfferAnswerOptions;
</span><span class="cx"> using OfferOptions = RTCOfferOptions;
</span><span class="cx">
</span><del>- ExceptionOr<void> initializeWith(Document&, const Dictionary&);
</del><ins>+ ExceptionOr<void> initializeWith(Document&, RTCConfiguration&&);
</ins><span class="cx">
</span><span class="cx"> const Vector<std::reference_wrapper<RTCRtpSender>>& getSenders() const { return m_transceiverSet->senders(); }
</span><span class="cx"> const Vector<std::reference_wrapper<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->receivers(); }
</span><span class="lines">@@ -107,8 +103,8 @@
</span><span class="cx"> String iceGatheringState() const;
</span><span class="cx"> String iceConnectionState() const;
</span><span class="cx">
</span><del>- RTCConfiguration* getConfiguration() const;
- ExceptionOr<void> setConfiguration(const Dictionary&);
</del><ins>+ const RTCConfiguration& getConfiguration() const { return m_configuration; }
+ ExceptionOr<void> setConfiguration(RTCConfiguration&&);
</ins><span class="cx">
</span><span class="cx"> void privateGetStats(MediaStreamTrack*, PeerConnection::StatsPromise&&);
</span><span class="cx">
</span><span class="lines">@@ -120,8 +116,8 @@
</span><span class="cx"> EventTargetInterface eventTargetInterface() const final { return RTCPeerConnectionEventTargetInterfaceType; }
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
</span><span class="cx">
</span><del>- using RefCounted<RTCPeerConnection>::ref;
- using RefCounted<RTCPeerConnection>::deref;
</del><ins>+ using RefCounted::ref;
+ using RefCounted::deref;
</ins><span class="cx">
</span><span class="cx"> // Used for testing with a mock
</span><span class="cx"> WEBCORE_EXPORT void emulatePlatformEvent(const String& action);
</span><span class="lines">@@ -167,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PeerConnectionBackend> m_backend;
</span><span class="cx">
</span><del>- RefPtr<RTCConfiguration> m_configuration;
</del><ins>+ RTCConfiguration m_configuration;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> JSBuiltinConstructor,
</span><span class="cx"> ] interface RTCPeerConnection : EventTarget {
</span><span class="cx"> // Private initializer
</span><del>- [PrivateIdentifier, CallWith=Document, MayThrowException] void initializeWith(Dictionary parameters);
</del><ins>+ [PrivateIdentifier, CallWith=Document, MayThrowException] void initializeWith(RTCConfiguration configuration);
</ins><span class="cx">
</span><span class="cx"> // RTP Media API extensions
</span><span class="cx"> [PrivateIdentifier, PublicIdentifier] sequence<RTCRtpSender> getSenders();
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> readonly attribute DOMString iceConnectionState;
</span><span class="cx">
</span><span class="cx"> RTCConfiguration getConfiguration();
</span><del>- [MayThrowException] void setConfiguration(Dictionary configuration);
</del><ins>+ [MayThrowException] void setConfiguration(RTCConfiguration configuration);
</ins><span class="cx">
</span><span class="cx"> [JSBuiltin] Promise<RTCStatsReport> getStats(optional MediaStreamTrack? selector = null);
</span><span class="cx"> // Legacy signature: Promise<void> getStats(MediaStreamTrack? selector
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -34,42 +34,17 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "Dictionary.h"
-#include "ExceptionCode.h"
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool parseTypeString(const String& string, RTCSessionDescription::SdpType& outType)
</del><ins>+inline RTCSessionDescription::RTCSessionDescription(SdpType type, const String& sdp)
+ : m_type(type)
+ , m_sdp(sdp)
</ins><span class="cx"> {
</span><del>- if (string == "offer")
- outType = RTCSessionDescription::SdpType::Offer;
- else if (string == "pranswer")
- outType = RTCSessionDescription::SdpType::Pranswer;
- else if (string == "answer")
- outType = RTCSessionDescription::SdpType::Answer;
- else if (string == "rollback")
- outType = RTCSessionDescription::SdpType::Rollback;
- else
- return false;
-
- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<RTCSessionDescription>> RTCSessionDescription::create(const Dictionary& dictionary)
</del><ins>+Ref<RTCSessionDescription> RTCSessionDescription::create(const Init& dictionary)
</ins><span class="cx"> {
</span><del>- String typeString;
- // Dictionary member type is required.
- if (!dictionary.get("type", typeString))
- return Exception { TypeError };
-
- SdpType type;
- if (!parseTypeString(typeString, type))
- return Exception { TypeError };
-
- String sdp;
- dictionary.get("sdp", sdp);
-
- return adoptRef(*new RTCSessionDescription(type, sdp));
</del><ins>+ return create(dictionary.type, dictionary.sdp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<RTCSessionDescription> RTCSessionDescription::create(SdpType type, const String& sdp)
</span><span class="lines">@@ -77,12 +52,6 @@
</span><span class="cx"> return adoptRef(*new RTCSessionDescription(type, sdp));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCSessionDescription::RTCSessionDescription(SdpType type, const String& sdp)
- : m_type(type)
- , m_sdp(sdp)
-{
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -37,18 +37,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Dictionary;
-
</del><span class="cx"> class RTCSessionDescription : public RefCounted<RTCSessionDescription>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- enum class SdpType {
- Offer,
- Pranswer,
- Answer,
- Rollback
</del><ins>+ enum class SdpType { Offer, Pranswer, Answer, Rollback };
+
+ struct Init {
+ SdpType type;
+ String sdp;
</ins><span class="cx"> };
</span><del>-
- static ExceptionOr<Ref<RTCSessionDescription>> create(const Dictionary&);
</del><ins>+ static Ref<RTCSessionDescription> create(const Init&);
</ins><span class="cx"> static Ref<RTCSessionDescription> create(SdpType, const String& sdp);
</span><span class="cx">
</span><span class="cx"> SdpType type() const { return m_type; }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -31,8 +31,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><del>- Constructor(Dictionary dictionary),
- ConstructorMayThrowException,
</del><ins>+ Constructor(RTCSessionDescriptionInit descriptionInitDict),
</ins><span class="cx"> EnabledAtRuntime=peerConnection,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> PrivateIdentifier,
</span><span class="lines">@@ -44,9 +43,9 @@
</span><span class="cx"> serializer = {type, sdp};
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum RTCSdpType {
- "offer",
- "pranswer",
- "answer",
- "rollback"
</del><ins>+enum RTCSdpType { "offer", "pranswer", "answer", "rollback" };
+
+dictionary RTCSessionDescriptionInit {
+ required RTCSdpType type;
+ DOMString sdp = "";
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -23,16 +23,14 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "MediaStreamAudioDestinationNode.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO) && ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamAudioDestinationNode.h"
-
</del><span class="cx"> #include "AudioContext.h"
</span><span class="cx"> #include "AudioNodeInput.h"
</span><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "MediaStreamAudioSource.h"
</span><del>-#include "RTCPeerConnectionHandler.h"
</del><span class="cx"> #include <wtf/Locker.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -138,12 +138,8 @@
</span><span class="cx"> 073794E619EE2FF200E5A045 /* JSRTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */; };
</span><span class="cx"> 073794EB19EE341E00E5A045 /* JSRTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794E919EE341E00E5A045 /* JSRTCIceServer.cpp */; };
</span><span class="cx"> 073794EC19EE341E00E5A045 /* JSRTCIceServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794EA19EE341E00E5A045 /* JSRTCIceServer.h */; };
</span><del>- 073794F119EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794EF19EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp */; };
- 073794F219EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794F019EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.h */; };
</del><span class="cx"> 073794F919F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */; };
</span><span class="cx"> 073794FA19F5864E00E5A045 /* RTCDataChannelHandlerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794F419F5864E00E5A045 /* RTCDataChannelHandlerMock.h */; };
</span><del>- 073794FB19F5864E00E5A045 /* RTCDTMFSenderHandlerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794F519F5864E00E5A045 /* RTCDTMFSenderHandlerMock.cpp */; };
- 073794FC19F5864E00E5A045 /* RTCDTMFSenderHandlerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794F619F5864E00E5A045 /* RTCDTMFSenderHandlerMock.h */; };
</del><span class="cx"> 073794FD19F5864E00E5A045 /* RTCNotifiersMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794F719F5864E00E5A045 /* RTCNotifiersMock.cpp */; };
</span><span class="cx"> 073794FE19F5864E00E5A045 /* RTCNotifiersMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794F819F5864E00E5A045 /* RTCNotifiersMock.h */; };
</span><span class="cx"> 07394EC81BAB2CCD00BE99CD /* MediaDevicesRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07394EC71BAB2CCD00BE99CD /* MediaDevicesRequest.cpp */; };
</span><span class="lines">@@ -152,7 +148,6 @@
</span><span class="cx"> 073BE34117D17E01002BD431 /* JSNavigatorUserMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 073BE34E17D180B2002BD431 /* RTCSessionDescriptionDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221BAB17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.cpp */; };
</span><span class="cx"> 073BE34F17D18183002BD431 /* RTCIceCandidateDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221BA617CF0AD400848E51 /* RTCIceCandidateDescriptor.cpp */; };
</span><del>- 073BE35017D181A6002BD431 /* RTCPeerConnectionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221BA817CF0AD400848E51 /* RTCPeerConnectionHandler.cpp */; };
</del><span class="cx"> 074E82BA18A69F0E007EF54C /* PlatformTimeRanges.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 074E82B818A69F0E007EF54C /* PlatformTimeRanges.cpp */; };
</span><span class="cx"> 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */ = {isa = PBXBuildFile; fileRef = 074E82B918A69F0E007EF54C /* PlatformTimeRanges.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0753860214489E9800B78452 /* CachedTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0753860014489E9800B78452 /* CachedTextTrack.cpp */; };
</span><span class="lines">@@ -224,7 +219,6 @@
</span><span class="cx"> 078E093E17D16E1C00420AA1 /* RTCDTMFSenderHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA417CF0AD400848E51 /* RTCDTMFSenderHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093F17D16E1C00420AA1 /* RTCDTMFSenderHandlerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA517CF0AD400848E51 /* RTCDTMFSenderHandlerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E094017D16E1C00420AA1 /* RTCIceCandidateDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA717CF0AD400848E51 /* RTCIceCandidateDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 078E094117D16E1C00420AA1 /* RTCPeerConnectionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA917CF0AD400848E51 /* RTCPeerConnectionHandler.h */; };
</del><span class="cx"> 078E094217D16E1C00420AA1 /* RTCPeerConnectionHandlerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BAA17CF0AD400848E51 /* RTCPeerConnectionHandlerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E094317D16E1C00420AA1 /* RTCSessionDescriptionDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BAC17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E094417D16E1C00420AA1 /* RTCSessionDescriptionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BAD17CF0AD400848E51 /* RTCSessionDescriptionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -270,8 +264,6 @@
</span><span class="cx"> 07AA6B6C166D2C1300D45671 /* InbandTextTrackPrivateAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AA6B69166D019500D45671 /* InbandTextTrackPrivateAVFObjC.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07AB996918DA3C010018771E /* RTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996518DA3C010018771E /* RTCConfiguration.h */; };
</span><span class="cx"> 07AB996B18DA3C010018771E /* RTCIceServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996718DA3C010018771E /* RTCIceServer.h */; };
</span><del>- 07AB996F18DA3C740018771E /* RTCConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996D18DA3C740018771E /* RTCConfigurationPrivate.h */; };
- 07AB997018DA3C740018771E /* RTCIceServerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996E18DA3C740018771E /* RTCIceServerPrivate.h */; };
</del><span class="cx"> 07ABEF6C1D8A1C5800F21972 /* MediaDevicesEnumerationRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07ABEF6B1D8A1C5800F21972 /* MediaDevicesEnumerationRequest.cpp */; };
</span><span class="cx"> 07ABEF6E1D8A1C7600F21972 /* MediaDevicesEnumerationRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 07ABEF6D1D8A1C7600F21972 /* MediaDevicesEnumerationRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07AC47011952102100EE9723 /* ISOVTTCue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07AC46FF1952102100EE9723 /* ISOVTTCue.cpp */; };
</span><span class="lines">@@ -2494,7 +2486,6 @@
</span><span class="cx"> 5E16A2E41BFA650B0029A21E /* MediaEndpointPeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E16A2E31BFA64FB0029A21E /* MediaEndpointPeerConnection.h */; };
</span><span class="cx"> 5E16A2E51BFA650F0029A21E /* MediaEndpointPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E16A2E21BFA64FB0029A21E /* MediaEndpointPeerConnection.cpp */; };
</span><span class="cx"> 5E2C43511BCEE2F60001E2BC /* PeerConnectionBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E2C434D1BCEE2E50001E2BC /* PeerConnectionBackend.h */; };
</span><del>- 5E2C43531BCEE2F60001E2BC /* RTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2C434F1BCEE2E50001E2BC /* RTCConfiguration.cpp */; };
</del><span class="cx"> 5E2C435F1BCEE31E0001E2BC /* RTCRtpSenderReceiverBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E2C435D1BCEE30D0001E2BC /* RTCRtpSenderReceiverBase.h */; };
</span><span class="cx"> 5E2C43601BCEE3230001E2BC /* RTCRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2C43591BCEE30D0001E2BC /* RTCRtpSender.cpp */; };
</span><span class="cx"> 5E2C43611BCEE3230001E2BC /* RTCRtpSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E2C435A1BCEE30D0001E2BC /* RTCRtpSender.h */; };
</span><span class="lines">@@ -7116,8 +7107,6 @@
</span><span class="cx"> 07221BA517CF0AD400848E51 /* RTCDTMFSenderHandlerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDTMFSenderHandlerClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA617CF0AD400848E51 /* RTCIceCandidateDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCIceCandidateDescriptor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA717CF0AD400848E51 /* RTCIceCandidateDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceCandidateDescriptor.h; sourceTree = "<group>"; };
</span><del>- 07221BA817CF0AD400848E51 /* RTCPeerConnectionHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCPeerConnectionHandler.cpp; sourceTree = "<group>"; };
- 07221BA917CF0AD400848E51 /* RTCPeerConnectionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCPeerConnectionHandler.h; sourceTree = "<group>"; };
</del><span class="cx"> 07221BAA17CF0AD400848E51 /* RTCPeerConnectionHandlerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCPeerConnectionHandlerClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BAB17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCSessionDescriptionDescriptor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07221BAC17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCSessionDescriptionDescriptor.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7155,12 +7144,8 @@
</span><span class="cx"> 073794EA19EE341E00E5A045 /* JSRTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceServer.h; sourceTree = "<group>"; };
</span><span class="cx"> 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaStream.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMURLMediaStream.idl; sourceTree = "<group>"; };
</span><del>- 073794EF19EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCPeerConnectionHandlerMock.cpp; sourceTree = "<group>"; };
- 073794F019EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCPeerConnectionHandlerMock.h; sourceTree = "<group>"; };
</del><span class="cx"> 073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDataChannelHandlerMock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 073794F419F5864E00E5A045 /* RTCDataChannelHandlerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandlerMock.h; sourceTree = "<group>"; };
</span><del>- 073794F519F5864E00E5A045 /* RTCDTMFSenderHandlerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDTMFSenderHandlerMock.cpp; sourceTree = "<group>"; };
- 073794F619F5864E00E5A045 /* RTCDTMFSenderHandlerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDTMFSenderHandlerMock.h; sourceTree = "<group>"; };
</del><span class="cx"> 073794F719F5864E00E5A045 /* RTCNotifiersMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCNotifiersMock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 073794F819F5864E00E5A045 /* RTCNotifiersMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCNotifiersMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 07394EC71BAB2CCD00BE99CD /* MediaDevicesRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDevicesRequest.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -7239,8 +7224,6 @@
</span><span class="cx"> 07AB996618DA3C010018771E /* RTCConfiguration.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCConfiguration.idl; sourceTree = "<group>"; };
</span><span class="cx"> 07AB996718DA3C010018771E /* RTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceServer.h; sourceTree = "<group>"; };
</span><span class="cx"> 07AB996818DA3C010018771E /* RTCIceServer.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceServer.idl; sourceTree = "<group>"; };
</span><del>- 07AB996D18DA3C740018771E /* RTCConfigurationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCConfigurationPrivate.h; sourceTree = "<group>"; };
- 07AB996E18DA3C740018771E /* RTCIceServerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceServerPrivate.h; sourceTree = "<group>"; };
</del><span class="cx"> 07ABEF6B1D8A1C5800F21972 /* MediaDevicesEnumerationRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDevicesEnumerationRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07ABEF6D1D8A1C7600F21972 /* MediaDevicesEnumerationRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaDevicesEnumerationRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 07AC46FF1952102100EE9723 /* ISOVTTCue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOVTTCue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9762,7 +9745,6 @@
</span><span class="cx"> 5E16A2E21BFA64FB0029A21E /* MediaEndpointPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = MediaEndpointPeerConnection.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</span><span class="cx"> 5E16A2E31BFA64FB0029A21E /* MediaEndpointPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MediaEndpointPeerConnection.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><span class="cx"> 5E2C434D1BCEE2E50001E2BC /* PeerConnectionBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeerConnectionBackend.h; sourceTree = "<group>"; };
</span><del>- 5E2C434F1BCEE2E50001E2BC /* RTCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCConfiguration.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 5E2C43541BCEE30D0001E2BC /* RTCPeerConnection.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = RTCPeerConnection.js; sourceTree = "<group>"; };
</span><span class="cx"> 5E2C43551BCEE30D0001E2BC /* RTCPeerConnectionInternals.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = RTCPeerConnectionInternals.js; sourceTree = "<group>"; };
</span><span class="cx"> 5E2C43561BCEE30D0001E2BC /* RTCRtpReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCRtpReceiver.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15084,7 +15066,6 @@
</span><span class="cx"> 072A703F1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.idl */,
</span><span class="cx"> 41E408381DCB747900EFCE19 /* PeerConnectionBackend.cpp */,
</span><span class="cx"> 5E2C434D1BCEE2E50001E2BC /* PeerConnectionBackend.h */,
</span><del>- 5E2C434F1BCEE2E50001E2BC /* RTCConfiguration.cpp */,
</del><span class="cx"> 07AB996518DA3C010018771E /* RTCConfiguration.h */,
</span><span class="cx"> 07AB996618DA3C010018771E /* RTCConfiguration.idl */,
</span><span class="cx"> 07221B6317CEC32700848E51 /* RTCDataChannel.cpp */,
</span><span class="lines">@@ -15181,7 +15162,6 @@
</span><span class="cx"> 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceSettings.h */,
</span><span class="cx"> 2EC41DE21C0410A300D294FE /* RealtimeMediaSourceSupportedConstraints.cpp */,
</span><span class="cx"> 07C1C0E41BFB60ED00BD2256 /* RealtimeMediaSourceSupportedConstraints.h */,
</span><del>- 07AB996D18DA3C740018771E /* RTCConfigurationPrivate.h */,
</del><span class="cx"> 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */,
</span><span class="cx"> 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */,
</span><span class="cx"> 07221BA417CF0AD400848E51 /* RTCDTMFSenderHandler.h */,
</span><span class="lines">@@ -15188,9 +15168,6 @@
</span><span class="cx"> 07221BA517CF0AD400848E51 /* RTCDTMFSenderHandlerClient.h */,
</span><span class="cx"> 07221BA617CF0AD400848E51 /* RTCIceCandidateDescriptor.cpp */,
</span><span class="cx"> 07221BA717CF0AD400848E51 /* RTCIceCandidateDescriptor.h */,
</span><del>- 07AB996E18DA3C740018771E /* RTCIceServerPrivate.h */,
- 07221BA817CF0AD400848E51 /* RTCPeerConnectionHandler.cpp */,
- 07221BA917CF0AD400848E51 /* RTCPeerConnectionHandler.h */,
</del><span class="cx"> 07221BAA17CF0AD400848E51 /* RTCPeerConnectionHandlerClient.h */,
</span><span class="cx"> 07221BAB17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.cpp */,
</span><span class="cx"> 07221BAC17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.h */,
</span><span class="lines">@@ -17332,12 +17309,8 @@
</span><span class="cx"> AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */,
</span><span class="cx"> 073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */,
</span><span class="cx"> 073794F419F5864E00E5A045 /* RTCDataChannelHandlerMock.h */,
</span><del>- 073794F519F5864E00E5A045 /* RTCDTMFSenderHandlerMock.cpp */,
- 073794F619F5864E00E5A045 /* RTCDTMFSenderHandlerMock.h */,
</del><span class="cx"> 073794F719F5864E00E5A045 /* RTCNotifiersMock.cpp */,
</span><span class="cx"> 073794F819F5864E00E5A045 /* RTCNotifiersMock.h */,
</span><del>- 073794EF19EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp */,
- 073794F019EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.h */,
</del><span class="cx"> 5CB37FFC1C62D27800F20188 /* ScrollAnimatorMock.cpp */,
</span><span class="cx"> 5CB37FFD1C62D27800F20188 /* ScrollAnimatorMock.h */,
</span><span class="cx"> 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */,
</span><span class="lines">@@ -27371,7 +27344,6 @@
</span><span class="cx"> A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
</span><span class="cx"> 57E233631DC7DA2400F28D01 /* RsaOtherPrimesInfo.h in Headers */,
</span><span class="cx"> 07AB996918DA3C010018771E /* RTCConfiguration.h in Headers */,
</span><del>- 07AB996F18DA3C740018771E /* RTCConfigurationPrivate.h in Headers */,
</del><span class="cx"> 5351D4B11DF916B4008010CD /* FileHandle.h in Headers */,
</span><span class="cx"> 078E091E17D14D1C00420AA1 /* RTCDataChannel.h in Headers */,
</span><span class="cx"> 078E091F17D14D1C00420AA1 /* RTCDataChannelEvent.h in Headers */,
</span><span class="lines">@@ -27381,20 +27353,16 @@
</span><span class="cx"> 078E092017D14D1C00420AA1 /* RTCDTMFSender.h in Headers */,
</span><span class="cx"> 078E093E17D16E1C00420AA1 /* RTCDTMFSenderHandler.h in Headers */,
</span><span class="cx"> 078E093F17D16E1C00420AA1 /* RTCDTMFSenderHandlerClient.h in Headers */,
</span><del>- 073794FC19F5864E00E5A045 /* RTCDTMFSenderHandlerMock.h in Headers */,
</del><span class="cx"> 078E092117D14D1C00420AA1 /* RTCDTMFToneChangeEvent.h in Headers */,
</span><span class="cx"> 078E092317D14D1C00420AA1 /* RTCIceCandidate.h in Headers */,
</span><span class="cx"> 078E094017D16E1C00420AA1 /* RTCIceCandidateDescriptor.h in Headers */,
</span><span class="cx"> 078E092417D14D1C00420AA1 /* RTCIceCandidateEvent.h in Headers */,
</span><span class="cx"> 07AB996B18DA3C010018771E /* RTCIceServer.h in Headers */,
</span><del>- 07AB997018DA3C740018771E /* RTCIceServerPrivate.h in Headers */,
</del><span class="cx"> 073794FE19F5864E00E5A045 /* RTCNotifiersMock.h in Headers */,
</span><span class="cx"> 073794DE19EE2C5200E5A045 /* RTCOfferAnswerOptions.h in Headers */,
</span><span class="cx"> 078E092517D14D1C00420AA1 /* RTCPeerConnection.h in Headers */,
</span><span class="cx"> 5E2C437B1BCF9A570001E2BC /* RTCPeerConnectionBuiltins.h in Headers */,
</span><del>- 078E094117D16E1C00420AA1 /* RTCPeerConnectionHandler.h in Headers */,
</del><span class="cx"> 078E094217D16E1C00420AA1 /* RTCPeerConnectionHandlerClient.h in Headers */,
</span><del>- 073794F219EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.h in Headers */,
</del><span class="cx"> 5E2C437C1BCF9A840001E2BC /* RTCPeerConnectionInternalsBuiltins.h in Headers */,
</span><span class="cx"> 5E2C43631BCEE32B0001E2BC /* RTCRtpReceiver.h in Headers */,
</span><span class="cx"> 5E2C43611BCEE3230001E2BC /* RTCRtpSender.h in Headers */,
</span><span class="lines">@@ -31043,12 +31011,10 @@
</span><span class="cx"> A8CFF5E70A155A05000A4234 /* RootInlineBox.cpp in Sources */,
</span><span class="cx"> 49E911C80EF86D47009D0CAF /* RotateTransformOperation.cpp in Sources */,
</span><span class="cx"> A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */,
</span><del>- 5E2C43531BCEE2F60001E2BC /* RTCConfiguration.cpp in Sources */,
</del><span class="cx"> 078E090517D14CEE00420AA1 /* RTCDataChannel.cpp in Sources */,
</span><span class="cx"> 078E090617D14CEE00420AA1 /* RTCDataChannelEvent.cpp in Sources */,
</span><span class="cx"> 073794F919F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp in Sources */,
</span><span class="cx"> 078E090717D14CEE00420AA1 /* RTCDTMFSender.cpp in Sources */,
</span><del>- 073794FB19F5864E00E5A045 /* RTCDTMFSenderHandlerMock.cpp in Sources */,
</del><span class="cx"> 078E090817D14CEE00420AA1 /* RTCDTMFToneChangeEvent.cpp in Sources */,
</span><span class="cx"> 078E090917D14CEE00420AA1 /* RTCIceCandidate.cpp in Sources */,
</span><span class="cx"> 073BE34F17D18183002BD431 /* RTCIceCandidateDescriptor.cpp in Sources */,
</span><span class="lines">@@ -31055,8 +31021,6 @@
</span><span class="cx"> 078E090A17D14CEE00420AA1 /* RTCIceCandidateEvent.cpp in Sources */,
</span><span class="cx"> 073794FD19F5864E00E5A045 /* RTCNotifiersMock.cpp in Sources */,
</span><span class="cx"> 078E090B17D14CEE00420AA1 /* RTCPeerConnection.cpp in Sources */,
</span><del>- 073BE35017D181A6002BD431 /* RTCPeerConnectionHandler.cpp in Sources */,
- 073794F119EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp in Sources */,
</del><span class="cx"> 5E2C43621BCEE32B0001E2BC /* RTCRtpReceiver.cpp in Sources */,
</span><span class="cx"> 5E2C43601BCEE3230001E2BC /* RTCRtpSender.cpp in Sources */,
</span><span class="cx"> 5E5E2B131CFC3E70000C0D85 /* RTCRtpTransceiver.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1353,8 +1353,8 @@
</span><span class="cx"> # 2. Let value be the result of converting idlValue to an ECMAScript value.
</span><span class="cx"> # 3. Perform ! CreateDataProperty(O, key, value).
</span><span class="cx"> if (!$member->isRequired && not defined $member->default) {
</span><del>- $result .= " if (dictionary.${key}) {\n";
- $result .= " auto ${key}Value = toJS<$IDLType>(state, globalObject, dictionary.${key});\n";
</del><ins>+ $result .= " if (!${IDLType}::isNullValue(dictionary.${key})) {\n";
+ $result .= " auto ${key}Value = toJS<$IDLType>(state, globalObject, ${IDLType}::extractValueFromNullable(dictionary.${key}));\n";
</ins><span class="cx"> $result .= " result->putDirect(vm, JSC::Identifier::fromString(&vm, \"${key}\"), ${key}Value);\n";
</span><span class="cx"> $result .= " }\n";
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -696,16 +696,16 @@
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "anyValueWithNullDefault"), anyValueWithNullDefaultValue);
</span><span class="cx"> auto booleanWithDefaultValue = toJS<IDLBoolean>(state, globalObject, dictionary.booleanWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "booleanWithDefault"), booleanWithDefaultValue);
</span><del>- if (dictionary.booleanWithoutDefault) {
- auto booleanWithoutDefaultValue = toJS<IDLBoolean>(state, globalObject, dictionary.booleanWithoutDefault);
</del><ins>+ if (!IDLBoolean::isNullValue(dictionary.booleanWithoutDefault)) {
+ auto booleanWithoutDefaultValue = toJS<IDLBoolean>(state, globalObject, IDLBoolean::extractValueFromNullable(dictionary.booleanWithoutDefault));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "booleanWithoutDefault"), booleanWithoutDefaultValue);
</span><span class="cx"> }
</span><del>- if (dictionary.bufferSourceValue) {
- auto bufferSourceValueValue = toJS<IDLBufferSource>(state, globalObject, dictionary.bufferSourceValue);
</del><ins>+ if (!IDLBufferSource::isNullValue(dictionary.bufferSourceValue)) {
+ auto bufferSourceValueValue = toJS<IDLBufferSource>(state, globalObject, IDLBufferSource::extractValueFromNullable(dictionary.bufferSourceValue));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "bufferSourceValue"), bufferSourceValueValue);
</span><span class="cx"> }
</span><del>- if (dictionary.dictionaryMember) {
- auto dictionaryMemberValue = toJS<IDLDictionary<TestObj::DictionaryThatShouldTolerateNull>>(state, globalObject, dictionary.dictionaryMember);
</del><ins>+ if (!IDLDictionary<TestObj::DictionaryThatShouldTolerateNull>::isNullValue(dictionary.dictionaryMember)) {
+ auto dictionaryMemberValue = toJS<IDLDictionary<TestObj::DictionaryThatShouldTolerateNull>>(state, globalObject, IDLDictionary<TestObj::DictionaryThatShouldTolerateNull>::extractValueFromNullable(dictionary.dictionaryMember));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "dictionaryMember"), dictionaryMemberValue);
</span><span class="cx"> }
</span><span class="cx"> auto enumerationValueWithDefaultValue = toJS<IDLEnumeration<TestObj::EnumType>>(state, globalObject, dictionary.enumerationValueWithDefault);
</span><span class="lines">@@ -712,18 +712,18 @@
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "enumerationValueWithDefault"), enumerationValueWithDefaultValue);
</span><span class="cx"> auto enumerationValueWithEmptyStringDefaultValue = toJS<IDLEnumeration<TestObj::EnumType>>(state, globalObject, dictionary.enumerationValueWithEmptyStringDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "enumerationValueWithEmptyStringDefault"), enumerationValueWithEmptyStringDefaultValue);
</span><del>- if (dictionary.enumerationValueWithoutDefault) {
- auto enumerationValueWithoutDefaultValue = toJS<IDLEnumeration<TestObj::EnumType>>(state, globalObject, dictionary.enumerationValueWithoutDefault);
</del><ins>+ if (!IDLEnumeration<TestObj::EnumType>::isNullValue(dictionary.enumerationValueWithoutDefault)) {
+ auto enumerationValueWithoutDefaultValue = toJS<IDLEnumeration<TestObj::EnumType>>(state, globalObject, IDLEnumeration<TestObj::EnumType>::extractValueFromNullable(dictionary.enumerationValueWithoutDefault));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "enumerationValueWithoutDefault"), enumerationValueWithoutDefaultValue);
</span><span class="cx"> }
</span><del>- if (dictionary.integer) {
- auto integerValue = toJS<IDLLong>(state, globalObject, dictionary.integer);
</del><ins>+ if (!IDLLong::isNullValue(dictionary.integer)) {
+ auto integerValue = toJS<IDLLong>(state, globalObject, IDLLong::extractValueFromNullable(dictionary.integer));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "integer"), integerValue);
</span><span class="cx"> }
</span><span class="cx"> auto integerWithDefaultValue = toJS<IDLLong>(state, globalObject, dictionary.integerWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "integerWithDefault"), integerWithDefaultValue);
</span><del>- if (dictionary.largeInteger) {
- auto largeIntegerValue = toJS<IDLLongLong>(state, globalObject, dictionary.largeInteger);
</del><ins>+ if (!IDLLongLong::isNullValue(dictionary.largeInteger)) {
+ auto largeIntegerValue = toJS<IDLLongLong>(state, globalObject, IDLLongLong::extractValueFromNullable(dictionary.largeInteger));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "largeInteger"), largeIntegerValue);
</span><span class="cx"> }
</span><span class="cx"> auto largeIntegerWithDefaultValue = toJS<IDLLongLong>(state, globalObject, dictionary.largeIntegerWithDefault);
</span><span class="lines">@@ -736,32 +736,32 @@
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "nullableStringWithDefault"), nullableStringWithDefaultValue);
</span><span class="cx"> auto nullableUnionMemberValue = toJS<IDLNullable<IDLUnion<IDLLong, IDLInterface<Node>>>>(state, globalObject, dictionary.nullableUnionMember);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "nullableUnionMember"), nullableUnionMemberValue);
</span><del>- if (dictionary.restrictedDouble) {
- auto restrictedDoubleValue = toJS<IDLDouble>(state, globalObject, dictionary.restrictedDouble);
</del><ins>+ if (!IDLDouble::isNullValue(dictionary.restrictedDouble)) {
+ auto restrictedDoubleValue = toJS<IDLDouble>(state, globalObject, IDLDouble::extractValueFromNullable(dictionary.restrictedDouble));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "restrictedDouble"), restrictedDoubleValue);
</span><span class="cx"> }
</span><span class="cx"> auto restrictedDoubleWithDefaultValue = toJS<IDLDouble>(state, globalObject, dictionary.restrictedDoubleWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "restrictedDoubleWithDefault"), restrictedDoubleWithDefaultValue);
</span><del>- if (dictionary.restrictedFloat) {
- auto restrictedFloatValue = toJS<IDLFloat>(state, globalObject, dictionary.restrictedFloat);
</del><ins>+ if (!IDLFloat::isNullValue(dictionary.restrictedFloat)) {
+ auto restrictedFloatValue = toJS<IDLFloat>(state, globalObject, IDLFloat::extractValueFromNullable(dictionary.restrictedFloat));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "restrictedFloat"), restrictedFloatValue);
</span><span class="cx"> }
</span><span class="cx"> auto restrictedFloatWithDefaultValue = toJS<IDLFloat>(state, globalObject, dictionary.restrictedFloatWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "restrictedFloatWithDefault"), restrictedFloatWithDefaultValue);
</span><del>- if (dictionary.sequenceOfStrings) {
- auto sequenceOfStringsValue = toJS<IDLSequence<IDLDOMString>>(state, globalObject, dictionary.sequenceOfStrings);
</del><ins>+ if (!IDLSequence<IDLDOMString>::isNullValue(dictionary.sequenceOfStrings)) {
+ auto sequenceOfStringsValue = toJS<IDLSequence<IDLDOMString>>(state, globalObject, IDLSequence<IDLDOMString>::extractValueFromNullable(dictionary.sequenceOfStrings));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "sequenceOfStrings"), sequenceOfStringsValue);
</span><span class="cx"> }
</span><del>- if (dictionary.smallIntegerClamped) {
- auto smallIntegerClampedValue = toJS<IDLByte>(state, globalObject, dictionary.smallIntegerClamped);
</del><ins>+ if (!IDLByte::isNullValue(dictionary.smallIntegerClamped)) {
+ auto smallIntegerClampedValue = toJS<IDLByte>(state, globalObject, IDLByte::extractValueFromNullable(dictionary.smallIntegerClamped));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "smallIntegerClamped"), smallIntegerClampedValue);
</span><span class="cx"> }
</span><del>- if (dictionary.smallIntegerWithDefault) {
- auto smallIntegerWithDefaultValue = toJS<IDLByte>(state, globalObject, dictionary.smallIntegerWithDefault);
</del><ins>+ if (!IDLByte::isNullValue(dictionary.smallIntegerWithDefault)) {
+ auto smallIntegerWithDefaultValue = toJS<IDLByte>(state, globalObject, IDLByte::extractValueFromNullable(dictionary.smallIntegerWithDefault));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "smallIntegerWithDefault"), smallIntegerWithDefaultValue);
</span><span class="cx"> }
</span><del>- if (dictionary.smallUnsignedIntegerEnforcedRange) {
- auto smallUnsignedIntegerEnforcedRangeValue = toJS<IDLOctet>(state, globalObject, dictionary.smallUnsignedIntegerEnforcedRange);
</del><ins>+ if (!IDLOctet::isNullValue(dictionary.smallUnsignedIntegerEnforcedRange)) {
+ auto smallUnsignedIntegerEnforcedRangeValue = toJS<IDLOctet>(state, globalObject, IDLOctet::extractValueFromNullable(dictionary.smallUnsignedIntegerEnforcedRange));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "smallUnsignedIntegerEnforcedRange"), smallUnsignedIntegerEnforcedRangeValue);
</span><span class="cx"> }
</span><span class="cx"> auto smallUnsignedIntegerWithDefaultValue = toJS<IDLOctet>(state, globalObject, dictionary.smallUnsignedIntegerWithDefault);
</span><span class="lines">@@ -768,34 +768,34 @@
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "smallUnsignedIntegerWithDefault"), smallUnsignedIntegerWithDefaultValue);
</span><span class="cx"> auto stringWithDefaultValue = toJS<IDLDOMString>(state, globalObject, dictionary.stringWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "stringWithDefault"), stringWithDefaultValue);
</span><del>- if (dictionary.stringWithoutDefault) {
- auto stringWithoutDefaultValue = toJS<IDLDOMString>(state, globalObject, dictionary.stringWithoutDefault);
</del><ins>+ if (!IDLDOMString::isNullValue(dictionary.stringWithoutDefault)) {
+ auto stringWithoutDefaultValue = toJS<IDLDOMString>(state, globalObject, IDLDOMString::extractValueFromNullable(dictionary.stringWithoutDefault));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "stringWithoutDefault"), stringWithoutDefaultValue);
</span><span class="cx"> }
</span><del>- if (dictionary.unionMember) {
- auto unionMemberValue = toJS<IDLUnion<IDLLong, IDLInterface<Node>>>(state, globalObject, dictionary.unionMember);
</del><ins>+ if (!IDLUnion<IDLLong, IDLInterface<Node>>::isNullValue(dictionary.unionMember)) {
+ auto unionMemberValue = toJS<IDLUnion<IDLLong, IDLInterface<Node>>>(state, globalObject, IDLUnion<IDLLong, IDLInterface<Node>>::extractValueFromNullable(dictionary.unionMember));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unionMember"), unionMemberValue);
</span><span class="cx"> }
</span><del>- if (dictionary.unrestrictedDouble) {
- auto unrestrictedDoubleValue = toJS<IDLUnrestrictedDouble>(state, globalObject, dictionary.unrestrictedDouble);
</del><ins>+ if (!IDLUnrestrictedDouble::isNullValue(dictionary.unrestrictedDouble)) {
+ auto unrestrictedDoubleValue = toJS<IDLUnrestrictedDouble>(state, globalObject, IDLUnrestrictedDouble::extractValueFromNullable(dictionary.unrestrictedDouble));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unrestrictedDouble"), unrestrictedDoubleValue);
</span><span class="cx"> }
</span><span class="cx"> auto unrestrictedDoubleWithDefaultValue = toJS<IDLUnrestrictedDouble>(state, globalObject, dictionary.unrestrictedDoubleWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unrestrictedDoubleWithDefault"), unrestrictedDoubleWithDefaultValue);
</span><del>- if (dictionary.unrestrictedFloat) {
- auto unrestrictedFloatValue = toJS<IDLUnrestrictedFloat>(state, globalObject, dictionary.unrestrictedFloat);
</del><ins>+ if (!IDLUnrestrictedFloat::isNullValue(dictionary.unrestrictedFloat)) {
+ auto unrestrictedFloatValue = toJS<IDLUnrestrictedFloat>(state, globalObject, IDLUnrestrictedFloat::extractValueFromNullable(dictionary.unrestrictedFloat));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unrestrictedFloat"), unrestrictedFloatValue);
</span><span class="cx"> }
</span><span class="cx"> auto unrestrictedFloatWithDefaultValue = toJS<IDLUnrestrictedFloat>(state, globalObject, dictionary.unrestrictedFloatWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unrestrictedFloatWithDefault"), unrestrictedFloatWithDefaultValue);
</span><del>- if (dictionary.unsignedInteger) {
- auto unsignedIntegerValue = toJS<IDLUnsignedLong>(state, globalObject, dictionary.unsignedInteger);
</del><ins>+ if (!IDLUnsignedLong::isNullValue(dictionary.unsignedInteger)) {
+ auto unsignedIntegerValue = toJS<IDLUnsignedLong>(state, globalObject, IDLUnsignedLong::extractValueFromNullable(dictionary.unsignedInteger));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unsignedInteger"), unsignedIntegerValue);
</span><span class="cx"> }
</span><span class="cx"> auto unsignedIntegerWithDefaultValue = toJS<IDLUnsignedLong>(state, globalObject, dictionary.unsignedIntegerWithDefault);
</span><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unsignedIntegerWithDefault"), unsignedIntegerWithDefaultValue);
</span><del>- if (dictionary.unsignedLargeInteger) {
- auto unsignedLargeIntegerValue = toJS<IDLUnsignedLongLong>(state, globalObject, dictionary.unsignedLargeInteger);
</del><ins>+ if (!IDLUnsignedLongLong::isNullValue(dictionary.unsignedLargeInteger)) {
+ auto unsignedLargeIntegerValue = toJS<IDLUnsignedLongLong>(state, globalObject, IDLUnsignedLongLong::extractValueFromNullable(dictionary.unsignedLargeInteger));
</ins><span class="cx"> result->putDirect(vm, JSC::Identifier::fromString(&vm, "unsignedLargeInteger"), unsignedLargeIntegerValue);
</span><span class="cx"> }
</span><span class="cx"> auto unsignedLargeIntegerWithDefaultValue = toJS<IDLUnsignedLongLong>(state, globalObject, dictionary.unsignedLargeIntegerWithDefault);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCConfigurationPrivateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,80 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RTCConfigurationPrivate_h
-#define RTCConfigurationPrivate_h
-
-#if ENABLE(WEB_RTC)
-
-#include "RTCIceServerPrivate.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class RTCConfigurationPrivate : public RefCounted<RTCConfigurationPrivate> {
-public:
- static PassRefPtr<RTCConfigurationPrivate> create() { return adoptRef(new RTCConfigurationPrivate()); }
- virtual ~RTCConfigurationPrivate() { }
-
- void appendServer(PassRefPtr<RTCIceServerPrivate> server) { m_privateServers.append(server); }
- size_t numberOfServers() { return m_privateServers.size(); }
- RTCIceServerPrivate* server(size_t index) { return m_privateServers[index].get(); }
-
- const String& iceTransports() const { return m_iceTransports; }
- void setIceTransports(const String& iceTransports)
- {
- if (iceTransports == "none" || iceTransports == "relay" || iceTransports == "all")
- m_iceTransports = iceTransports;
- }
-
- const String& requestIdentity() const { return m_requestIdentity; }
- void setRequestIdentity(const String& requestIdentity)
- {
- if (requestIdentity == "yes" || requestIdentity == "no" || requestIdentity == "ifconfigured")
- m_requestIdentity = requestIdentity;
- }
-
- Vector<RefPtr<RTCIceServerPrivate>> iceServers() const { return m_privateServers; }
-
-private:
- RTCConfigurationPrivate()
- : m_iceTransports("all")
- , m_requestIdentity("ifconfigured")
- {
- }
-
- Vector<RefPtr<RTCIceServerPrivate>> m_privateServers;
- String m_iceTransports;
- String m_requestIdentity;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
-
-#endif // RTCConfigurationPrivate_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceServerPrivateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RTCIceServerPrivate_h
-#define RTCIceServerPrivate_h
-
-#if ENABLE(WEB_RTC)
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class RTCIceServerPrivate : public RefCounted<RTCIceServerPrivate> {
-public:
- static PassRefPtr<RTCIceServerPrivate> create(const Vector<String>& urls, const String& credential, const String& username)
- {
- return adoptRef(new RTCIceServerPrivate(urls, credential, username));
- }
- virtual ~RTCIceServerPrivate() { }
-
- const Vector<String>& urls() { return m_urls; }
- const String& credential() { return m_credential; }
- const String& username() { return m_username; }
-
-private:
- RTCIceServerPrivate(const Vector<String>& urls, const String& credential, const String& username)
- : m_urls(urls)
- , m_credential(credential)
- , m_username(username)
- {
- }
-
- Vector<String> m_urls;
- String m_credential;
- String m_username;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
-
-#endif // RTCIceServerPrivate_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(WEB_RTC)
-
-#include "RTCPeerConnectionHandler.h"
-
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-class RTCPeerConnectionHandlerClient;
-
-static std::unique_ptr<RTCPeerConnectionHandler> createHandler(RTCPeerConnectionHandlerClient*)
-{
- return nullptr;
-}
-
-CreatePeerConnectionHandler RTCPeerConnectionHandler::create = createHandler;
-
-const AtomicString& RTCPeerConnectionHandler::incompatibleConstraintsErrorName()
-{
- static NeverDestroyed<AtomicString> incompatibleConstraints("IncompatibleConstraintsError", AtomicString::ConstructFromLiteral);
- return incompatibleConstraints;
-}
-
-const AtomicString& RTCPeerConnectionHandler::invalidSessionDescriptionErrorName()
-{
- static NeverDestroyed<AtomicString> invalidSessionDescription("InvalidSessionDescriptionError", AtomicString::ConstructFromLiteral);
- return invalidSessionDescription;
-}
-
-const AtomicString& RTCPeerConnectionHandler::incompatibleSessionDescriptionErrorName()
-{
- static NeverDestroyed<AtomicString> incompatibleSessionDescription("IncompatibleSessionDescriptionError", AtomicString::ConstructFromLiteral);
- return incompatibleSessionDescription;
-}
-
-const AtomicString& RTCPeerConnectionHandler::internalErrorName()
-{
- static NeverDestroyed<AtomicString> internal("InternalError", AtomicString::ConstructFromLiteral);
- return internal;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Google Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RTCPeerConnectionHandler_h
-#define RTCPeerConnectionHandler_h
-
-#if ENABLE(WEB_RTC)
-
-#include "MediaStreamPrivate.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
-class RealtimeMediaSource;
-class RTCConfigurationPrivate;
-class RTCDTMFSenderHandler;
-class RTCDataChannelHandler;
-class RTCIceCandidateDescriptor;
-class RTCOfferOptionsPrivate;
-class RTCOfferAnswerOptionsPrivate;
-class RTCPeerConnectionHandler;
-class RTCPeerConnectionHandlerClient;
-class RTCSessionDescriptionDescriptor;
-class RTCSessionDescriptionRequest;
-class RTCStatsRequest;
-class RTCVoidRequest;
-
-struct RTCDataChannelInit;
-
-typedef std::unique_ptr<RTCPeerConnectionHandler> (*CreatePeerConnectionHandler)(RTCPeerConnectionHandlerClient*);
-
-class RTCPeerConnectionHandler {
-public:
- WEBCORE_EXPORT static CreatePeerConnectionHandler create;
- virtual ~RTCPeerConnectionHandler() { }
-
- static const AtomicString& incompatibleConstraintsErrorName();
- static const AtomicString& invalidSessionDescriptionErrorName();
- static const AtomicString& incompatibleSessionDescriptionErrorName();
- static const AtomicString& internalErrorName();
-
- virtual bool initialize(PassRefPtr<RTCConfigurationPrivate>) = 0;
-
- virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferOptionsPrivate>) = 0;
- virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferAnswerOptionsPrivate>) = 0;
- virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) = 0;
- virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) = 0;
- virtual PassRefPtr<RTCSessionDescriptionDescriptor> localDescription() = 0;
- virtual PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() = 0;
- virtual bool updateIce(PassRefPtr<RTCConfigurationPrivate>) = 0;
- virtual bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) = 0;
- virtual bool addStream(PassRefPtr<MediaStreamPrivate>) = 0;
- virtual void removeStream(PassRefPtr<MediaStreamPrivate>) = 0;
- virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;
- virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;
- virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<RealtimeMediaSource>) = 0;
- virtual void stop() = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
-
-#endif // RTCPeerConnectionHandler_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCDTMFSenderHandlerMockcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Samsung Electornics and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(WEB_RTC)
-#include "RTCDTMFSenderHandlerMock.h"
-
-#include "RTCDTMFSenderHandlerClient.h"
-
-namespace WebCore {
-
-RTCDTMFSenderHandlerMock::RTCDTMFSenderHandlerMock()
- : m_duration(0)
- , m_interToneGap(0)
-{
-}
-
-void RTCDTMFSenderHandlerMock::setClient(RTCDTMFSenderHandlerClient* client)
-{
- m_client = client;
-}
-
-bool RTCDTMFSenderHandlerMock::insertDTMF(const String& tones, long duration, long interToneGap)
-{
- m_duration = duration;
- m_interToneGap = interToneGap;
- m_toneBuffer.append(tones);
- if (m_client) {
- for (size_t i = 0; i < m_toneBuffer.length(); ++i)
- m_client->didPlayTone(m_toneBuffer.substring(i, 1));
- m_toneBuffer = emptyString();
- m_client->didPlayTone(emptyString());
- }
- return true;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCDTMFSenderHandlerMockh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Samsung Electornics and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RTCDTMFSenderHandlerMock_h
-#define RTCDTMFSenderHandlerMock_h
-
-#if ENABLE(WEB_RTC)
-
-#include "RTCDTMFSenderHandler.h"
-#include "RTCPeerConnectionHandler.h"
-
-namespace WebCore {
-
-class RTCDTMFSenderHandlerMock final : public RTCDTMFSenderHandler {
-public:
- RTCDTMFSenderHandlerMock();
- virtual ~RTCDTMFSenderHandlerMock() { }
-
- void setClient(RTCDTMFSenderHandlerClient*) override;
- String currentToneBuffer() override { return m_toneBuffer; }
- bool canInsertDTMF() override { return true; }
- bool insertDTMF(const String& tones, long duration, long interToneGap) override;
-
-private:
- RTCDTMFSenderHandlerClient* m_client;
-
- String m_toneBuffer;
- long m_duration;
- long m_interToneGap;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
-
-#endif // RTCDataChannelHandlerMock_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCDataChannelHandlerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -23,13 +23,11 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCDataChannelHandlerMock_h
-#define RTCDataChannelHandlerMock_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "RTCDataChannelHandler.h"
</span><del>-#include "RTCPeerConnectionHandler.h"
</del><span class="cx"> #include "TimerEventBasedMock.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -37,15 +35,14 @@
</span><span class="cx"> class RTCDataChannelHandlerMock final : public RTCDataChannelHandler, public TimerEventBasedMock {
</span><span class="cx"> public:
</span><span class="cx"> RTCDataChannelHandlerMock(const String&, const RTCDataChannelInit&);
</span><del>- virtual ~RTCDataChannelHandlerMock() { }
</del><span class="cx">
</span><del>- void setClient(RTCDataChannelHandlerClient*) override;
</del><ins>+private:
+ void setClient(RTCDataChannelHandlerClient*) final;
</ins><span class="cx">
</span><del>- bool sendStringData(const String&) override;
- bool sendRawData(const char*, size_t) override;
- void close() override;
</del><ins>+ bool sendStringData(const String&) final;
+ bool sendRawData(const char*, size_t) final;
+ void close() final;
</ins><span class="cx">
</span><del>-private:
</del><span class="cx"> RTCDataChannelHandlerClient* m_client;
</span><span class="cx">
</span><span class="cx"> String m_label;
</span><span class="lines">@@ -55,5 +52,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCDataChannelHandlerMock_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,179 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(WEB_RTC)
-
-#include "RTCPeerConnectionHandlerMock.h"
-
-#include "NotImplemented.h"
-#include "RTCDTMFSenderHandler.h"
-#include "RTCDTMFSenderHandlerMock.h"
-#include "RTCDataChannelHandler.h"
-#include "RTCDataChannelHandlerMock.h"
-#include "RTCNotifiersMock.h"
-#include "RTCSessionDescriptionRequest.h"
-#include "RTCVoidRequest.h"
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-std::unique_ptr<RTCPeerConnectionHandler> RTCPeerConnectionHandlerMock::create(RTCPeerConnectionHandlerClient* client)
-{
- return std::make_unique<RTCPeerConnectionHandlerMock>(client);
-}
-
-RTCPeerConnectionHandlerMock::RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient* client)
- : m_client(client)
-{
-}
-
-bool RTCPeerConnectionHandlerMock::initialize(PassRefPtr<RTCConfigurationPrivate>)
-{
- RefPtr<IceConnectionNotifier> notifier = adoptRef(new IceConnectionNotifier(m_client, RTCPeerConnectionHandlerClient::IceConnectionStateCompleted, RTCPeerConnectionHandlerClient::IceGatheringStateComplete));
- m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
- return true;
-}
-
-void RTCPeerConnectionHandlerMock::createOffer(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<RTCOfferOptionsPrivate>)
-{
- RefPtr<SessionRequestNotifier> notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("offer", "local")));
- m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
-}
-
-void RTCPeerConnectionHandlerMock::createAnswer(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<RTCOfferAnswerOptionsPrivate>)
-{
- RefPtr<SessionRequestNotifier> notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("answer", "local")));
- m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
-}
-
-RTCPeerConnectionHandlerClient::SignalingState RTCPeerConnectionHandlerMock::signalingStateFromSDP(RTCSessionDescriptionDescriptor* descriptor)
-{
- if (descriptor->type() == "offer" && descriptor->sdp() == "local")
- return RTCPeerConnectionHandlerClient::SignalingStateHaveLocalOffer;
- if (descriptor->type() == "offer" && descriptor->sdp() == "remote")
- return RTCPeerConnectionHandlerClient::SignalingStateHaveRemoteOffer;
- if (descriptor->type() == "pranswer" && descriptor->sdp() == "local")
- return RTCPeerConnectionHandlerClient::SignalingStateHaveLocalPrAnswer;
- if (descriptor->type() == "pranswer" && descriptor->sdp() == "remote")
- return RTCPeerConnectionHandlerClient::SignalingStateHaveRemotePrAnswer;
-
- return RTCPeerConnectionHandlerClient::SignalingStateStable;
-}
-
-void RTCPeerConnectionHandlerMock::setLocalDescription(PassRefPtr<RTCVoidRequest> request, PassRefPtr<RTCSessionDescriptionDescriptor> descriptor)
-{
- RefPtr<VoidRequestNotifier> voidNotifier;
- RefPtr<SignalingStateNotifier> signalingNotifier;
- if (!descriptor.get() || descriptor->sdp() != "local")
- voidNotifier = adoptRef(new VoidRequestNotifier(request, false, RTCPeerConnectionHandler::internalErrorName()));
- else {
- m_localSessionDescription = descriptor;
- signalingNotifier = adoptRef(new SignalingStateNotifier(m_client, signalingStateFromSDP(m_localSessionDescription.get())));
- voidNotifier = adoptRef(new VoidRequestNotifier(request, true));
- m_timerEvents.append(adoptRef(new TimerEvent(this, signalingNotifier)));
- }
-
- m_timerEvents.append(adoptRef(new TimerEvent(this, voidNotifier)));
-}
-
-void RTCPeerConnectionHandlerMock::setRemoteDescription(PassRefPtr<RTCVoidRequest> request, PassRefPtr<RTCSessionDescriptionDescriptor> descriptor)
-{
- RefPtr<VoidRequestNotifier> voidNotifier;
- RefPtr<SignalingStateNotifier> signalingNotifier;
- if (!descriptor.get() || descriptor->sdp() != "remote")
- voidNotifier = adoptRef(new VoidRequestNotifier(request, false, RTCPeerConnectionHandler::internalErrorName()));
- else {
- m_remoteSessionDescription = descriptor;
- signalingNotifier = adoptRef(new SignalingStateNotifier(m_client, signalingStateFromSDP(m_remoteSessionDescription.get())));
- voidNotifier = adoptRef(new VoidRequestNotifier(request, true));
- m_timerEvents.append(adoptRef(new TimerEvent(this, signalingNotifier)));
- }
-
- m_timerEvents.append(adoptRef(new TimerEvent(this, voidNotifier)));
-}
-
-PassRefPtr<RTCSessionDescriptionDescriptor> RTCPeerConnectionHandlerMock::localDescription()
-{
- return m_localSessionDescription;
-}
-
-PassRefPtr<RTCSessionDescriptionDescriptor> RTCPeerConnectionHandlerMock::remoteDescription()
-{
- return m_remoteSessionDescription;
-}
-
-bool RTCPeerConnectionHandlerMock::updateIce(PassRefPtr<RTCConfigurationPrivate>)
-{
- return true;
-}
-
-bool RTCPeerConnectionHandlerMock::addIceCandidate(PassRefPtr<RTCVoidRequest> request, PassRefPtr<RTCIceCandidateDescriptor>)
-{
- RefPtr<VoidRequestNotifier> notifier = adoptRef(new VoidRequestNotifier(request, true));
- m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
- return true;
-}
-
-bool RTCPeerConnectionHandlerMock::addStream(PassRefPtr<MediaStreamPrivate>)
-{
- // Spec states that every time a stream is added, a negotiationneeded event must be fired.
- m_client->negotiationNeeded();
- return true;
-}
-
-void RTCPeerConnectionHandlerMock::removeStream(PassRefPtr<MediaStreamPrivate>)
-{
- // Spec states that every time a stream is removed, a negotiationneeded event must be fired.
- m_client->negotiationNeeded();
-}
-
-void RTCPeerConnectionHandlerMock::getStats(PassRefPtr<RTCStatsRequest>)
-{
- // Current tests does not support getUserMedia and this function requires it.
- // Once WebKit has test support to getUserMedia, this must be fixed.
- notImplemented();
-}
-
-std::unique_ptr<RTCDataChannelHandler> RTCPeerConnectionHandlerMock::createDataChannel(const String& label, const RTCDataChannelInit& init)
-{
- RefPtr<RemoteDataChannelNotifier> notifier = adoptRef(new RemoteDataChannelNotifier(m_client));
- m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
- return std::make_unique<RTCDataChannelHandlerMock>(label, init);
-}
-
-std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<RealtimeMediaSource>)
-{
- return std::make_unique<RTCDTMFSenderHandlerMock>();
-}
-
-void RTCPeerConnectionHandlerMock::stop()
-{
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RTCPeerConnectionHandlerMock_h
-#define RTCPeerConnectionHandlerMock_h
-
-#if ENABLE(WEB_RTC)
-
-#include "RTCPeerConnectionHandler.h"
-#include "RTCPeerConnectionHandlerClient.h"
-#include "RTCSessionDescriptionDescriptor.h"
-#include "TimerEventBasedMock.h"
-
-namespace WebCore {
-
-class RTCPeerConnectionHandlerMock final : public RTCPeerConnectionHandler, public TimerEventBasedMock {
-public:
- WEBCORE_EXPORT static std::unique_ptr<RTCPeerConnectionHandler> create(RTCPeerConnectionHandlerClient*);
-
- virtual ~RTCPeerConnectionHandlerMock() { }
-
- bool initialize(PassRefPtr<RTCConfigurationPrivate>) override;
-
- void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferOptionsPrivate>) override;
- void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferAnswerOptionsPrivate>) override;
- void setLocalDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) override;
- void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) override;
- PassRefPtr<RTCSessionDescriptionDescriptor> localDescription() override;
- PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() override;
- bool updateIce(PassRefPtr<RTCConfigurationPrivate>) override;
- bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) override;
- bool addStream(PassRefPtr<MediaStreamPrivate>) override;
- void removeStream(PassRefPtr<MediaStreamPrivate>) override;
- void getStats(PassRefPtr<RTCStatsRequest>) override;
- std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) override;
- std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<RealtimeMediaSource>) override;
- void stop() override;
-
- explicit RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient*);
-
-private:
- RTCPeerConnectionHandlerClient::SignalingState signalingStateFromSDP(RTCSessionDescriptionDescriptor*);
- RTCPeerConnectionHandlerClient* m_client;
-
- RefPtr<RTCSessionDescriptionDescriptor> m_localSessionDescription;
- RefPtr<RTCSessionDescriptionDescriptor> m_remoteSessionDescription;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_RTC)
-
-#endif // RTCPeerConnectionHandlerMock_h
</del></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (209694 => 209695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-12-12 01:41:16 UTC (rev 209694)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-12-12 02:50:06 UTC (rev 209695)
</span><span class="lines">@@ -184,7 +184,6 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> #include "MockMediaEndpoint.h"
</span><span class="cx"> #include "RTCPeerConnection.h"
</span><del>-#include "RTCPeerConnectionHandlerMock.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="lines">@@ -433,7 +432,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> enableMockMediaEndpoint();
</span><del>- enableMockRTCPeerConnectionHandler();
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="lines">@@ -980,11 +978,6 @@
</span><span class="cx"> MediaEndpoint::create = MockMediaEndpoint::create;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::enableMockRTCPeerConnectionHandler()
-{
- RTCPeerConnectionHandler::create = RTCPeerConnectionHandlerMock::create;
-}
-
</del><span class="cx"> void Internals::emulateRTCPeerConnectionPlatformEvent(RTCPeerConnection& connection, const String& action)
</span><span class="cx"> {
</span><span class="cx"> connection.emulatePlatformEvent(action);
</span></span></pre>
</div>
</div>
</body>
</html>