<!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>[209752] 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/209752">209752</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-12-12 21:17:28 -0800 (Mon, 12 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove bindings generation support for legacy WebCore::Dictionary
https://bugs.webkit.org/show_bug.cgi?id=165762
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
* web-platform-tests/webrtc/datachannel-emptystring-expected.txt:
* web-platform-tests/webrtc/no-media-call-expected.txt:
* web-platform-tests/webrtc/promises-call-expected.txt:
* web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt:
* web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt:
Updated to expect error messages with "dictionary" with a lowercase D.
Source/WebCore:
After this patch, all use of legacy WebCore::Dictionary is within custom bindings or
inside the DOM code itself. Bindings generation machinery no longer has a special
type named "Dictionary" but has increasingly good support for IDL-defined dictionaries.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::ApplePaySession::create): Take ExecState and a JSValue rather than a Dictionary.
(WebCore::ApplePaySession::completeMerchantValidation): Ditto.
* Modules/applepay/ApplePaySession.h: Updated for the above changes.
* Modules/applepay/ApplePaySession.idl: For this last file using Dictionary in IDL, move
to "[CallWith=ScriptState]" and "any" as a stopgap. Later we can return and use IDL
dictionaries or other more modern solutions.
* Modules/mediastream/MediaDevices.idl: For the custom binding written in JavaScript,
use the type mentioned in the specification rather than Dictionary. The bindings generator
ignores the type, so this is more like changing a comment rather than changing source code.
* Modules/mediastream/RTCPeerConnection.js:
(initializeRTCPeerConnection): Refer to a non-object as not a valid "dictionary", lowercase
rather than "Dictionary".
* Modules/mediastream/RTCPeerConnectionInternals.js:
(callbacksAndDictionaryOverload): Ditto.
* bindings/generic/IDLTypes.h: Removed IDLLegacyDictionary.
* bindings/js/JSCryptoAlgorithmDictionary.cpp:
(WebCore::getHashAlgorithm): Fixed a comment.
* bindings/js/JSDOMConvert.h:
(WebCore::Converter<IDLLegacyDictionary<T>>::convert): Deleted.
* bindings/scripts/CodeGenerator.pm:
(IsBuiltinType): Removed special case for "Dictionary".
* bindings/scripts/CodeGeneratorJS.pm:
(AddToIncludesForIDLType): Ditto.
(AreTypesDistinguishableForOverloadResolution): Ditto.
(GenerateOverloadedFunctionOrConstructor): Ditto.
(GenerateParametersCheck): Ditto.
(GetBaseIDLType): Ditto.
* bindings/scripts/test/JS/JSTestObj.cpp: Regenerated results.
* bindings/scripts/test/TestObj.idl: Removed test case for Dictionary.
LayoutTests:
* fast/mediastream/RTCPeerConnection-expected.txt:
* fast/mediastream/RTCPeerConnection-overloaded-operations-params-expected.txt:
* fast/mediastream/RTCPeerConnection-overloaded-operations-params.html:
Updated to expect error messages with "dictionary" with a lowercase D.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionoverloadedoperationsparamsexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionoverloadedoperationsparamshtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcdatachannelemptystringexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcnomediacallexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcpromisescallexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-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="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionidlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessionh">trunk/Source/WebCore/Modules/applepay/ApplePaySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessionidl">trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesidl">trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionjs">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionInternalsjs">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericIDLTypesh">trunk/Source/WebCore/bindings/generic/IDLTypes.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoAlgorithmDictionarycpp">trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</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="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/ChangeLog 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-12 Darin Adler <darin@apple.com>
+
+ Remove bindings generation support for legacy WebCore::Dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=165762
+
+ Reviewed by Sam Weinig.
+
+ * fast/mediastream/RTCPeerConnection-expected.txt:
+ * fast/mediastream/RTCPeerConnection-overloaded-operations-params-expected.txt:
+ * fast/mediastream/RTCPeerConnection-overloaded-operations-params.html:
+ Updated to expect error messages with "dictionary" with a lowercase D.
+
</ins><span class="cx"> 2016-12-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Document.onvisibilitychange event handler attribute
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS new RTCPeerConnection(null); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
-PASS new RTCPeerConnection(undefined); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
</del><ins>+PASS new RTCPeerConnection(null); threw exception TypeError: RTCPeerConnection argument must be a valid dictionary.
+PASS new RTCPeerConnection(undefined); threw exception TypeError: RTCPeerConnection argument must be a valid dictionary.
</ins><span class="cx"> PASS new RTCPeerConnection(); threw exception TypeError: Not enough arguments.
</span><del>-PASS new RTCPeerConnection(''); threw exception TypeError: RTCPeerConnection argument must be a valid Dictionary.
</del><ins>+PASS new RTCPeerConnection(''); threw exception TypeError: RTCPeerConnection argument must be a valid dictionary.
</ins><span class="cx"> PASS new RTCPeerConnection({}); did not throw exception.
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[]}); did not throw exception.
</span><span class="cx"> PASS new RTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}); threw exception TypeError: Error creating RTCPeerConnection.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionoverloadedoperationsparamsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params-expected.txt (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx"> *** Bad input
</span><span class="cx"> PASS promise pc.createOffer({}, emptyFunc) rejected with TypeError: Argument 1 ('successCallback') to RTCPeerConnection.createOffer must be a function
</span><span class="cx"> PASS promise pc.createOffer(emptyFunc, {}) rejected with TypeError: Argument 2 ('errorCallback') to RTCPeerConnection.createOffer must be a function
</span><del>-PASS promise pc.createOffer(1) rejected with TypeError: Argument 1 ('options') to RTCPeerConnection.createOffer must be a Dictionary
-PASS promise pc.createOffer(emptyFunc, emptyFunc, 1) rejected with TypeError: Argument 3 ('options') to RTCPeerConnection.createOffer must be a Dictionary
</del><ins>+PASS promise pc.createOffer(1) rejected with TypeError: Argument 1 ('options') to RTCPeerConnection.createOffer must be a dictionary
+PASS promise pc.createOffer(emptyFunc, emptyFunc, 1) rejected with TypeError: Argument 3 ('options') to RTCPeerConnection.createOffer must be a dictionary
</ins><span class="cx">
</span><span class="cx"> *** Test createAnswer
</span><span class="cx"> PASS promise pc.createAnswer() did not reject with TypeError.
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> *** Bad input
</span><span class="cx"> PASS promise pc.createAnswer({}, emptyFunc) rejected with TypeError: Argument 1 ('successCallback') to RTCPeerConnection.createAnswer must be a function
</span><span class="cx"> PASS promise pc.createAnswer(emptyFunc, {}) rejected with TypeError: Argument 2 ('errorCallback') to RTCPeerConnection.createAnswer must be a function
</span><del>-PASS promise pc.createAnswer(1) rejected with TypeError: Argument 1 ('options') to RTCPeerConnection.createAnswer must be a Dictionary
-PASS promise pc.createAnswer(emptyFunc, emptyFunc, 1) rejected with TypeError: Argument 3 ('options') to RTCPeerConnection.createAnswer must be a Dictionary
</del><ins>+PASS promise pc.createAnswer(1) rejected with TypeError: Argument 1 ('options') to RTCPeerConnection.createAnswer must be a dictionary
+PASS promise pc.createAnswer(emptyFunc, emptyFunc, 1) rejected with TypeError: Argument 3 ('options') to RTCPeerConnection.createAnswer must be a dictionary
</ins><span class="cx">
</span><span class="cx"> *** Test setLocalDescription
</span><span class="cx"> PASS promise pc.setLocalDescription(desc) did not reject with TypeError.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionoverloadedoperationsparamshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params.html (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params.html 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-overloaded-operations-params.html 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -71,11 +71,11 @@
</span><span class="cx"> return promiseShouldReject(`pc.${functionName}(emptyFunc, {})`, "reason");
</span><span class="cx"> })
</span><span class="cx"> .then(function () {
</span><del>- reason = `TypeError: Argument 1 ('options') to RTCPeerConnection.${functionName} must be a Dictionary`;
</del><ins>+ reason = `TypeError: Argument 1 ('options') to RTCPeerConnection.${functionName} must be a dictionary`;
</ins><span class="cx"> return promiseShouldReject(`pc.${functionName}(1)`, "reason");
</span><span class="cx"> })
</span><span class="cx"> .then(function () {
</span><del>- reason = `TypeError: Argument 3 ('options') to RTCPeerConnection.${functionName} must be a Dictionary`;
</del><ins>+ reason = `TypeError: Argument 3 ('options') to RTCPeerConnection.${functionName} must be a dictionary`;
</ins><span class="cx"> return promiseShouldReject(`pc.${functionName}(emptyFunc, emptyFunc, 1)`, "reason");
</span><span class="cx"> })
</span><span class="cx"> .then(function () {
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-12 Darin Adler <darin@apple.com>
+
+ Remove bindings generation support for legacy WebCore::Dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=165762
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/webrtc/datachannel-emptystring-expected.txt:
+ * web-platform-tests/webrtc/no-media-call-expected.txt:
+ * web-platform-tests/webrtc/promises-call-expected.txt:
+ * web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt:
+ * web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt:
+ Updated to expect error messages with "dictionary" with a lowercase D.
+
</ins><span class="cx"> 2016-12-10 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] RSA algorithms should allow importing keys without usages
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcdatachannelemptystringexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-FAIL Can send empty strings across a WebRTC data channel. RTCPeerConnection argument must be a valid Dictionary
</del><ins>+FAIL Can send empty strings across a WebRTC data channel. RTCPeerConnection argument must be a valid dictionary
</ins><span class="cx"> Messages exchanged
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcnomediacallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-FAIL Can set up a basic WebRTC call with no data. RTCPeerConnection argument must be a valid Dictionary
</del><ins>+FAIL Can set up a basic WebRTC call with no data. RTCPeerConnection argument must be a valid dictionary
</ins><span class="cx"> iceConnectionState info
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcpromisescallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-FAIL Can set up a basic WebRTC call with only data using promises. RTCPeerConnection argument must be a valid Dictionary
</del><ins>+FAIL Can set up a basic WebRTC call with only data using promises. RTCPeerConnection argument must be a valid dictionary
</ins><span class="cx"> iceConnectionState info
</span><span class="cx">
</span><span class="cx">
</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 (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-constructor-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx">
</span><span class="cx"> PASS RTCPeerConnection.length
</span><span class="cx"> FAIL new RTCPeerConnection() Not enough arguments
</span><del>-FAIL new RTCPeerConnection(null) RTCPeerConnection argument must be a valid Dictionary
-FAIL new RTCPeerConnection(undefined) RTCPeerConnection argument must be a valid Dictionary
</del><ins>+FAIL new RTCPeerConnection(null) RTCPeerConnection argument must be a valid dictionary
+FAIL new RTCPeerConnection(undefined) RTCPeerConnection argument must be a valid dictionary
</ins><span class="cx"> PASS new RTCPeerConnection({})
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: null })
</span><span class="cx"> PASS new RTCPeerConnection({ iceServers: undefined })
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionrtcpeerconnectionidlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/rtcpeerconnection-idl-expected.txt 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-CONSOLE MESSAGE: line 100: TypeError: RTCPeerConnection argument must be a valid Dictionary
</del><ins>+CONSOLE MESSAGE: line 100: TypeError: RTCPeerConnection argument must be a valid dictionary
</ins><span class="cx"> Description
</span><span class="cx">
</span><span class="cx"> This test verifies the availability of the RTCPeerConnection interface.
</span><span class="cx">
</span><span class="cx">
</span><del>-Harness Error (FAIL), message = TypeError: RTCPeerConnection argument must be a valid Dictionary
</del><ins>+Harness Error (FAIL), message = TypeError: RTCPeerConnection argument must be a valid dictionary
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/ChangeLog 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2016-12-12 Darin Adler <darin@apple.com>
+
+ Remove bindings generation support for legacy WebCore::Dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=165762
+
+ Reviewed by Sam Weinig.
+
+ After this patch, all use of legacy WebCore::Dictionary is within custom bindings or
+ inside the DOM code itself. Bindings generation machinery no longer has a special
+ type named "Dictionary" but has increasingly good support for IDL-defined dictionaries.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::ApplePaySession::create): Take ExecState and a JSValue rather than a Dictionary.
+ (WebCore::ApplePaySession::completeMerchantValidation): Ditto.
+ * Modules/applepay/ApplePaySession.h: Updated for the above changes.
+ * Modules/applepay/ApplePaySession.idl: For this last file using Dictionary in IDL, move
+ to "[CallWith=ScriptState]" and "any" as a stopgap. Later we can return and use IDL
+ dictionaries or other more modern solutions.
+
+ * Modules/mediastream/MediaDevices.idl: For the custom binding written in JavaScript,
+ use the type mentioned in the specification rather than Dictionary. The bindings generator
+ ignores the type, so this is more like changing a comment rather than changing source code.
+
+ * Modules/mediastream/RTCPeerConnection.js:
+ (initializeRTCPeerConnection): Refer to a non-object as not a valid "dictionary", lowercase
+ rather than "Dictionary".
+ * Modules/mediastream/RTCPeerConnectionInternals.js:
+ (callbacksAndDictionaryOverload): Ditto.
+
+ * bindings/generic/IDLTypes.h: Removed IDLLegacyDictionary.
+
+ * bindings/js/JSCryptoAlgorithmDictionary.cpp:
+ (WebCore::getHashAlgorithm): Fixed a comment.
+
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::Converter<IDLLegacyDictionary<T>>::convert): Deleted.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (IsBuiltinType): Removed special case for "Dictionary".
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (AddToIncludesForIDLType): Ditto.
+ (AreTypesDistinguishableForOverloadResolution): Ditto.
+ (GenerateOverloadedFunctionOrConstructor): Ditto.
+ (GenerateParametersCheck): Ditto.
+ (GetBaseIDLType): Ditto.
+
+ * bindings/scripts/test/JS/JSTestObj.cpp: Regenerated results.
+ * bindings/scripts/test/TestObj.idl: Removed test case for Dictionary.
+
</ins><span class="cx"> 2016-12-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop unnecessary null check in removeDetachedChildrenInContainer()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<ApplePaySession>> ApplePaySession::create(Document& document, unsigned version, const Dictionary& dictionary)
</del><ins>+ExceptionOr<Ref<ApplePaySession>> ApplePaySession::create(JSC::ExecState& state, Document& document, unsigned version, JSC::JSValue arguments)
</ins><span class="cx"> {
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="cx">
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> return Exception { INVALID_ACCESS_ERR };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto paymentRequest = createPaymentRequest(version, window, dictionary);
</del><ins>+ auto paymentRequest = createPaymentRequest(version, window, { &state, arguments });
</ins><span class="cx"> if (!paymentRequest)
</span><span class="cx"> return Exception { TYPE_MISMATCH_ERR };
</span><span class="cx">
</span><span class="lines">@@ -818,12 +818,12 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> ApplePaySession::completeMerchantValidation(const Dictionary& merchantSessionDictionary)
</del><ins>+ExceptionOr<void> ApplePaySession::completeMerchantValidation(JSC::ExecState& state, JSC::JSValue merchantSessionValue)
</ins><span class="cx"> {
</span><span class="cx"> if (!canCompleteMerchantValidation())
</span><span class="cx"> return Exception { INVALID_ACCESS_ERR };
</span><span class="cx">
</span><del>- if (!merchantSessionDictionary.initializerObject())
</del><ins>+ if (!merchantSessionValue.isObject())
</ins><span class="cx"> return Exception { TypeError };
</span><span class="cx">
</span><span class="cx"> auto& document = *downcast<Document>(scriptExecutionContext());
</span><span class="lines">@@ -830,7 +830,7 @@
</span><span class="cx"> auto& window = *document.domWindow();
</span><span class="cx">
</span><span class="cx"> String errorMessage;
</span><del>- auto merchantSession = PaymentMerchantSession::fromJS(*merchantSessionDictionary.execState(), merchantSessionDictionary.initializerObject(), errorMessage);
</del><ins>+ auto merchantSession = PaymentMerchantSession::fromJS(state, asObject(merchantSessionValue), errorMessage);
</ins><span class="cx"> if (!merchantSession) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><span class="cx"> return Exception { INVALID_ACCESS_ERR };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.h (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class ApplePaySession final : public RefCounted<ApplePaySession>, public ActiveDOMObject, public EventTargetWithInlineData {
</span><span class="cx"> public:
</span><del>- static ExceptionOr<Ref<ApplePaySession>> create(Document&, unsigned version, const Dictionary&);
</del><ins>+ static ExceptionOr<Ref<ApplePaySession>> create(JSC::ExecState&, Document&, unsigned version, JSC::JSValue);
</ins><span class="cx"> virtual ~ApplePaySession();
</span><span class="cx">
</span><span class="cx"> // DOM API.
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> begin();
</span><span class="cx"> ExceptionOr<void> abort();
</span><del>- ExceptionOr<void> completeMerchantValidation(const Dictionary& merchantSessionDictionary);
</del><ins>+ ExceptionOr<void> completeMerchantValidation(JSC::ExecState&, JSC::JSValue merchantSessionDictionary);
</ins><span class="cx"> ExceptionOr<void> completeShippingMethodSelection(unsigned short status, const Dictionary& newTotal, const ArrayValue& newLineItems);
</span><span class="cx"> ExceptionOr<void> completeShippingContactSelection(unsigned short status, const ArrayValue& newShippingMethods, const Dictionary& newTotal, const ArrayValue& newLineItems);
</span><span class="cx"> ExceptionOr<void> completePaymentMethodSelection(const Dictionary& newTotal, const ArrayValue& newLineItems);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> [
</span><span class="cx"> ActiveDOMObject,
</span><span class="cx"> Conditional=APPLE_PAY,
</span><del>- Constructor(unsigned long version, Dictionary paymentRequest),
- ConstructorCallWith=Document,
</del><ins>+ Constructor(unsigned long version, any paymentRequest),
+ ConstructorCallWith=Document&ScriptState,
</ins><span class="cx"> ConstructorMayThrowException,
</span><span class="cx"> EnabledBySetting=ApplePay,
</span><span class="cx"> ] interface ApplePaySession : EventTarget {
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx">
</span><span class="cx"> [MayThrowException] void begin();
</span><span class="cx"> [MayThrowException] void abort();
</span><del>- [MayThrowException] void completeMerchantValidation(Dictionary merchantSession);
- [Custom, MayThrowException] void completeShippingMethodSelection(unsigned short status, Dictionary newTotal, sequence<Dictionary> newLineItems);
- [Custom, MayThrowException] void completeShippingContactSelection(unsigned short status, sequence<Dictionary> newShippingMethods, Dictionary newTotal, sequence<Dictionary> newLineItems);
- [Custom, MayThrowException] void completePaymentMethodSelection(Dictionary newTotal, sequence<Dictionary> newLineItems);
</del><ins>+ [CallWith=ScriptState, MayThrowException] void completeMerchantValidation(any merchantSession);
+ [Custom, MayThrowException] void completeShippingMethodSelection(unsigned short status, any newTotal, any newLineItems);
+ [Custom, MayThrowException] void completeShippingContactSelection(unsigned short status, any newShippingMethods, any newTotal, any newLineItems);
+ [Custom, MayThrowException] void completePaymentMethodSelection(any newTotal, any newLineItems);
</ins><span class="cx"> [MayThrowException] void completePayment(unsigned short status);
</span><span class="cx">
</span><span class="cx"> attribute EventHandler onvalidatemerchant;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -34,6 +34,6 @@
</span><span class="cx"> ] interface MediaDevices {
</span><span class="cx"> MediaTrackSupportedConstraints getSupportedConstraints();
</span><span class="cx">
</span><del>- [Custom, MayThrowException, PrivateIdentifier, PublicIdentifier] Promise<MediaStream> getUserMedia(Dictionary options);
</del><ins>+ [Custom, MayThrowException, PrivateIdentifier, PublicIdentifier] Promise<MediaStream> getUserMedia(optional MediaStreamConstraints constraints);
</ins><span class="cx"> Promise<sequence<MediaDeviceInfo>> enumerateDevices();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> @throwTypeError("Not enough arguments");
</span><span class="cx">
</span><span class="cx"> if (!@isObject(configuration))
</span><del>- @throwTypeError("RTCPeerConnection argument must be a valid Dictionary");
</del><ins>+ @throwTypeError("RTCPeerConnection argument must be a valid dictionary");
</ins><span class="cx">
</span><span class="cx"> // FIXME: Handle errors in a better way than catching and re-throwing (http://webkit.org/b/158936)
</span><span class="cx"> try {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> // Zero or one arguments: Promise mode
</span><span class="cx"> const options = args[0];
</span><span class="cx"> if (args.length && !@isDictionary(options))
</span><del>- return @Promise.@reject(new @TypeError(`Argument 1 ('options') to RTCPeerConnection.${functionName} must be a Dictionary`));
</del><ins>+ return @Promise.@reject(new @TypeError(`Argument 1 ('options') to RTCPeerConnection.${functionName} must be a dictionary`));
</ins><span class="cx">
</span><span class="cx"> return promiseMode(options);
</span><span class="cx"> }
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> return @Promise.@reject(new @TypeError(`Argument 2 ('errorCallback') to RTCPeerConnection.${functionName} must be a function`));
</span><span class="cx">
</span><span class="cx"> if (args.length > 2 && !@isDictionary(options))
</span><del>- return @Promise.@reject(new @TypeError(`Argument 3 ('options') to RTCPeerConnection.${functionName} must be a Dictionary`));
</del><ins>+ return @Promise.@reject(new @TypeError(`Argument 3 ('options') to RTCPeerConnection.${functionName} must be a dictionary`));
</ins><span class="cx">
</span><span class="cx"> return legacyMode(successCallback, errorCallback, args[2]);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericIDLTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/IDLTypes.h (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -165,7 +165,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> struct IDLSerializedScriptValue : IDLWrapper<T> { };
</span><del>-template<typename T> struct IDLLegacyDictionary : IDLType<T> { };
</del><span class="cx"> template<typename T> struct IDLEventListener : IDLWrapper<T> { };
</span><span class="cx"> template<typename T> struct IDLXPathNSResolver : IDLWrapper<T> { };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoAlgorithmDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> static bool getHashAlgorithm(Dictionary& dictionary, CryptoAlgorithmIdentifier& result, HashRequirement isRequired)
</span><span class="cx"> {
</span><del>- // FXIME: Teach Dictionary how to return JSValues, and use that to get hash element value.
</del><ins>+ // FIXME: Teach Dictionary how to return JSValues, and use that to get hash element value.
</ins><span class="cx">
</span><span class="cx"> ExecState* exec = dictionary.execState();
</span><span class="cx"> VM& vm = exec->vm();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -1462,18 +1462,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // MARK: -
</span><del>-// MARK: Legacy dictionary type
-
-template<typename T> struct Converter<IDLLegacyDictionary<T>> : DefaultConverter<IDLLegacyDictionary<T>> {
- using ReturnType = T;
-
- static ReturnType convert(JSC::ExecState& state, JSC::JSValue value)
- {
- return T(&state, value);
- }
-};
-
-// MARK: -
</del><span class="cx"> // MARK: Event Listener type
</span><span class="cx">
</span><span class="cx"> template<typename T> struct Converter<IDLEventListener<T>> : DefaultConverter<IDLEventListener<T>> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -868,7 +868,6 @@
</span><span class="cx"> return 1 if $type->name eq "Promise";
</span><span class="cx"> return 1 if $type->name eq "XPathNSResolver";
</span><span class="cx"> return 1 if $type->name eq "EventListener";
</span><del>- return 1 if $type->name eq "Dictionary";
</del><span class="cx"> return 1 if $type->name eq "SerializedScriptValue";
</span><span class="cx">
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type->name eq "SerializedScriptValue" || $type->name eq "Dictionary") {
</del><ins>+ if ($type->name eq "SerializedScriptValue") {
</ins><span class="cx"> AddToIncludes($type->name . ".h", $includesRef, $conditional);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2151,7 +2151,7 @@
</span><span class="cx">
</span><span class="cx"> my $isDictionary = sub {
</span><span class="cx"> my $type = shift;
</span><del>- return $type->name eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
</del><ins>+ return $codeGenerator->IsDictionaryType($type);
</ins><span class="cx"> };
</span><span class="cx"> my $isCallbackFunctionOrDictionary = sub {
</span><span class="cx"> my $type = shift;
</span><span class="lines">@@ -2281,7 +2281,7 @@
</span><span class="cx"> };
</span><span class="cx"> my $isDictionaryOrRecordParameter = sub {
</span><span class="cx"> my ($type, $optionality) = @_;
</span><del>- return $type->name eq "Dictionary" || $codeGenerator->IsDictionaryType($type) || $codeGenerator->IsRecordType($type);
</del><ins>+ return $codeGenerator->IsDictionaryType($type) || $codeGenerator->IsRecordType($type);
</ins><span class="cx"> };
</span><span class="cx"> my $isNullableOrDictionaryOrRecordOrUnionContainingOne = sub {
</span><span class="cx"> my ($type, $optionality) = @_;
</span><span class="lines">@@ -4328,9 +4328,6 @@
</span><span class="cx"> "DOMString" => "\"undefined\"",
</span><span class="cx"> "USVString" => "\"undefined\"",
</span><span class="cx">
</span><del>- # Dictionary(state, undefined) will construct an empty Dictionary.
- "Dictionary" => "[]",
-
</del><span class="cx"> # JSValue::toBoolean() will convert undefined to false.
</span><span class="cx"> "boolean" => "false",
</span><span class="cx">
</span><span class="lines">@@ -4418,7 +4415,7 @@
</span><span class="cx">
</span><span class="cx"> if ($argument->isOptional && !defined($argument->default)) {
</span><span class="cx"> # As per Web IDL, optional dictionary arguments are always considered to have a default value of an empty dictionary, unless otherwise specified.
</span><del>- $argument->default("[]") if $type->name eq "Dictionary" or $codeGenerator->IsDictionaryType($type);
</del><ins>+ $argument->default("[]") if $codeGenerator->IsDictionaryType($type);
</ins><span class="cx">
</span><span class="cx"> # Treat undefined the same as an empty sequence Or frozen array.
</span><span class="cx"> $argument->default("[]") if $codeGenerator->IsSequenceOrFrozenArrayType($type);
</span><span class="lines">@@ -5015,7 +5012,6 @@
</span><span class="cx"> "DOMString" => "String",
</span><span class="cx"> "USVString" => "String",
</span><span class="cx"> "Date" => "double",
</span><del>- "Dictionary" => "Dictionary",
</del><span class="cx"> "EventListener" => "RefPtr<EventListener>",
</span><span class="cx"> "SerializedScriptValue" => "RefPtr<SerializedScriptValue>",
</span><span class="cx"> "XPathNSResolver" => "RefPtr<XPathNSResolver>",
</span><span class="lines">@@ -5114,7 +5110,6 @@
</span><span class="cx"> # Non-WebIDL extensions
</span><span class="cx"> "Date" => "IDLDate",
</span><span class="cx"> "SerializedScriptValue" => "IDLSerializedScriptValue<SerializedScriptValue>",
</span><del>- "Dictionary" => "IDLLegacyDictionary<Dictionary>",
</del><span class="cx"> "EventListener" => "IDLEventListener<JSEventListener>",
</span><span class="cx"> "XPathNSResolver" => "IDLXPathNSResolver<XPathNSResolver>",
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSTestObj.h"
</span><span class="cx">
</span><del>-#include "Dictionary.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -1087,7 +1086,6 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNullableByteStringArg(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithByteStringArgTreatingNullAsEmptyString(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionSerializedValue(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOptionsObject(JSC::ExecState*);
</del><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithRecord(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithException(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithExceptionReturningLong(JSC::ExecState*);
</span><span class="lines">@@ -1725,7 +1723,6 @@
</span><span class="cx"> { "methodWithNullableByteStringArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithNullableByteStringArg), (intptr_t) (1) } },
</span><span class="cx"> { "methodWithByteStringArgTreatingNullAsEmptyString", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithByteStringArgTreatingNullAsEmptyString), (intptr_t) (1) } },
</span><span class="cx"> { "serializedValue", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionSerializedValue), (intptr_t) (1) } },
</span><del>- { "optionsObject", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOptionsObject), (intptr_t) (1) } },
</del><span class="cx"> { "methodWithRecord", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithRecord), (intptr_t) (1) } },
</span><span class="cx"> { "methodWithException", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithException), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithExceptionReturningLong", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithExceptionReturningLong), (intptr_t) (0) } },
</span><span class="lines">@@ -5781,28 +5778,6 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOptionsObjectCaller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
-
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOptionsObject(ExecState* state)
-{
- return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOptionsObjectCaller>(state, "optionsObject");
-}
-
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOptionsObjectCaller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
-{
- UNUSED_PARAM(state);
- UNUSED_PARAM(throwScope);
- auto& impl = castedThis->wrapped();
- if (UNLIKELY(state->argumentCount() < 1))
- return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
- auto oo = convert<IDLLegacyDictionary<Dictionary>>(*state, state->uncheckedArgument(0));
- RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
- auto ooo = convert<IDLLegacyDictionary<Dictionary>>(*state, state->argument(1));
- RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
- impl.optionsObject(WTFMove(oo), WTFMove(ooo));
- return JSValue::encode(jsUndefined());
-}
-
</del><span class="cx"> static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithRecordCaller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithRecord(ExecState* state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (209751 => 209752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-12-13 02:20:58 UTC (rev 209751)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-12-13 05:17:28 UTC (rev 209752)
</span><span class="lines">@@ -151,7 +151,6 @@
</span><span class="cx"> void methodWithByteStringArgTreatingNullAsEmptyString([TreatNullAs=EmptyString] ByteString str);
</span><span class="cx">
</span><span class="cx"> void serializedValue(SerializedScriptValue serializedArg);
</span><del>- void optionsObject(Dictionary oo, optional Dictionary ooo);
</del><span class="cx">
</span><span class="cx"> void methodWithRecord(record<DOMString, long> recordParameter);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>