<!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>[204028] 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/204028">204028</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-02 10:02:23 -0700 (Tue, 02 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Implement overload resolution algorithm
https://bugs.webkit.org/show_bug.cgi?id=160394
Reviewed by Darin Adler.
Source/WebCore:
Implement overload resolution algorithm:
- http://heycam.github.io/webidl/#es-overloads
This means that our support for operation overloading in our IDL is
now a lot more extensive than it used to be and is now compliant with
the Web IDL specification.
In particular, overloading should now work for a lot more parameter
types which means that:
- We should be able to drop some custom bindings code in a follow-up patch.
- We will be able to drop the [StrictTypeChecking] attribute which was
a hack used to make overloading work for parameters of type DOMString.
Also, the order of the overloads in the IDL no longer impacts the
generated bindings code. It used to be that you needed to put the
overloads with the more specific parameter types first in order for the
generated bindings code to be somewhat correct.
No new tests, rebaselined bindings tests.
* bindings/scripts/CodeGenerator.pm:
(IsStringOrEnumType):
* bindings/scripts/CodeGeneratorJS.pm:
(IsNullableType):
(StripNullable):
(ComputeEffectiveOverloadSet):
(AreTypesDistinguishableForOverloadResolution):
(GetDistinguishingArgumentIndex):
(GetOverloadThatMatches):
(GenerateOverloadedFunction):
* bindings/scripts/test/JS/JSTestGlobalObject.cpp:
(WebCore::jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter):
(WebCore::jsTestObjConstructorFunctionOverloadedMethod1):
(WebCore::jsTestObjPrototypeFunctionTestPromiseOverloadedFunction):
(WebCore::jsTestObjConstructorFunctionOverloadedMethod12): Deleted.
(WebCore::jsTestObjPrototypeFunctionTestPromiseOverloadedFunction2Promise): Deleted.
* bindings/scripts/test/TestObj.idl:
* dom/EventTarget.h:
* dom/EventTarget.idl:
* html/HTMLOptionsCollection.h:
* html/HTMLOptionsCollection.idl:
* html/HTMLSelectElement.h:
(WebCore::HTMLSelectElement::add):
* html/HTMLSelectElement.idl:
LayoutTests:
Update / Rebaseline existing test. There is no major behavior change.
We sometimes get a different exception message than we used to.
* fast/canvas/canvas-clip-path-expected.txt:
* fast/canvas/canvas-fill-path-expected.txt:
* fast/canvas/canvas-path-addPath-expected.txt:
* fast/canvas/canvas-path-isPointInPath-expected.txt:
* fast/canvas/canvas-path-isPointInStroke-expected.txt:
* fast/canvas/canvas-putImageData-expected.txt:
* fast/canvas/canvas-putImageData.js:
* fast/canvas/canvas-stroke-path-expected.txt:
* fast/canvas/webgl/script-tests/texImageTest.js:
* fast/canvas/webgl/texImageTest-expected.txt:
* fast/dom/HTMLSelectElement/add-expected.txt:
* fast/dom/HTMLSelectElement/add.html:
* fast/dom/HTMLSelectElement/options-collection-add-expected.txt:
* fast/dom/HTMLSelectElement/options-collection-add.html:
* fast/dom/incompatible-operations-expected.txt:
* js/dom/select-options-add-expected.txt:
* webaudio/audiobuffer-expected.txt:
* webaudio/audiobuffer.html:
* webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasclippathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasfillpathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathaddPathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathisPointInPathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-path-isPointInPath-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvaspathisPointInStrokeexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-path-isPointInStroke-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasputImageDataexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-putImageData-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasputImageDatajs">trunk/LayoutTests/fast/canvas/canvas-putImageData.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvasstrokepathexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglscriptteststexImageTestjs">trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgltexImageTestexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementaddexpectedtxt">trunk/LayoutTests/fast/dom/HTMLSelectElement/add-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementaddhtml">trunk/LayoutTests/fast/dom/HTMLSelectElement/add.html</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementoptionscollectionaddexpectedtxt">trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementoptionscollectionaddhtml">trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add.html</a></li>
<li><a href="#trunkLayoutTestsfastdomincompatibleoperationsexpectedtxt">trunk/LayoutTests/fast/dom/incompatible-operations-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomselectoptionsaddexpectedtxt">trunk/LayoutTests/js/dom/select-options-add-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebaudioaudiobufferexpectedtxt">trunk/LayoutTests/webaudio/audiobuffer-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebaudioaudiobufferhtml">trunk/LayoutTests/webaudio/audiobuffer.html</a></li>
<li><a href="#trunkLayoutTestswebgl102resourceswebgl_test_filesconformancetexturesteximagewithinvaliddatahtml">trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp</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>
<li><a href="#trunkSourceWebCoredomEventTargeth">trunk/Source/WebCore/dom/EventTarget.h</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetidl">trunk/Source/WebCore/dom/EventTarget.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionh">trunk/Source/WebCore/html/HTMLOptionsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionidl">trunk/Source/WebCore/html/HTMLOptionsCollection.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementidl">trunk/Source/WebCore/html/HTMLSelectElement.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/ChangeLog 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-08-02 Chris Dumez <cdumez@apple.com>
+
+ [WebIDL] Implement overload resolution algorithm
+ https://bugs.webkit.org/show_bug.cgi?id=160394
+
+ Reviewed by Darin Adler.
+
+ Update / Rebaseline existing test. There is no major behavior change.
+ We sometimes get a different exception message than we used to.
+
+ * fast/canvas/canvas-clip-path-expected.txt:
+ * fast/canvas/canvas-fill-path-expected.txt:
+ * fast/canvas/canvas-path-addPath-expected.txt:
+ * fast/canvas/canvas-path-isPointInPath-expected.txt:
+ * fast/canvas/canvas-path-isPointInStroke-expected.txt:
+ * fast/canvas/canvas-putImageData-expected.txt:
+ * fast/canvas/canvas-putImageData.js:
+ * fast/canvas/canvas-stroke-path-expected.txt:
+ * fast/canvas/webgl/script-tests/texImageTest.js:
+ * fast/canvas/webgl/texImageTest-expected.txt:
+ * fast/dom/HTMLSelectElement/add-expected.txt:
+ * fast/dom/HTMLSelectElement/add.html:
+ * fast/dom/HTMLSelectElement/options-collection-add-expected.txt:
+ * fast/dom/HTMLSelectElement/options-collection-add.html:
+ * fast/dom/incompatible-operations-expected.txt:
+ * js/dom/select-options-add-expected.txt:
+ * webaudio/audiobuffer-expected.txt:
+ * webaudio/audiobuffer.html:
+ * webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html:
+
</ins><span class="cx"> 2016-08-02 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasclippathexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-clip-path-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx"> PASS ctx.clip(function() {}) threw exception TypeError: Argument 1 ('winding') to CanvasRenderingContext2D.clip must be one of: "nonzero", "evenodd".
</span><span class="cx"> PASS ctx.clip(false) threw exception TypeError: Argument 1 ('winding') to CanvasRenderingContext2D.clip must be one of: "nonzero", "evenodd".
</span><span class="cx"> PASS ctx.clip(new Date()) threw exception TypeError: Argument 1 ('winding') to CanvasRenderingContext2D.clip must be one of: "nonzero", "evenodd".
</span><del>-PASS ctx.clip(0, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip(null, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip('path2d', 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip(undefined, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip(Number.MAX_VALUE, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip(function() {}, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip(false, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.clip(new Date(), 'nonzero') threw exception TypeError: Type error.
</del><ins>+PASS ctx.clip(0, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip(null, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip('path2d', 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip(undefined, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip(Number.MAX_VALUE, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip(function() {}, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip(false, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
+PASS ctx.clip(new Date(), 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.clip must be an instance of DOMPath.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasfillpathexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-fill-path-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx"> PASS ctx.fill(function() {}) threw exception TypeError: Argument 1 ('winding') to CanvasRenderingContext2D.fill must be one of: "nonzero", "evenodd".
</span><span class="cx"> PASS ctx.fill(false) threw exception TypeError: Argument 1 ('winding') to CanvasRenderingContext2D.fill must be one of: "nonzero", "evenodd".
</span><span class="cx"> PASS ctx.fill(new Date()) threw exception TypeError: Argument 1 ('winding') to CanvasRenderingContext2D.fill must be one of: "nonzero", "evenodd".
</span><del>-PASS ctx.fill(0, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.fill(null, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.fill('path2d', 'nonzero') threw exception TypeError: Type error.
</del><ins>+PASS ctx.fill(0, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
+PASS ctx.fill(null, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
+PASS ctx.fill('path2d', 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
</ins><span class="cx"> FAIL ctx.fill(undefined) should throw an exception. Was undefined.
</span><del>-PASS ctx.fill(Number.MAX_VALUE, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.fill(function() {}, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.fill(false, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.fill(new Date(), 'nonzero') threw exception TypeError: Type error.
</del><ins>+PASS ctx.fill(Number.MAX_VALUE, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
+PASS ctx.fill(function() {}, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
+PASS ctx.fill(false, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
+PASS ctx.fill(new Date(), 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.fill must be an instance of DOMPath.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathaddPathexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-path-addPath-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> PASS refTest(result.data, expected.data) is true
</span><span class="cx">
</span><span class="cx"> Various tests of invalid values.
</span><del>-PASS pathA.addPath(matrix, pathB) threw exception TypeError: Type error.
-PASS pathA.addPath(pathB, ctx.canvas) threw exception TypeError: Type error.
-PASS pathA.addPath(pathB, null) threw exception TypeError: Type error.
-PASS pathA.addPath(pathB, undefined) threw exception TypeError: Type error.
-PASS pathA.addPath(pathB, 0) threw exception TypeError: Type error.
-PASS pathA.addPath(pathB, "0") threw exception TypeError: Type error.
</del><ins>+PASS pathA.addPath(matrix, pathB) threw exception TypeError: Argument 1 ('path') to Path2D.addPath must be an instance of DOMPath.
+PASS pathA.addPath(pathB, ctx.canvas) threw exception TypeError: Argument 2 ('transform') to Path2D.addPath must be an instance of SVGMatrix.
+PASS pathA.addPath(pathB, null) threw exception TypeError: Argument 2 ('transform') to Path2D.addPath must be an instance of SVGMatrix.
+PASS pathA.addPath(pathB, undefined) threw exception TypeError: Argument 2 ('transform') to Path2D.addPath must be an instance of SVGMatrix.
+PASS pathA.addPath(pathB, 0) threw exception TypeError: Argument 2 ('transform') to Path2D.addPath must be an instance of SVGMatrix.
+PASS pathA.addPath(pathB, "0") threw exception TypeError: Argument 2 ('transform') to Path2D.addPath must be an instance of SVGMatrix.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathisPointInPathexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-path-isPointInPath-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-isPointInPath-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-path-isPointInPath-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -10,20 +10,20 @@
</span><span class="cx"> PASS ctx.isPointInPath(path, 50, 50, 'evenodd') is false
</span><span class="cx"> PASS ctx.isPointInPath(path, 50, 50, 'nonzero') is false
</span><span class="cx"> PASS ctx.isPointInPath(null, 50, 50) threw exception TypeError: Argument 3 ('winding') to CanvasRenderingContext2D.isPointInPath must be one of: "nonzero", "evenodd".
</span><del>-PASS ctx.isPointInPath(null, 50, 50, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.isPointInPath(null, 50, 50, 'evenodd') threw exception TypeError: Type error.
</del><ins>+PASS ctx.isPointInPath(null, 50, 50, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath(null, 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
</ins><span class="cx"> PASS ctx.isPointInPath([], 50, 50) threw exception TypeError: Argument 3 ('winding') to CanvasRenderingContext2D.isPointInPath must be one of: "nonzero", "evenodd".
</span><del>-PASS ctx.isPointInPath([], 50, 50, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.isPointInPath([], 50, 50, 'evenodd') threw exception TypeError: Type error.
</del><ins>+PASS ctx.isPointInPath([], 50, 50, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath([], 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
</ins><span class="cx"> PASS ctx.isPointInPath({}, 50, 50) threw exception TypeError: Argument 3 ('winding') to CanvasRenderingContext2D.isPointInPath must be one of: "nonzero", "evenodd".
</span><del>-PASS ctx.isPointInPath({}, 50, 50, 'nonzero') threw exception TypeError: Type error.
-PASS ctx.isPointInPath({}, 50, 50, 'evenodd') threw exception TypeError: Type error.
-PASS ctx.isPointInPath('path2d', 50, 50, 'evenodd') threw exception TypeError: Type error.
-PASS ctx.isPointInPath(undefined, 50, 50, 'evenodd') threw exception TypeError: Type error.
-PASS ctx.isPointInPath(Number.MAX_VALUE, 50, 50, 'evenodd') threw exception TypeError: Type error.
-PASS ctx.isPointInPath(function() {}, 50, 50, 'evenodd') threw exception TypeError: Type error.
-PASS ctx.isPointInPath(false, 50, 50, 'evenodd') threw exception TypeError: Type error.
-PASS ctx.isPointInPath(new Date(), 50, 50, 'evenodd') threw exception TypeError: Type error.
</del><ins>+PASS ctx.isPointInPath({}, 50, 50, 'nonzero') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath({}, 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath('path2d', 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath(undefined, 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath(Number.MAX_VALUE, 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath(function() {}, 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath(false, 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
+PASS ctx.isPointInPath(new Date(), 50, 50, 'evenodd') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInPath must be an instance of DOMPath.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvaspathisPointInStrokeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-path-isPointInStroke-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-path-isPointInStroke-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-path-isPointInStroke-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> PASS ctx.isPointInStroke(path,18,70) is false
</span><span class="cx"> PASS ctx.isPointInStroke(path,NaN,122) is false
</span><span class="cx"> PASS ctx.isPointInStroke(path,18,NaN) is false
</span><del>-PASS ctx.isPointInStroke(null,70,20) threw exception TypeError: Type error.
-PASS ctx.isPointInStroke([],20,70) threw exception TypeError: Type error.
-PASS ctx.isPointInStroke({},120,70) threw exception TypeError: Type error.
</del><ins>+PASS ctx.isPointInStroke(null,70,20) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInStroke must be an instance of DOMPath.
+PASS ctx.isPointInStroke([],20,70) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInStroke must be an instance of DOMPath.
+PASS ctx.isPointInStroke({},120,70) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.isPointInStroke must be an instance of DOMPath.
</ins><span class="cx"> PASS ctx.isPointInPath('path2d', 50, 50) threw exception TypeError: Argument 3 ('winding') to CanvasRenderingContext2D.isPointInPath must be one of: "nonzero", "evenodd".
</span><span class="cx"> PASS ctx.isPointInPath(undefined, 50, 50) threw exception TypeError: Argument 3 ('winding') to CanvasRenderingContext2D.isPointInPath must be one of: "nonzero", "evenodd".
</span><span class="cx"> PASS ctx.isPointInPath(Number.MAX_VALUE, 50, 50) threw exception TypeError: Argument 3 ('winding') to CanvasRenderingContext2D.isPointInPath must be one of: "nonzero", "evenodd".
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasputImageDataexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-putImageData-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-putImageData-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-putImageData-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> PASS getPixel(9,9) is [0,128,0,255]
</span><span class="cx"> PASS getPixel(1,1) is [0,128,0,255]
</span><span class="cx"> PASS getPixel(9,9) is [0,128,0,255]
</span><del>-PASS context.putImageData({}, 0, 0) threw exception TypeError: Type error.
</del><ins>+PASS context.putImageData({}, 0, 0) threw exception TypeError: Argument 1 ('imagedata') to CanvasRenderingContext2D.putImageData must be an instance of ImageData.
</ins><span class="cx"> PASS context.putImageData(buffer, NaN, 0, 0, 0, 0, 0) threw exception TypeError: The provided value is non-finite.
</span><span class="cx"> PASS context.putImageData(buffer, 0, NaN, 0, 0, 0, 0) threw exception TypeError: The provided value is non-finite.
</span><span class="cx"> PASS context.putImageData(buffer, 0, 0, NaN, 0, 0, 0) threw exception TypeError: The provided value is non-finite.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasputImageDatajs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-putImageData.js (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-putImageData.js 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-putImageData.js 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> pixelShouldBe(9, 9, [0, 128,0,255]);
</span><span class="cx">
</span><span class="cx">
</span><del>-shouldThrow("context.putImageData({}, 0, 0)", "'TypeError: Type error'");
</del><ins>+shouldThrowErrorName("context.putImageData({}, 0, 0)", "TypeError");
</ins><span class="cx"> shouldThrow("context.putImageData(buffer, NaN, 0, 0, 0, 0, 0)", "'TypeError: The provided value is non-finite'");
</span><span class="cx"> shouldThrow("context.putImageData(buffer, 0, NaN, 0, 0, 0, 0)", "'TypeError: The provided value is non-finite'");
</span><span class="cx"> shouldThrow("context.putImageData(buffer, 0, 0, NaN, 0, 0, 0)", "'TypeError: The provided value is non-finite'");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvasstrokepathexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/canvas-stroke-path-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -17,14 +17,14 @@
</span><span class="cx"> PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
</span><span class="cx"> PASS areaColor(imageData.data, {r:0,g:255,b:0,a:255}) is true
</span><span class="cx">
</span><del>-PASS ctx.stroke(0) threw exception TypeError: Type error.
-PASS ctx.stroke(null) threw exception TypeError: Type error.
-PASS ctx.stroke('path2d') threw exception TypeError: Type error.
-PASS ctx.stroke(undefined) threw exception TypeError: Type error.
-PASS ctx.stroke(Number.MAX_VALUE) threw exception TypeError: Type error.
-PASS ctx.stroke(function() {}) threw exception TypeError: Type error.
-PASS ctx.stroke(false) threw exception TypeError: Type error.
-PASS ctx.stroke(new Date()) threw exception TypeError: Type error.
</del><ins>+PASS ctx.stroke(0) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke(null) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke('path2d') threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke(undefined) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke(Number.MAX_VALUE) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke(function() {}) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke(false) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
+PASS ctx.stroke(new Date()) threw exception TypeError: Argument 1 ('path') to CanvasRenderingContext2D.stroke must be an instance of DOMPath.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglscriptteststexImageTestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> shouldThrow("context.texSubImage2D(context.TEXTURE_2D)");
</span><span class="cx"> shouldBeUndefined("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, null)");
</span><del>-shouldThrow("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0)");
</del><ins>+shouldBeUndefined("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0)"); // We do not do strict type checking on ArrayBufferView.
</ins><span class="cx"> shouldThrow("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, context.UNSIGNED_BYTE, 0)");
</span><span class="cx"> shouldBeUndefined("context.pixelStorei(context.UNPACK_FLIP_Y_WEBGL, false)");
</span><span class="cx"> shouldBeUndefined("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, context.RGBA, context.UNSIGNED_BYTE, imageData)");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgltexImageTestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, context.RGBA, context.UNSIGNED_BYTE, video) is undefined.
</span><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D) threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, null) is undefined.
</span><del>-PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0) threw exception TypeError: Type error.
</del><ins>+PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0) is undefined.
</ins><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, context.UNSIGNED_BYTE, 0) threw exception TypeError: Type error.
</span><span class="cx"> PASS context.pixelStorei(context.UNPACK_FLIP_Y_WEBGL, false) is undefined.
</span><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, context.RGBA, context.UNSIGNED_BYTE, imageData) is undefined.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementaddexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLSelectElement/add-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/add-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/add-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx">
</span><span class="cx"> Call HTMLSelectElement.add() with one argument:
</span><span class="cx"> PASS testAdd(createOption("Y1")) is "0,1,2,Y1"
</span><del>-PASS testAdd("foo") threw exception TypeError: Type error.
-PASS testAdd(undefined) threw exception TypeError: Type error.
-PASS testAdd(null) threw exception TypeError: Type error.
</del><ins>+PASS testAdd("foo") threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
+PASS testAdd(undefined) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
+PASS testAdd(null) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
</ins><span class="cx">
</span><span class="cx"> Call HTMLSelectElement.add() with two arguments:
</span><span class="cx"> PASS testAdd(createOption("Y2"), null) is "0,1,2,Y2"
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> PASS testAdd(createOption("X"), mySelect.options[0]) is "X,0,1,2"
</span><span class="cx"> PASS testAdd(createOption("X"), mySelect.options[1]) is "0,X,1,2"
</span><span class="cx"> PASS testAdd(createOption("X"), mySelect.options[2]) is "0,1,X,2"
</span><del>-PASS testAdd("foo", 0) threw exception TypeError: Type error.
-PASS testAdd(undefined, 0) threw exception TypeError: Type error.
-PASS testAdd(null, 0) threw exception TypeError: Type error.
</del><ins>+PASS testAdd("foo", 0) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
+PASS testAdd(undefined, 0) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
+PASS testAdd(null, 0) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
</ins><span class="cx">
</span><span class="cx"> Call HTMLSelectElement.add() with three arguments (when it only takes two arguments):
</span><span class="cx"> PASS testAdd(createOption("X"), 0, "unnecessary extra argument - should be ignored") is "X,0,1,2"
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementaddhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLSelectElement/add.html (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/add.html 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/add.html 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="../../../resources/js-test.js"></script>
</del><ins>+<script src="../../../resources/js-test-pre.js"></script>
</ins><span class="cx"> <script src="resources/html-select-and-options-collection-utilities.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx">
</span><span class="cx"> debug("<br>Call HTMLSelectElement.add() with one argument:");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("Y1"))', "0,1,2,Y1");
</span><del>-shouldThrow('testAdd("foo")');
-shouldThrow("testAdd(undefined)");
-shouldThrow("testAdd(null)");
</del><ins>+shouldThrowErrorName('testAdd("foo")', "TypeError");
+shouldThrowErrorName("testAdd(undefined)", "TypeError");
+shouldThrowErrorName("testAdd(null)", "TypeError");
</ins><span class="cx">
</span><span class="cx"> debug("<br>Call HTMLSelectElement.add() with two arguments:");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("Y2"), null)', "0,1,2,Y2");
</span><span class="lines">@@ -54,13 +54,14 @@
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), mySelect.options[0])', "X,0,1,2");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), mySelect.options[1])', "0,X,1,2");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), mySelect.options[2])', "0,1,X,2");
</span><del>-shouldThrow('testAdd("foo", 0)', "'TypeError: Type error'");
-shouldThrow('testAdd(undefined, 0)', "'TypeError: Type error'");
-shouldThrow('testAdd(null, 0)', "'TypeError: Type error'");
</del><ins>+shouldThrowErrorName('testAdd("foo", 0)', "TypeError");
+shouldThrowErrorName('testAdd(undefined, 0)', "TypeError");
+shouldThrowErrorName('testAdd(null, 0)', "TypeError");
</ins><span class="cx">
</span><span class="cx"> debug("<br>Call HTMLSelectElement.add() with three arguments (when it only takes two arguments):");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), 0, "unnecessary extra argument - should be ignored")', "X,0,1,2");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), mySelect.options[1], "unnecessary extra argument - should be ignored")', "0,X,1,2");
</span><span class="cx"> </script>
</span><ins>+<script src="../../../resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementoptionscollectionaddexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx">
</span><span class="cx"> Call HTMLOptionsCollection.add() with only one argument:
</span><span class="cx"> PASS testAdd(createOption("Y9")) is "0,1,2,Y9"
</span><del>-PASS testAdd("foo") threw exception TypeError: Type error.
-PASS testAdd(undefined) threw exception TypeError: Type error.
-PASS testAdd(null) threw exception TypeError: Type error.
</del><ins>+PASS testAdd("foo") threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
+PASS testAdd(undefined) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
+PASS testAdd(null) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx">
</span><span class="cx"> Call HTMLOptionsCollection.add() with two arguments:
</span><span class="cx"> PASS testAdd(createGroup("Y1", "Y2"), null) is "0,1,2,Y1,Y2"
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> PASS testAdd(createOption("X"), mySelect.options[2]) is "0,1,X,2"
</span><span class="cx"> PASS testAdd(createOption("Y25"), 0, 1) is "Y25,0,1,2"
</span><span class="cx"> PASS testAdd(createOption("Y25"), mySelect.options[0], 1) is "Y25,0,1,2"
</span><del>-PASS testAdd("foo", 0) threw exception TypeError: Type error.
-PASS testAdd(undefined, 0) threw exception TypeError: Type error.
-PASS testAdd(null, 0) threw exception TypeError: Type error.
</del><ins>+PASS testAdd("foo", 0) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
+PASS testAdd(undefined, 0) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
+PASS testAdd(null, 0) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx">
</span><span class="cx"> Call HTMLOptionsCollection.add() with three arguments (when it only takes two arguments):
</span><span class="cx"> PASS testAdd(createOption("X"), 0, "unnecessary extra argument - should be ignored") is "X,0,1,2"
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementoptionscollectionaddhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add.html (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add.html 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/options-collection-add.html 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="../../../resources/js-test.js"></script>
</del><ins>+<script src="../../../resources/js-test-pre.js"></script>
</ins><span class="cx"> <script src="resources/html-select-and-options-collection-utilities.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx">
</span><span class="cx"> debug("<br>Call HTMLOptionsCollection.add() with only one argument:");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("Y9"))', "0,1,2,Y9");
</span><del>-shouldThrow('testAdd("foo")');
-shouldThrow("testAdd(undefined)");
-shouldThrow("testAdd(null)");
</del><ins>+shouldThrowErrorName('testAdd("foo")', "TypeError");
+shouldThrowErrorName("testAdd(undefined)", "TypeError");
+shouldThrowErrorName("testAdd(null)", "TypeError");
</ins><span class="cx">
</span><span class="cx"> debug("<br>Call HTMLOptionsCollection.add() with two arguments:");
</span><span class="cx"> shouldBeEqualToString('testAdd(createGroup("Y1", "Y2"), null)', "0,1,2,Y1,Y2");
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), mySelect.options[2])', "0,1,X,2");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("Y25"), 0, 1)', "Y25,0,1,2");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("Y25"), mySelect.options[0], 1)', "Y25,0,1,2");
</span><del>-shouldThrow('testAdd("foo", 0)', "'TypeError: Type error'");
-shouldThrow('testAdd(undefined, 0)', "'TypeError: Type error'");
-shouldThrow('testAdd(null, 0)', "'TypeError: Type error'");
</del><ins>+shouldThrowErrorName('testAdd("foo", 0)', "TypeError");
+shouldThrowErrorName('testAdd(undefined, 0)', "TypeError");
+shouldThrowErrorName('testAdd(null, 0)', "TypeError");
</ins><span class="cx">
</span><span class="cx"> debug("<br>Call HTMLOptionsCollection.add() with three arguments (when it only takes two arguments):");
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), 0, "unnecessary extra argument - should be ignored")', "X,0,1,2");
</span><span class="lines">@@ -85,5 +85,6 @@
</span><span class="cx"> shouldBeEqualToString('testAdd(createOption("X"), mySelect.options[1], "unnecessary extra argument - should be ignored")', "0,X,1,2");
</span><span class="cx"> shouldBeEqualToString('testAdd(createGroup("G1", "G2"), 1, "unnecessary extra argument - should be ignored")', "0,G1,G2,1,2");
</span><span class="cx"> </script>
</span><ins>+<script src="../../../resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomincompatibleoperationsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/incompatible-operations-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/incompatible-operations-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/fast/dom/incompatible-operations-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -12,11 +12,11 @@
</span><span class="cx"> PASS aNode.lookupPrefix(aDOMImplementation) is null
</span><span class="cx"> PASS aNode.lookupPrefix(void 0) is null
</span><span class="cx"> PASS aNode.cloneNode(aDOMImplementation) instanceof HTMLDivElement is true
</span><del>-PASS aSelect.add(aDOMImplementation, aDOMImplementation) threw exception TypeError: Type error.
-PASS aSelect.add(aDOMImplementation, anOption) threw exception TypeError: Type error.
</del><ins>+PASS aSelect.add(aDOMImplementation, aDOMImplementation) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
+PASS aSelect.add(aDOMImplementation, anOption) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS aSelect.add(anOption, aDOMImplementation) is undefined.
</span><del>-PASS aSelect.add(void 0, void 0) threw exception TypeError: Type error.
-PASS aSelect.add(void 0, anOption) threw exception TypeError: Type error.
</del><ins>+PASS aSelect.add(void 0, void 0) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
+PASS aSelect.add(void 0, anOption) threw exception TypeError: Argument 1 ('element') to HTMLSelectElement.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS aSelect.add(anOption, void 0) is undefined.
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomselectoptionsaddexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/select-options-add-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/select-options-add-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/js/dom/select-options-add-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -34,42 +34,42 @@
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.5 Add a non-element (string)
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.6 Add a non-element (number)
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.7 Add a non-element (boolean)
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.8 Add undefined
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.9 Add null
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.10 Add negative infinity
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.11 Add NaN
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="cx"> 1.12 Add positive infinity
</span><del>-PASS select1.options.add(option1) threw exception TypeError: Type error.
</del><ins>+PASS select1.options.add(option1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select1.options.length is 3
</span><span class="cx"> PASS select1.selectedIndex is 0
</span><span class="cx">
</span><span class="lines">@@ -183,42 +183,42 @@
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.13 Add a non-element (string)
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.14 Add a non-element (number)
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.15 Add a non-element (boolean)
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.16 Add undefined
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.17 Add null
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.18 Add negative infinity
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.19 Add NaN
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span><span class="cx"> 2.20 Add positive infinity
</span><del>-PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
</del><ins>+PASS select2.options.add(option2, 1) threw exception TypeError: Argument 1 ('element') to HTMLOptionsCollection.add must be an instance of HTMLElement.
</ins><span class="cx"> PASS select2.options.length is 11
</span><span class="cx"> PASS select2.selectedIndex is 4
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebaudioaudiobufferexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webaudio/audiobuffer-expected.txt (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/audiobuffer-expected.txt 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/webaudio/audiobuffer-expected.txt 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> PASS getChannelData(2) returns a Float32Array object.
</span><span class="cx"> PASS getChannelData(3) returns a Float32Array object.
</span><span class="cx"> PASS Exception has been thrown correctly when index is not less than numberOfChannels.
</span><del>-PASS context.createBuffer(null, false) threw exception TypeError: Type error.
</del><ins>+PASS context.createBuffer(null, false) threw exception TypeError: Argument 1 ('buffer') to webkitAudioContext.createBuffer must be an instance of ArrayBuffer.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestswebaudioaudiobufferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webaudio/audiobuffer.html (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/audiobuffer.html 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/webaudio/audiobuffer.html 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> testPassed("Exception has been thrown correctly when index is not less than numberOfChannels.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-shouldThrow("context.createBuffer(null, false)", "'TypeError: Type error'");
</del><ins>+shouldThrowErrorName("context.createBuffer(null, false)", "TypeError");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebgl102resourceswebgl_test_filesconformancetexturesteximagewithinvaliddatahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> exc = x;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (expected == gl.INVALID_OPERATION) {
</del><ins>+ if (expected == gl.INVALID_OPERATION || expected == gl.INVALID_VALUE) {
</ins><span class="cx"> glErrorShouldBe(gl, expected);
</span><span class="cx"> } else if (expected == "exception") {
</span><span class="cx"> if (exc) {
</span><span class="lines">@@ -89,17 +89,18 @@
</span><span class="cx"> },
</span><span class="cx"> gl.INVALID_OPERATION);
</span><span class="cx">
</span><del>-test("Passing texImage2D parameter data of Number type should throw an exception",
</del><ins>+// We do not do strict type checking for ArrayBufferView type.
+test("Passing texImage2D parameter data of Number type should generate an INVALID_OPERATION",
</ins><span class="cx"> function () {
</span><span class="cx"> gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 64, 64, 0, gl.RGBA, gl.UNSIGNED_BYTE, 42);
</span><span class="cx"> },
</span><del>- "exception");
</del><ins>+ gl.INVALID_OPERATION);
</ins><span class="cx">
</span><del>-test("Passing texImage2D parameter data of String type should throw a TypeError",
</del><ins>+test("Passing texImage2D parameter data of String type should generate an INVALID_OPERATION",
</ins><span class="cx"> function () {
</span><span class="cx"> gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 64, 64, 0, gl.RGBA, gl.UNSIGNED_BYTE, "not a buffer");
</span><span class="cx"> },
</span><del>- "exception");
</del><ins>+ gl.INVALID_OPERATION);
</ins><span class="cx"> test("Passing a buffer not large enough to texSubImage2D should generate an INVALID_OPERATION",
</span><span class="cx"> function () {
</span><span class="cx"> var tooSmall = new Uint8Array(64);
</span><span class="lines">@@ -107,17 +108,17 @@
</span><span class="cx"> },
</span><span class="cx"> gl.INVALID_OPERATION);
</span><span class="cx">
</span><del>-test("Passing texSubImage2D parameter data of Number type should throw a TypeError",
</del><ins>+test("Passing texSubImage2D parameter data of Number type should generate an INVALID_VALUE",
</ins><span class="cx"> function () {
</span><span class="cx"> gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 64, gl.RGBA, gl.UNSIGNED_BYTE, 42);
</span><span class="cx"> },
</span><del>- "exception");
</del><ins>+ gl.INVALID_VALUE);
</ins><span class="cx">
</span><del>-test("Passing texSubImage2D parameter data of String type should throw a TypeError",
</del><ins>+test("Passing texSubImage2D parameter data of String type should generate an INVALID_VALUE",
</ins><span class="cx"> function () {
</span><span class="cx"> gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 64, gl.RGBA, gl.UNSIGNED_BYTE, "not a buffer");
</span><span class="cx"> },
</span><del>- "exception");
</del><ins>+ gl.INVALID_VALUE);
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/ChangeLog 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2016-08-02 Chris Dumez <cdumez@apple.com>
+
+ [WebIDL] Implement overload resolution algorithm
+ https://bugs.webkit.org/show_bug.cgi?id=160394
+
+ Reviewed by Darin Adler.
+
+ Implement overload resolution algorithm:
+ - http://heycam.github.io/webidl/#es-overloads
+
+ This means that our support for operation overloading in our IDL is
+ now a lot more extensive than it used to be and is now compliant with
+ the Web IDL specification.
+
+ In particular, overloading should now work for a lot more parameter
+ types which means that:
+ - We should be able to drop some custom bindings code in a follow-up patch.
+ - We will be able to drop the [StrictTypeChecking] attribute which was
+ a hack used to make overloading work for parameters of type DOMString.
+
+ Also, the order of the overloads in the IDL no longer impacts the
+ generated bindings code. It used to be that you needed to put the
+ overloads with the more specific parameter types first in order for the
+ generated bindings code to be somewhat correct.
+
+ No new tests, rebaselined bindings tests.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (IsStringOrEnumType):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (IsNullableType):
+ (StripNullable):
+ (ComputeEffectiveOverloadSet):
+ (AreTypesDistinguishableForOverloadResolution):
+ (GetDistinguishingArgumentIndex):
+ (GetOverloadThatMatches):
+ (GenerateOverloadedFunction):
+ * bindings/scripts/test/JS/JSTestGlobalObject.cpp:
+ (WebCore::jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter):
+ (WebCore::jsTestObjConstructorFunctionOverloadedMethod1):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseOverloadedFunction):
+ (WebCore::jsTestObjConstructorFunctionOverloadedMethod12): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseOverloadedFunction2Promise): Deleted.
+ * bindings/scripts/test/TestObj.idl:
+ * dom/EventTarget.h:
+ * dom/EventTarget.idl:
+ * html/HTMLOptionsCollection.h:
+ * html/HTMLOptionsCollection.idl:
+ * html/HTMLSelectElement.h:
+ (WebCore::HTMLSelectElement::add):
+ * html/HTMLSelectElement.idl:
+
</ins><span class="cx"> 2016-08-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [macOS] Guard workaround in r203314 for only OSes which need it
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -358,6 +358,15 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsStringOrEnumType
+{
+ my ($object, $type) = @_;
+
+ return 1 if $type eq "DOMString";
+ return 1 if $object->IsEnumType($type);
+ return 0;
+}
+
</ins><span class="cx"> sub IsIntegerType
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -1643,6 +1643,305 @@
</span><span class="cx"> return $propertyCount;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsNullableType
+{
+ my $type = shift;
+
+ return substr($type, -1) eq "?";
+}
+
+sub StripNullable
+{
+ my $type = shift;
+
+ chop($type) if IsNullableType($type);
+ return $type;
+}
+
+# This computes an effective overload set for a given operation / constructor,
+# which represents the allowable invocations.This set is used as input for
+# the Web IDL overload resolution algorithm.
+# http://heycam.github.io/webidl/#dfn-effective-overload-set
+sub ComputeEffectiveOverloadSet
+{
+ my ($overloads) = @_;
+
+ my %allSets;
+ my $addTuple = sub {
+ my $tuple = shift;
+ # The Web IDL specification uses a flat set of tuples but we use a hash where the key is the
+ # number of parameters and the value is the set of tuples for the given number of parameters.
+ my $length = scalar(@{@$tuple[1]});
+ if (!exists($allSets{$length})) {
+ $allSets{$length} = [ $tuple ];
+ } else {
+ push(@{$allSets{$length}}, $tuple);
+ }
+ };
+
+ my $m = LengthOfLongestFunctionParameterList($overloads);
+ foreach my $overload (@{$overloads}) {
+ my $n = @{$overload->parameters};
+ my @t;
+ my @o;
+ my $isVariadic = 0;
+ foreach my $parameter (@{$overload->parameters}) {
+ push(@t, $parameter->isNullable ? $parameter->type . "?" : $parameter->type);
+ if ($parameter->isOptional) {
+ push(@o, "optional");
+ } elsif ($parameter->isVariadic) {
+ push(@o, "variadic");
+ $isVariadic = 1;
+ } else {
+ push(@o, "required");
+ }
+ }
+ &$addTuple([$overload, [@t], [@o]]);
+ if ($isVariadic) {
+ my @newT = @t;
+ my @newO = @o;
+ for (my $i = $n; $i < $m; $i++) {
+ push(@newT, $t[-1]);
+ push(@newO, "variadic");
+ &$addTuple([$overload, [@newT], [@newO]]);
+ }
+ }
+ for (my $i = $n - 1; $i >= 0; $i--) {
+ my $parameter = @{$overload->parameters}[$i];
+ last unless ($parameter->isOptional || $parameter->isVariadic);
+ pop(@t);
+ pop(@o);
+ &$addTuple([$overload, [@t], [@o]]);
+ }
+ }
+ return %allSets;
+}
+
+# Determines if two types are distinguishable in the context of overload resolution,
+# according to the Web IDL specification:
+# http://heycam.github.io/webidl/#dfn-distinguishable
+sub AreTypesDistinguishableForOverloadResolution
+{
+ my ($typeA, $typeB) = @_;
+
+ my $isDictionary = sub {
+ my $type = shift;
+ return $type eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
+ };
+ my $isCallbackFunctionOrDictionary = sub {
+ my $type = shift;
+ return $codeGenerator->IsFunctionOnlyCallbackInterface($type) || &$isDictionary($type);
+ };
+
+ # FIXME: The WebIDL mandates this but this currently does not work because some of our IDL is wrong.
+ # return 0 if IsNullableType($typeA) && IsNullableType($typeB);
+
+ $typeA = StripNullable($typeA);
+ $typeB = StripNullable($typeB);
+
+ return 0 if $typeA eq $typeB;
+ return 0 if $typeA eq "object" or $typeB eq "object";
+ return 0 if $codeGenerator->IsNumericType($typeA) && $codeGenerator->IsNumericType($typeB);
+ return 0 if $codeGenerator->IsStringOrEnumType($typeA) && $codeGenerator->IsStringOrEnumType($typeB);
+ return 0 if &$isDictionary($typeA) && &$isDictionary($typeB);
+ return 0 if $codeGenerator->IsCallbackInterface($typeA) && $codeGenerator->IsCallbackInterface($typeB);
+ return 0 if &$isCallbackFunctionOrDictionary($typeA) && &$isCallbackFunctionOrDictionary($typeB);
+ return 0 if $codeGenerator->GetArrayOrSequenceType($typeA) && $codeGenerator->GetArrayOrSequenceType($typeB);
+ # FIXME: return 0 if typeA and typeB are both exception types.
+ return 1;
+}
+
+# If there is more than one entry in an effective overload set that has a given type list length,
+# then for those entries there must be an index i such that for each pair of entries the types
+# at index i are distinguishable. The lowest such index is termed the distinguishing argument index.
+# http://heycam.github.io/webidl/#dfn-distinguishing-argument-index
+sub GetDistinguishingArgumentIndex
+{
+ my ($function, $S) = @_;
+
+ # FIXME: Consider all the tuples, not just the 2 first ones?
+ my $firstTupleTypes = @{@{$S}[0]}[1];
+ my $secondTupleTypes = @{@{$S}[1]}[1];
+ for (my $index = 0; $index < scalar(@$firstTupleTypes); $index++) {
+ return $index if AreTypesDistinguishableForOverloadResolution(@{$firstTupleTypes}[$index], @{$secondTupleTypes}[$index]);
+ }
+ die "Undistinguishable overloads for operation " . $function->signature->name . " with length: " . scalar(@$firstTupleTypes);
+}
+
+sub GetOverloadThatMatches
+{
+ my ($S, $parameterIndex, $matches) = @_;
+
+ for my $tuple (@{$S}) {
+ my $type = @{@{$tuple}[1]}[$parameterIndex];
+ my $optionality = @{@{$tuple}[2]}[$parameterIndex];
+ my $isNullable = IsNullableType($type);
+ return @{$tuple}[0] if $matches->(StripNullable($type), $optionality, $isNullable);
+ }
+}
+
+# Implements the overload resolution algorithm, as defined in the Web IDL specification:
+# http://heycam.github.io/webidl/#es-overloads
+sub GenerateOverloadedFunction
+{
+ my ($function, $interface) = @_;
+ my %allSets = ComputeEffectiveOverloadSet($function->{overloads});
+
+ my $kind = $function->isStatic ? "Constructor" : (OperationShouldBeOnInstance($interface, $function) ? "Instance" : "Prototype");
+ my $interfaceName = $interface->name;
+ my $functionName = "js${interfaceName}${kind}Function" . $codeGenerator->WK_ucfirst($function->signature->name);
+
+ my $generateOverloadCallIfNecessary = sub {
+ my ($overload, $condition) = @_;
+ return unless $overload;
+ my $conditionalString = $codeGenerator->GenerateConditionalString($overload->signature);
+ push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
+ push(@implContent, " if ($condition)\n ") if $condition;
+ push(@implContent, " return ${functionName}$overload->{overloadIndex}(state);\n");
+ push(@implContent, "#endif\n") if $conditionalString;
+ };
+ my $isOptionalParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $optionality eq "optional";
+ };
+ my $isDictionaryParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $type eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
+ };
+ my $isNullableOrDictionaryParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $isNullable || &$isDictionaryParameter($type, $optionality, $isNullable);
+ };
+ my $isRegExpOrObjectParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $type eq "RegExp" || $type eq "object";
+ };
+ my $isObjectOrErrorParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $type eq "object" || $type eq "Error";
+ };
+ my $isObjectOrErrorOrDOMExceptionParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return 1 if &$isObjectOrErrorParameter($type, $optionality, $isNullable);
+ return $type eq "DOMException";
+ };
+ my $isObjectOrCallbackFunctionParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $type eq "object" || $codeGenerator->IsFunctionOnlyCallbackInterface($type);
+ };
+ my $isArrayOrSequenceParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $codeGenerator->GetArrayOrSequenceType($type);
+ };
+ my $isDictionaryOrObjectOrCallbackInterfaceParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return 1 if &$isDictionaryParameter($type, $optionality, $isNullable);
+ return 1 if $type eq "object";
+ return 1 if $codeGenerator->IsCallbackInterface($type) && !$codeGenerator->IsFunctionOnlyCallbackInterface($type);
+ return 0;
+ };
+ my $isBooleanParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $type eq "boolean";
+ };
+ my $isNumericParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $codeGenerator->IsNumericType($type);
+ };
+ my $isStringOrEnumParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $codeGenerator->IsStringOrEnumType($type);
+ };
+ my $isAnyParameter = sub {
+ my ($type, $optionality, $isNullable) = @_;
+ return $type eq "any";
+ };
+
+ my $maxArgCount = LengthOfLongestFunctionParameterList($function->{overloads});
+
+ push(@implContent, <<END);
+EncodedJSValue JSC_HOST_CALL ${functionName}(ExecState* state)
+{
+ size_t argsCount = std::min<size_t>($maxArgCount, state->argumentCount());
+END
+
+ for my $length ( sort keys %allSets ) {
+ push(@implContent, <<END);
+ if (argsCount == $length) {
+END
+ my $S = $allSets{$length};
+ if (scalar(@$S) > 1) {
+ my $d = GetDistinguishingArgumentIndex($function, $S);
+ push(@implContent, " JSValue distinguishingArg = state->uncheckedArgument($d);\n");
+
+ my $overload = GetOverloadThatMatches($S, $d, \&$isOptionalParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isUndefined()");
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isNullableOrDictionaryParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isUndefinedOrNull()");
+
+ for my $tuple (@{$S}) {
+ my $overload = @{$tuple}[0];
+ my $type = StripNullable(@{@{$tuple}[1]}[$d]);
+ if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type)) {
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS${type}::info())");
+ }
+ }
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isRegExpOrObjectParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->type() == RegExpObjectType");
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isObjectOrErrorOrDOMExceptionParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSDOMCoreException::info())");
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isObjectOrErrorParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->type() == ErrorInstanceType");
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isObjectOrCallbackFunctionParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isFunction()");
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isArrayOrSequenceParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && isJSArray(distinguishingArg)");
+
+ $overload = GetOverloadThatMatches($S, $d, \&$isDictionaryOrObjectOrCallbackInterfaceParameter);
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->type() != RegExpObjectType");
+
+ my $booleanOverload = GetOverloadThatMatches($S, $d, \&$isBooleanParameter);
+ &$generateOverloadCallIfNecessary($booleanOverload, "distinguishingArg.isBoolean()");
+
+ my $numericOverload = GetOverloadThatMatches($S, $d, \&$isNumericParameter);
+ &$generateOverloadCallIfNecessary($numericOverload, "distinguishingArg.isNumber()");
+
+ # Fallbacks.
+ $overload = GetOverloadThatMatches($S, $d, \&$isStringOrEnumParameter);
+ if ($overload) {
+ &$generateOverloadCallIfNecessary($overload);
+ } elsif ($numericOverload) {
+ &$generateOverloadCallIfNecessary($numericOverload);
+ } elsif ($booleanOverload) {
+ &$generateOverloadCallIfNecessary($booleanOverload);
+ } else {
+ $overload = GetOverloadThatMatches($S, $d, \&$isAnyParameter);
+ &$generateOverloadCallIfNecessary($overload);
+ }
+ } else {
+ # Only 1 overload with this number of parameters.
+ my $overload = @{@{$S}[0]}[0];
+ &$generateOverloadCallIfNecessary($overload);
+ }
+ push(@implContent, <<END);
+ }
+END
+ }
+ my $minArgCount = GetFunctionLength($function);
+ if ($minArgCount > 0) {
+ push(@implContent, " return argsCount < $minArgCount ? throwVMError(state, createNotEnoughArgumentsError(state)) : throwVMTypeError(state);\n")
+ } else {
+ push(@implContent, " return throwVMTypeError(state);\n")
+ }
+ push(@implContent, "}\n\n");
+}
+
</ins><span class="cx"> sub GenerateParametersCheckExpression
</span><span class="cx"> {
</span><span class="cx"> my $numParameters = shift;
</span><span class="lines">@@ -1768,61 +2067,6 @@
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GenerateOverloadedFunction
-{
- my ($function, $interface) = @_;
-
- # Generate code for choosing the correct overload to call. Overloads are
- # chosen based on the total number of arguments passed and the type of
- # values passed in non-primitive argument slots. When more than a single
- # overload is applicable, precedence is given according to the order of
- # declaration in the IDL.
-
- my $kind = $function->isStatic ? "Constructor" : (OperationShouldBeOnInstance($interface, $function) ? "Instance" : "Prototype");
- my $interfaceName = $interface->name;
- my $functionName = "js${interfaceName}${kind}Function" . $codeGenerator->WK_ucfirst($function->signature->name);
-
- # FIXME: Implement support for overloaded functions with variadic arguments.
- my $lengthOfLongestOverloadedFunctionParameterList = LengthOfLongestFunctionParameterList($function->{overloads});
-
- push(@implContent, "EncodedJSValue JSC_HOST_CALL ${functionName}(ExecState* state)\n");
- push(@implContent, <<END);
-{
- size_t argsCount = std::min<size_t>($lengthOfLongestOverloadedFunctionParameterList, state->argumentCount());
-END
-
- my %fetchedArguments = ();
- my $leastNumMandatoryParams = 255;
-
- foreach my $overload (@{$function->{overloads}}) {
- my ($numMandatoryParams, $parametersCheck, @neededArguments) = GenerateFunctionParametersCheck($overload);
- $leastNumMandatoryParams = $numMandatoryParams if ($numMandatoryParams < $leastNumMandatoryParams);
-
- foreach my $parameterIndex (@neededArguments) {
- next if exists $fetchedArguments{$parameterIndex};
- push(@implContent, " JSValue arg$parameterIndex(state->argument($parameterIndex));\n");
- $fetchedArguments{$parameterIndex} = 1;
- }
-
- my $conditionalString = $codeGenerator->GenerateConditionalString($overload->signature);
- push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
-
- push(@implContent, " if ($parametersCheck)\n");
- push(@implContent, " return ${functionName}$overload->{overloadIndex}(state);\n");
- push(@implContent, "#endif\n\n") if $conditionalString;
-
- }
- if ($leastNumMandatoryParams >= 1) {
- push(@implContent, " if (UNLIKELY(argsCount < $leastNumMandatoryParams))\n");
- push(@implContent, " return throwVMError(state, createNotEnoughArgumentsError(state));\n");
- }
- push(@implContent, <<END);
- return throwVMTypeError(state);
-}
-
-END
-}
-
</del><span class="cx"> sub GetNativeTypeForConversions
</span><span class="cx"> {
</span><span class="cx"> my $interface = shift;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -398,19 +398,17 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(1, state->argumentCount());
</span><ins>+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
</ins><span class="cx"> #if ENABLE(TEST_FEATURE)
</span><del>- if (argsCount == 1)
- return jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation1(state);
</del><ins>+ if (distinguishingArg.isNumber())
+ return jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation2(state);
</ins><span class="cx"> #endif
</span><del>-
</del><span class="cx"> #if ENABLE(TEST_FEATURE)
</span><del>- if (argsCount == 1)
- return jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation2(state);
</del><ins>+ return jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation1(state);
</ins><span class="cx"> #endif
</span><del>-
- if (UNLIKELY(argsCount < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- return throwVMTypeError(state);
</del><ins>+ }
+ return argsCount < 1 ? throwVMError(state, createNotEnoughArgumentsError(state)) : throwVMTypeError(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEST_FEATURE)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -3869,19 +3869,17 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionEnabledAtRuntimeOperation(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(1, state->argumentCount());
</span><ins>+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
</ins><span class="cx"> #if ENABLE(TEST_FEATURE)
</span><del>- if (argsCount == 1)
- return jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1(state);
</del><ins>+ if (distinguishingArg.isNumber())
+ return jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2(state);
</ins><span class="cx"> #endif
</span><del>-
</del><span class="cx"> #if ENABLE(TEST_FEATURE)
</span><del>- if (argsCount == 1)
- return jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2(state);
</del><ins>+ return jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1(state);
</ins><span class="cx"> #endif
</span><del>-
- if (UNLIKELY(argsCount < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- return throwVMTypeError(state);
</del><ins>+ }
+ return argsCount < 1 ? throwVMError(state, createNotEnoughArgumentsError(state)) : throwVMTypeError(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethod(ExecState* state)
</span><span class="lines">@@ -5422,34 +5420,41 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(2, state->argumentCount());
</span><del>- JSValue arg0(state->argument(0));
- JSValue arg1(state->argument(1));
- if ((argsCount == 2 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info()))) && (arg1.isUndefinedOrNull() || arg1.isString() || arg1.isObject())))
</del><ins>+ if (argsCount == 0) {
+ return jsTestObjPrototypeFunctionOverloadedMethod12(state);
+ }
+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
+ if (distinguishingArg.isUndefinedOrNull())
+ return jsTestObjPrototypeFunctionOverloadedMethod2(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethod2(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestCallback::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethod5(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSDOMStringList::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethod6(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethod8(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSBlob::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethod12(state);
+ if (distinguishingArg.isObject() && isJSArray(distinguishingArg))
+ return jsTestObjPrototypeFunctionOverloadedMethod7(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->type() != RegExpObjectType)
+ return jsTestObjPrototypeFunctionOverloadedMethod5(state);
+ if (distinguishingArg.isNumber())
+ return jsTestObjPrototypeFunctionOverloadedMethod4(state);
+ return jsTestObjPrototypeFunctionOverloadedMethod3(state);
+ }
+ if (argsCount == 2) {
+ JSValue distinguishingArg = state->uncheckedArgument(1);
+ if (distinguishingArg.isUndefined())
+ return jsTestObjPrototypeFunctionOverloadedMethod2(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSBlob::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethod12(state);
+ if (distinguishingArg.isNumber())
+ return jsTestObjPrototypeFunctionOverloadedMethod2(state);
</ins><span class="cx"> return jsTestObjPrototypeFunctionOverloadedMethod1(state);
</span><del>- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info())))) || (argsCount == 2 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info())))))
- return jsTestObjPrototypeFunctionOverloadedMethod2(state);
- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || arg0.isString() || arg0.isObject())))
- return jsTestObjPrototypeFunctionOverloadedMethod3(state);
- if (argsCount == 1)
- return jsTestObjPrototypeFunctionOverloadedMethod4(state);
- if ((argsCount == 1 && (arg0.isNull() || arg0.isObject())))
- return jsTestObjPrototypeFunctionOverloadedMethod5(state);
- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSDOMStringList::info())))))
- return jsTestObjPrototypeFunctionOverloadedMethod6(state);
- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || (arg0.isObject() && isJSArray(arg0)))))
- return jsTestObjPrototypeFunctionOverloadedMethod7(state);
- if ((argsCount == 1 && ((arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info())))))
- return jsTestObjPrototypeFunctionOverloadedMethod8(state);
- if ((argsCount == 1 && ((arg0.isObject() && isJSArray(arg0)))))
- return jsTestObjPrototypeFunctionOverloadedMethod9(state);
- if ((argsCount == 1 && ((arg0.isObject() && isJSArray(arg0)))))
- return jsTestObjPrototypeFunctionOverloadedMethod10(state);
- if (argsCount == 1)
- return jsTestObjPrototypeFunctionOverloadedMethod11(state);
- if ()
- return jsTestObjPrototypeFunctionOverloadedMethod12(state);
- if (UNLIKELY(argsCount < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
</del><ins>+ }
</ins><span class="cx"> return throwVMTypeError(state);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5463,19 +5468,16 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- TestObj* objArg1 = nullptr;
- if (!state->argument(0).isUndefinedOrNull()) {
- objArg1 = JSTestObj::toWrapped(state->uncheckedArgument(0));
- if (UNLIKELY(!objArg1))
- return throwArgumentTypeError(*state, 0, "objArg1", "TestObject", "overloadedMethodWithOptionalParameter", "TestObj");
- }
- TestObj* objArg2 = nullptr;
</del><ins>+ auto strArg = state->argument(0).toWTFString(state);
+ if (UNLIKELY(state->hadException()))
+ return JSValue::encode(jsUndefined());
+ TestObj* objArg = nullptr;
</ins><span class="cx"> if (!state->argument(1).isUndefinedOrNull()) {
</span><del>- objArg2 = JSTestObj::toWrapped(state->uncheckedArgument(1));
- if (UNLIKELY(!objArg2))
- return throwArgumentTypeError(*state, 1, "objArg2", "TestObject", "overloadedMethodWithOptionalParameter", "TestObj");
</del><ins>+ objArg = JSTestObj::toWrapped(state->uncheckedArgument(1));
+ if (UNLIKELY(!objArg))
+ return throwArgumentTypeError(*state, 1, "objArg", "TestObject", "overloadedMethodWithOptionalParameter", "TestObj");
</ins><span class="cx"> }
</span><del>- impl.overloadedMethodWithOptionalParameter(WTFMove(objArg1), WTFMove(objArg2));
</del><ins>+ impl.overloadedMethodWithOptionalParameter(WTFMove(strArg), WTFMove(objArg));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5505,15 +5507,23 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(2, state->argumentCount());
</span><del>- JSValue arg0(state->argument(0));
- JSValue arg1(state->argument(1));
- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info())))) || (argsCount == 2 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info()))) && (arg1.isUndefinedOrNull() || (arg1.isObject() && asObject(arg1)->inherits(JSTestObj::info())))))
</del><ins>+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
+ if (distinguishingArg.isUndefinedOrNull())
+ return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2(state);
</ins><span class="cx"> return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1(state);
</span><del>- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info())))) || (argsCount == 2 && (arg0.isUndefinedOrNull() || (arg0.isObject() && asObject(arg0)->inherits(JSTestObj::info())))))
- return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2(state);
- if (UNLIKELY(argsCount < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- return throwVMTypeError(state);
</del><ins>+ }
+ if (argsCount == 2) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
+ if (distinguishingArg.isUndefinedOrNull())
+ return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2(state);
+ return jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1(state);
+ }
+ return argsCount < 1 ? throwVMError(state, createNotEnoughArgumentsError(state)) : throwVMTypeError(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod(ExecState* state)
</span><span class="lines">@@ -5569,20 +5579,17 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionOverloadedMethod1(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(1, state->argumentCount());
</span><ins>+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
</ins><span class="cx"> #if ENABLE(Condition1)
</span><del>- if (argsCount == 1)
- return jsTestObjConstructorFunctionOverloadedMethod11(state);
</del><ins>+ if (distinguishingArg.isNumber())
+ return jsTestObjConstructorFunctionOverloadedMethod11(state);
</ins><span class="cx"> #endif
</span><del>-
- JSValue arg0(state->argument(0));
</del><span class="cx"> #if ENABLE(Condition1)
</span><del>- if ((argsCount == 1 && (arg0.isUndefinedOrNull() || arg0.isString() || arg0.isObject())))
</del><span class="cx"> return jsTestObjConstructorFunctionOverloadedMethod12(state);
</span><span class="cx"> #endif
</span><del>-
- if (UNLIKELY(argsCount < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- return throwVMTypeError(state);
</del><ins>+ }
+ return argsCount < 1 ? throwVMError(state, createNotEnoughArgumentsError(state)) : throwVMTypeError(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionClassMethodWithClamp(ExecState* state)
</span><span class="lines">@@ -6082,14 +6089,15 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseOverloadedFunction(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(1, state->argumentCount());
</span><del>- if (argsCount == 1)
</del><ins>+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSFetchRequest::info()))
+ return jsTestObjPrototypeFunctionTestPromiseOverloadedFunction2(state);
+ if (distinguishingArg.isNumber())
+ return jsTestObjPrototypeFunctionTestPromiseOverloadedFunction1(state);
</ins><span class="cx"> return jsTestObjPrototypeFunctionTestPromiseOverloadedFunction1(state);
</span><del>- JSValue arg0(state->argument(0));
- if ((argsCount == 1 && ((arg0.isObject() && asObject(arg0)->inherits(JSFetchRequest::info())))))
- return jsTestObjPrototypeFunctionTestPromiseOverloadedFunction2(state);
- if (UNLIKELY(argsCount < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- return throwVMTypeError(state);
</del><ins>+ }
+ return argsCount < 1 ? throwVMError(state, createNotEnoughArgumentsError(state)) : throwVMTypeError(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue jsTestObjConstructorFunctionTestStaticPromiseFunctionPromise(ExecState*, JSPromiseDeferred*);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> // FIXME: Implement support for overloaded functions with variadic arguments.
</span><span class="cx"> void overloadedMethod(Blob... blobArgs);
</span><span class="cx">
</span><del>- void overloadedMethodWithOptionalParameter(TestObj? objArg1, optional TestObj? objArg2 = null);
</del><ins>+ void overloadedMethodWithOptionalParameter(DOMString strArg, optional TestObj? objArg = null);
</ins><span class="cx"> void overloadedMethodWithOptionalParameter(TestObj? objArg, optional long longArg);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> // Static method with conditional on overloaded methods
</span><span class="cx"> [Conditional=Condition1] static void overloadedMethod1(long arg);
</span><del>- [Conditional=Condition1] static void overloadedMethod1([StrictTypeChecking] DOMString type);
</del><ins>+ [Conditional=Condition1] static void overloadedMethod1(DOMString type);
</ins><span class="cx">
</span><span class="cx"> void classMethodWithClamp([Clamp] unsigned short objArgsShort, [Clamp] unsigned long objArgsLong);
</span><span class="cx"> void classMethodWithEnforceRange([EnforceRange] unsigned short objArgsShort, [EnforceRange] unsigned long objArgsLong);
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.h (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.h 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/dom/EventTarget.h 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> bool once;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture);
- void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture);
</del><ins>+ void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture = false);
+ void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture = false);
</ins><span class="cx"> void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, const AddEventListenerOptions&);
</span><span class="cx"> void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, const ListenerOptions&);
</span><span class="cx"> virtual bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions& = { });
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.idl (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.idl 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/dom/EventTarget.idl 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -27,12 +27,17 @@
</span><span class="cx"> ObjCProtocol,
</span><span class="cx"> ] interface EventTarget {
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><del>- [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener, optional AddEventListenerOptions options);
- [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener, optional EventListenerOptions options);
</del><ins>+ // FIXME: Should be:
+ // void addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options);
+ // void removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options);
+ [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener);
+ [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener, AddEventListenerOptions options);
+ [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener);
+ [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener, EventListenerOptions options);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- [ObjCLegacyUnnamedParameters, ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener, optional boolean useCapture = false);
- [ObjCLegacyUnnamedParameters, ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener, optional boolean useCapture = false);
</del><ins>+ [ObjCLegacyUnnamedParameters, ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? listener, boolean useCapture);
+ [ObjCLegacyUnnamedParameters, ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? listener, boolean useCapture);
</ins><span class="cx">
</span><span class="cx"> [ImplementedAs=dispatchEventForBindings, RaisesException] boolean dispatchEvent(Event event);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.h (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> void add(HTMLElement&, HTMLElement* beforeElement, ExceptionCode&);
</span><span class="cx"> void add(HTMLElement&, int beforeIndex, ExceptionCode&);
</span><ins>+ void add(HTMLElement& element, ExceptionCode& ec) { add(element, nullptr, ec); }
</ins><span class="cx"> void remove(int index);
</span><span class="cx"> void remove(HTMLOptionElement&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.idl (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -34,8 +34,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C) && (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT)
</span><del>- [RaisesException] void add(HTMLElement element, optional HTMLElement? before = null);
- [RaisesException] void add(HTMLElement element, optional long index = 0);
</del><ins>+ // FIXME: Should be:
+ // void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+ [RaisesException] void add(HTMLElement element);
+ [RaisesException] void add(HTMLElement element, HTMLElement? before);
+ [RaisesException] void add(HTMLElement element, long index);
</ins><span class="cx"> #else
</span><span class="cx"> [RaisesException] void add(HTMLOptionElement option, unsigned long index);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx">
</span><span class="cx"> void add(HTMLElement&, HTMLElement* beforeElement, ExceptionCode&);
</span><span class="cx"> void add(HTMLElement&, int beforeIndex, ExceptionCode&);
</span><ins>+ void add(HTMLElement& element, ExceptionCode& ec) { add(element, nullptr, ec); }
</ins><span class="cx">
</span><span class="cx"> using Node::remove;
</span><span class="cx"> void remove(HTMLOptionElement&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.idl (204027 => 204028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.idl 2016-08-02 16:57:20 UTC (rev 204027)
+++ trunk/Source/WebCore/html/HTMLSelectElement.idl 2016-08-02 17:02:23 UTC (rev 204028)
</span><span class="lines">@@ -53,9 +53,13 @@
</span><span class="cx"> HTMLOptionElement? namedItem(DOMString name);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- [ObjCLegacyUnnamedParameters, RaisesException] void add(HTMLElement element, optional HTMLElement? before = null);
</del><ins>+ [ObjCLegacyUnnamedParameters, RaisesException] void add(HTMLElement element, HTMLElement? before);
</ins><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><del>- [RaisesException] void add(HTMLElement element, optional long index = 0);
</del><ins>+ // FIXME: Should be:
+ // void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+ [RaisesException] void add(HTMLElement element, long index);
+ [RaisesException] void add(HTMLElement element);
+
</ins><span class="cx"> // In JavaScript, we support both option index and option object parameters.
</span><span class="cx"> // As of this writing this cannot be auto-generated.
</span><span class="cx"> [Custom] void remove(/* indexOrOption */);
</span></span></pre>
</div>
</div>
</body>
</html>