<!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>[200299] 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/200299">200299</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-04-30 21:17:54 -0700 (Sat, 30 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline and remove unused bindings generation code
https://bugs.webkit.org/show_bug.cgi?id=157237
Reviewed by Chris Dumez.
Source/WebCore:
* Modules/notifications/NotificationCenter.idl: Replace non-standard "int"
with standard "long", which means the same thing.
* bindings/scripts/CodeGenerator.pm:
(UpdateFile): Use a better perl idiom for open.
(IsTypedArrayType): Use a hash instead of a list of checks in the code.
(IsRefPtrType): Use GetArrayOrSequenceType. Add handling for "any", which
is not a "RefPtr" type.
(IsWrapperType): Build on top of IsRefPtr type so we don't have to repeat
the list.
(getInterfaceExtendedAttributesFromName): Added a FIXME about why this is no good.
(ComputeIsCallbackInterface): Renamed.
(IsCallbackInterface): Added a cache so we don't keep reading the same file
over and over again. Added a FIXME about why this is no good.
(ComputeIsFunctionOnlyCallbackInterface): Ditto.
(IsFunctionOnlyCallbackInterface): Ditto.
* bindings/scripts/CodeGeneratorJS.pm:
(AddIncludesForType): Use GetArrayOrSequenceType.
(IsScriptProfileType): Deleted.
(AddTypedefForScriptProfileType): Deleted.
(AddClassForwardIfNeeded): Streamlined the code and made the ScriptProfileNode
special case easier to read.
(GenerateParametersCheckExpression): Use GetArrayOrSequenceType.
(GetFunctionLength): Tweaked formatting and argument names.
(GenerateImplementation): Merged a couple checks into a single if statement.
(WillConvertUndefinedToDefaultParameterValue): Streamlined the function by
using a hash instead of a sequence of if statements for most cases.
(GetNativeType): Use GetArrayOrSequenceType.
(JSValueToNative): Do the integer conversion based on a hash rather than
with lots of separate lines of code. Moved more of the simple names down to
the bottom of the function and streamlined the logic. Removed unnecessary
includes of the DOM headers directly, since our header file includes those.
(NativeToJSValue): Factored out the global object handling so it works across
more cases. Simplified the logic for dates. Use IsNumericType instead of
IsPrimitiveType to guard code that is right only for the numeric types.
Removed code to handle "Symbol" since we don't ever use that.
* bindings/scripts/test/JS/JSTestCallback.cpp:
* bindings/scripts/test/JS/JSTestCallbackFunction.cpp:
* bindings/scripts/test/JS/JSTestInterface.cpp:
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
Regenerated.
* bindings/scripts/test/TestObj.idl: Removed test coverage for Symbol, which
we never use anywhere.
* html/canvas/EXTBlendMinMax.idl: Replace non-standard "int" with standard
"long", which means the same thing.
* html/canvas/EXTTextureFilterAnisotropic.idl: Ditto.
* html/canvas/EXTsRGB.idl: Ditto.
* html/canvas/OESStandardDerivatives.idl: Ditto.
* html/canvas/OESVertexArrayObject.idl: Ditto.
* html/canvas/WebGLCompressedTextureATC.idl: Ditto.
* html/canvas/WebGLCompressedTexturePVRTC.idl: Ditto.
* html/canvas/WebGLCompressedTextureS3TC.idl: Ditto.
* html/canvas/WebGLDebugRendererInfo.idl: Ditto.
* html/canvas/WebGLDepthTexture.idl: Ditto.
Tools:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
Replace non-standard "int" with standard "long", which means the same thing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationCenteridl">trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl</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="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTBlendMinMaxidl">trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTTextureFilterAnisotropicidl">trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTsRGBidl">trunk/Source/WebCore/html/canvas/EXTsRGB.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESStandardDerivativesidl">trunk/Source/WebCore/html/canvas/OESStandardDerivatives.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESVertexArrayObjectidl">trunk/Source/WebCore/html/canvas/OESVertexArrayObject.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTextureATCidl">trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTexturePVRTCidl">trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTextureS3TCidl">trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDebugRendererInfoidl">trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDepthTextureidl">trunk/Source/WebCore/html/canvas/WebGLDepthTexture.idl</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityControlleridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/ChangeLog 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -1,3 +1,70 @@
</span><ins>+2016-04-30 Darin Adler <darin@apple.com>
+
+ Streamline and remove unused bindings generation code
+ https://bugs.webkit.org/show_bug.cgi?id=157237
+
+ Reviewed by Chris Dumez.
+
+ * Modules/notifications/NotificationCenter.idl: Replace non-standard "int"
+ with standard "long", which means the same thing.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (UpdateFile): Use a better perl idiom for open.
+ (IsTypedArrayType): Use a hash instead of a list of checks in the code.
+ (IsRefPtrType): Use GetArrayOrSequenceType. Add handling for "any", which
+ is not a "RefPtr" type.
+ (IsWrapperType): Build on top of IsRefPtr type so we don't have to repeat
+ the list.
+ (getInterfaceExtendedAttributesFromName): Added a FIXME about why this is no good.
+ (ComputeIsCallbackInterface): Renamed.
+ (IsCallbackInterface): Added a cache so we don't keep reading the same file
+ over and over again. Added a FIXME about why this is no good.
+ (ComputeIsFunctionOnlyCallbackInterface): Ditto.
+ (IsFunctionOnlyCallbackInterface): Ditto.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (AddIncludesForType): Use GetArrayOrSequenceType.
+ (IsScriptProfileType): Deleted.
+ (AddTypedefForScriptProfileType): Deleted.
+ (AddClassForwardIfNeeded): Streamlined the code and made the ScriptProfileNode
+ special case easier to read.
+ (GenerateParametersCheckExpression): Use GetArrayOrSequenceType.
+ (GetFunctionLength): Tweaked formatting and argument names.
+ (GenerateImplementation): Merged a couple checks into a single if statement.
+ (WillConvertUndefinedToDefaultParameterValue): Streamlined the function by
+ using a hash instead of a sequence of if statements for most cases.
+ (GetNativeType): Use GetArrayOrSequenceType.
+ (JSValueToNative): Do the integer conversion based on a hash rather than
+ with lots of separate lines of code. Moved more of the simple names down to
+ the bottom of the function and streamlined the logic. Removed unnecessary
+ includes of the DOM headers directly, since our header file includes those.
+ (NativeToJSValue): Factored out the global object handling so it works across
+ more cases. Simplified the logic for dates. Use IsNumericType instead of
+ IsPrimitiveType to guard code that is right only for the numeric types.
+ Removed code to handle "Symbol" since we don't ever use that.
+
+ * bindings/scripts/test/JS/JSTestCallback.cpp:
+ * bindings/scripts/test/JS/JSTestCallbackFunction.cpp:
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ Regenerated.
+
+ * bindings/scripts/test/TestObj.idl: Removed test coverage for Symbol, which
+ we never use anywhere.
+
+ * html/canvas/EXTBlendMinMax.idl: Replace non-standard "int" with standard
+ "long", which means the same thing.
+ * html/canvas/EXTTextureFilterAnisotropic.idl: Ditto.
+ * html/canvas/EXTsRGB.idl: Ditto.
+ * html/canvas/OESStandardDerivatives.idl: Ditto.
+ * html/canvas/OESVertexArrayObject.idl: Ditto.
+ * html/canvas/WebGLCompressedTextureATC.idl: Ditto.
+ * html/canvas/WebGLCompressedTexturePVRTC.idl: Ditto.
+ * html/canvas/WebGLCompressedTextureS3TC.idl: Ditto.
+ * html/canvas/WebGLDebugRendererInfo.idl: Ditto.
+ * html/canvas/WebGLDepthTexture.idl: Ditto.
+
</ins><span class="cx"> 2016-04-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Pass even more types by reference
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationCenteridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -30,13 +30,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
- Conditional=LEGACY_NOTIFICATIONS,
</del><span class="cx"> ActiveDOMObject,
</span><ins>+ Conditional=LEGACY_NOTIFICATIONS,
+ NoInterfaceObject,
</ins><span class="cx"> ] interface NotificationCenter {
</span><span class="cx"> [RaisesException] Notification createNotification(DOMString iconUrl, DOMString title, DOMString body);
</span><span class="cx">
</span><del>- int checkPermission();
</del><ins>+ long checkPermission();
</ins><span class="cx"> void requestPermission(optional VoidCallback? callback);
</span><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -71,6 +71,21 @@
</span><span class="cx">
</span><span class="cx"> my %enumTypeHash = ();
</span><span class="cx">
</span><ins>+my %typedArrayTypes = (
+ "ArrayBuffer" => 1,
+ "ArrayBufferView" => 1,
+ "DataView" => 1,
+ "Float32Array" => 1,
+ "Float64Array" => 1,
+ "Int16Array" => 1,
+ "Int32Array" => 1,
+ "Int8Array" => 1,
+ "Uint16Array" => 1,
+ "Uint32Array" => 1,
+ "Uint8Array" => 1,
+ "Uint8ClampedArray" => 1,
+);
+
</ins><span class="cx"> my %nonPointerTypeHash = ( "DOMTimeStamp" => 1 );
</span><span class="cx">
</span><span class="cx"> my %svgAttributesInHTMLHash = (
</span><span class="lines">@@ -204,7 +219,7 @@
</span><span class="cx"> my $fileName = shift;
</span><span class="cx"> my $contents = shift;
</span><span class="cx">
</span><del>- open FH, "> $fileName" or die "Couldn't open $fileName: $!\n";
</del><ins>+ open FH, ">", $fileName or die "Couldn't open $fileName: $!\n";
</ins><span class="cx"> print FH $contents;
</span><span class="cx"> close FH;
</span><span class="cx"> }
</span><span class="lines">@@ -434,10 +449,8 @@
</span><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $type = shift;
</span><del>- return 1 if (($type eq "ArrayBuffer") or ($type eq "ArrayBufferView"));
- return 1 if (($type eq "Uint8Array") or ($type eq "Uint8ClampedArray") or ($type eq "Uint16Array") or ($type eq "Uint32Array"));
- return 1 if (($type eq "Int8Array") or ($type eq "Int16Array") or ($type eq "Int32Array"));
- return 1 if (($type eq "Float32Array") or ($type eq "Float64Array") or ($type eq "DataView"));
</del><ins>+
+ return 1 if $typedArrayTypes{$type};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -447,10 +460,10 @@
</span><span class="cx"> my $type = shift;
</span><span class="cx">
</span><span class="cx"> return 0 if $object->IsPrimitiveType($type);
</span><del>- return 0 if $object->GetArrayType($type);
- return 0 if $object->GetSequenceType($type);
</del><ins>+ return 0 if $object->GetArrayOrSequenceType($type);
+ return 0 if $object->IsEnumType($type);
</ins><span class="cx"> return 0 if $type eq "DOMString";
</span><del>- return 0 if $object->IsEnumType($type);
</del><ins>+ return 0 if $type eq "any";
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -696,27 +709,24 @@
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $type = shift;
</span><span class="cx">
</span><del>- return 0 if $object->IsPrimitiveType($type);
- return 0 if $object->GetArrayType($type);
- return 0 if $object->GetSequenceType($type);
- return 0 if $object->IsEnumType($type);
- return 0 if $object->IsStringType($type);
</del><ins>+ return 0 if !$object->IsRefPtrType($type);
</ins><span class="cx"> return 0 if $object->IsTypedArrayType($type);
</span><span class="cx"> return 0 if $webCoreTypeHash{$type};
</span><del>- return 0 if $type eq "any";
</del><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub getInterfaceExtendedAttributesFromName
</span><span class="cx"> {
</span><ins>+ # FIXME: It's bad to have a function like this that opens another IDL file to answer a question.
+ # Overusing this kind of function can make things really slow. Lets avoid these if we can.
+
</ins><span class="cx"> my $object = shift;
</span><span class="cx"> my $interfaceName = shift;
</span><span class="cx">
</span><del>- my $idlFile = $object->IDLFileForInterface($interfaceName)
- or die("Could NOT find IDL file for interface \"$interfaceName\"!\n");
</del><ins>+ my $idlFile = $object->IDLFileForInterface($interfaceName) or die("Could NOT find IDL file for interface \"$interfaceName\"!\n");
</ins><span class="cx">
</span><del>- open FILE, "<", $idlFile;
</del><ins>+ open FILE, "<", $idlFile or die;
</ins><span class="cx"> my @lines = <FILE>;
</span><span class="cx"> close FILE;
</span><span class="cx">
</span><span class="lines">@@ -739,17 +749,16 @@
</span><span class="cx"> return $extendedAttributes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub IsCallbackInterface
</del><ins>+sub ComputeIsCallbackInterface
</ins><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $type = shift;
</span><span class="cx">
</span><span class="cx"> return 0 unless $object->IsWrapperType($type);
</span><span class="cx">
</span><del>- my $idlFile = $object->IDLFileForInterface($type)
- or die("Could NOT find IDL file for interface \"$type\"!\n");
</del><ins>+ my $idlFile = $object->IDLFileForInterface($type) or die("Could NOT find IDL file for interface \"$type\"!\n");
</ins><span class="cx">
</span><del>- open FILE, "<", $idlFile;
</del><ins>+ open FILE, "<", $idlFile or die;
</ins><span class="cx"> my @lines = <FILE>;
</span><span class="cx"> close FILE;
</span><span class="cx">
</span><span class="lines">@@ -757,20 +766,35 @@
</span><span class="cx"> return ($fileContents =~ /callback\s+interface\s+(\w+)/gs);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+my %isCallbackInterface = ();
+
+sub IsCallbackInterface
+{
+ # FIXME: It's bad to have a function like this that opens another IDL file to answer a question.
+ # Overusing this kind of function can make things really slow. Lets avoid these if we can.
+ # To mitigate that, lets cache what we learn in a hash so we don't open the same file over and over.
+
+ my ($object, $type) = @_;
+
+ return $isCallbackInterface{$type} if exists $isCallbackInterface{$type};
+ my $result = ComputeIsCallbackInterface($object, $type);
+ $isCallbackInterface{$type} = $result;
+ return $result;
+}
+
</ins><span class="cx"> # Callback interface with [Callback=FunctionOnly].
</span><span class="cx"> # FIXME: This should be a callback function:
</span><span class="cx"> # https://heycam.github.io/webidl/#idl-callback-functions
</span><del>-sub IsFunctionOnlyCallbackInterface
</del><ins>+sub ComputeIsFunctionOnlyCallbackInterface
</ins><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $type = shift;
</span><span class="cx">
</span><span class="cx"> return 0 unless $object->IsCallbackInterface($type);
</span><span class="cx">
</span><del>- my $idlFile = $object->IDLFileForInterface($type)
- or die("Could NOT find IDL file for interface \"$type\"!\n");
</del><ins>+ my $idlFile = $object->IDLFileForInterface($type) or die("Could NOT find IDL file for interface \"$type\"!\n");
</ins><span class="cx">
</span><del>- open FILE, "<", $idlFile;
</del><ins>+ open FILE, "<", $idlFile or die;
</ins><span class="cx"> my @lines = <FILE>;
</span><span class="cx"> close FILE;
</span><span class="cx">
</span><span class="lines">@@ -791,6 +815,22 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+my %isFunctionOnlyCallbackInterface = ();
+
+sub IsFunctionOnlyCallbackInterface
+{
+ # FIXME: It's bad to have a function like this that opens another IDL file to answer a question.
+ # Overusing this kind of function can make things really slow. Lets avoid these if we can.
+ # To mitigate that, lets cache what we learn in a hash so we don't open the same file over and over.
+
+ my ($object, $type) = @_;
+
+ return $isFunctionOnlyCallbackInterface{$type} if exists $isFunctionOnlyCallbackInterface{$type};
+ my $result = ComputeIsFunctionOnlyCallbackInterface($object, $type);
+ $isFunctionOnlyCallbackInterface{$type} = $result;
+ return $result;
+}
+
</ins><span class="cx"> sub GenerateConditionalString
</span><span class="cx"> {
</span><span class="cx"> my $generator = shift;
</span><span class="lines">@@ -933,6 +973,7 @@
</span><span class="cx"> return 0 if $parameter->isNullable;
</span><span class="cx"> return 0 if !$object->IsWrapperType($parameter->type) && !$object->IsTypedArrayType($parameter->type);
</span><span class="cx"> return 0 if $object->IsSVGTypeNeedingTearOff($parameter->type);
</span><ins>+
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -239,18 +239,15 @@
</span><span class="cx">
</span><span class="cx"> return if SkipIncludeHeader($type);
</span><span class="cx">
</span><del>- # When we're finished with the one-file-per-class
- # reorganization, we won't need these special cases.
</del><ins>+ # When we're finished with the one-file-per-class reorganization, we won't need these special cases.
</ins><span class="cx"> if ($type eq "XPathNSResolver") {
</span><span class="cx"> $includesRef->{"JSXPathNSResolver.h"} = 1;
</span><span class="cx"> $includesRef->{"JSCustomXPathNSResolver.h"} = 1;
</span><span class="cx"> } elsif ($isCallback && $codeGenerator->IsWrapperType($type)) {
</span><span class="cx"> $includesRef->{"JS${type}.h"} = 1;
</span><del>- } elsif ($codeGenerator->GetSequenceType($type) or $codeGenerator->GetArrayType($type)) {
</del><ins>+ } elsif ($codeGenerator->GetArrayOrSequenceType($type)) {
</ins><span class="cx"> my $arrayType = $codeGenerator->GetArrayType($type);
</span><del>- my $sequenceType = $codeGenerator->GetSequenceType($type);
- my $arrayOrSequenceType = $arrayType || $sequenceType;
-
</del><ins>+ my $arrayOrSequenceType = $arrayType || $codeGenerator->GetSequenceType($type);
</ins><span class="cx"> if ($arrayType eq "DOMString") {
</span><span class="cx"> $includesRef->{"JSDOMStringList.h"} = 1;
</span><span class="cx"> $includesRef->{"DOMStringList.h"} = 1;
</span><span class="lines">@@ -280,39 +277,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub IsScriptProfileType
-{
- my $type = shift;
- return 1 if ($type eq "ScriptProfileNode");
- return 0;
-}
-
</del><span class="cx"> sub IsReadonly
</span><span class="cx"> {
</span><span class="cx"> my $attribute = shift;
</span><span class="cx"> return $attribute->isReadOnly && !$attribute->signature->extendedAttributes->{"Replaceable"} && !$attribute->signature->extendedAttributes->{"PutForwards"};
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub AddTypedefForScriptProfileType
-{
- my $type = shift;
- (my $jscType = $type) =~ s/Script//;
-
- push(@headerContent, "typedef JSC::$jscType $type;\n\n");
-}
-
</del><span class="cx"> sub AddClassForwardIfNeeded
</span><span class="cx"> {
</span><span class="cx"> my $interfaceName = shift;
</span><span class="cx">
</span><del>- # SVGAnimatedLength/Number/etc. are typedefs to SVGAnimatedTemplate, so don't use class forwards for them!
- unless ($codeGenerator->IsSVGAnimatedType($interfaceName) or IsScriptProfileType($interfaceName) or $codeGenerator->IsTypedArrayType($interfaceName)) {
- push(@headerContent, "class $interfaceName;\n\n");
- # ScriptProfile and ScriptProfileNode are typedefs to JSC::Profile and JSC::ProfileNode.
- } elsif (IsScriptProfileType($interfaceName)) {
</del><ins>+ if ($interfaceName eq "ScriptProfileNode") {
</ins><span class="cx"> $headerIncludes{"<profiler/ProfileNode.h>"} = 1;
</span><del>- AddTypedefForScriptProfileType($interfaceName);
</del><ins>+ push(@headerContent, "typedef JSC::ProfileNode ScriptProfileNode;\n\n");
+ return;
</ins><span class="cx"> }
</span><ins>+
+ # SVGAnimatedLength/Number/etc. are typedefs and should not be forward-declared as classes.
+ return if $codeGenerator->IsSVGAnimatedType($interfaceName);
+
+ return if $codeGenerator->IsTypedArrayType($interfaceName);
+
+ push(@headerContent, "class $interfaceName;\n\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetGenerateIsReachable
</span><span class="lines">@@ -472,7 +458,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface) = @_;
</span><span class="cx">
</span><del>- return 0 if ($interface->extendedAttributes->{"JSBuiltin"});
</del><ins>+ return 0 if $interface->extendedAttributes->{"JSBuiltin"};
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -679,8 +665,7 @@
</span><span class="cx"> # FIXME: The bindings generator does not support putting runtime-enabled operations on the instance yet (except for global objects).
</span><span class="cx"> return 0 if $function->signature->extendedAttributes->{"EnabledAtRuntime"};
</span><span class="cx">
</span><del>- # [Unforgeable] operations should be on the instance.
- # https://heycam.github.io/webidl/#Unforgeable
</del><ins>+ # [Unforgeable] operations should be on the instance. https://heycam.github.io/webidl/#Unforgeable
</ins><span class="cx"> return 1 if IsUnforgeable($interface, $function);
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -781,7 +766,6 @@
</span><span class="cx"> || $hasNamedGetter;
</span><span class="cx">
</span><span class="cx"> return $numInstanceProperties > 0 || $hasComplexGetter;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub PrototypeOverridesGetOwnPropertySlot
</span><span class="lines">@@ -829,12 +813,14 @@
</span><span class="cx"> return $name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetEnumerationClassName {
</del><ins>+sub GetEnumerationClassName
+{
</ins><span class="cx"> my ($name) = @_;
</span><span class="cx"> return $codeGenerator->WK_ucfirst($name);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-sub GetEnumerationValueName {
</del><ins>+sub GetEnumerationValueName
+{
</ins><span class="cx"> my ($name) = @_;
</span><span class="cx"> return "EmptyString" if $name eq "";
</span><span class="cx"> $name = join("", map { $codeGenerator->WK_ucfirst($_) } split("-", $name));
</span><span class="lines">@@ -1577,7 +1563,7 @@
</span><span class="cx"> # http://heycam.github.io/webidl/#es-nullable-type
</span><span class="cx"> $condition .= "${value}.isNull() || " if $parameter->isNullable;
</span><span class="cx">
</span><del>- if ($codeGenerator->GetArrayType($type) || $codeGenerator->GetSequenceType($type)) {
</del><ins>+ if ($codeGenerator->GetArrayOrSequenceType($type)) {
</ins><span class="cx"> # FIXME: Add proper support for T[], T[]?, sequence<T>.
</span><span class="cx"> $condition .= "(${value}.isObject() && isJSArray(${value}))";
</span><span class="cx"> } else {
</span><span class="lines">@@ -1593,20 +1579,19 @@
</span><span class="cx"> return ($res, sort {$a <=> $b} (keys %usedArguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# As per Web IDL specification, the length of a function Object is
-# its number of mandatory parameters.
</del><ins>+# As per Web IDL specification, the length of a function Object is its number of mandatory parameters.
</ins><span class="cx"> sub GetFunctionLength
</span><span class="cx"> {
</span><del>- my $function = shift;
</del><ins>+ my $function = shift;
</ins><span class="cx">
</span><del>- my $numMandatoryParams = 0;
- foreach my $parameter (@{$function->parameters}) {
- # Abort as soon as we find the first optional parameter as no mandatory
- # parameter can follow an optional one.
- last if $parameter->isOptional || $parameter->isVariadic;
- $numMandatoryParams++;
- }
- return $numMandatoryParams;
</del><ins>+ my $length = 0;
+ foreach my $parameter (@{$function->parameters}) {
+ # Abort as soon as we find the first optional parameter as no mandatory
+ # parameter can follow an optional one.
+ last if $parameter->isOptional || $parameter->isVariadic;
+ $length++;
+ }
+ return $length;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateFunctionParametersCheck
</span><span class="lines">@@ -2844,15 +2829,12 @@
</span><span class="cx"> # is thrown rather than silently passing NULL to the C++ code.
</span><span class="cx"> # Per the Web IDL and ECMAScript specifications, incoming values can always be converted to
</span><span class="cx"> # both strings and numbers, so do not throw TypeError if the attribute is of these types.
</span><del>- if ($attribute->signature->extendedAttributes->{"StrictTypeChecking"}) {
</del><ins>+ if ($codeGenerator->IsWrapperType($type) && $attribute->signature->extendedAttributes->{"StrictTypeChecking"}) {
</ins><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><del>-
- if ($codeGenerator->IsWrapperType($type)) {
- push(@implContent, " if (UNLIKELY(!value.isUndefinedOrNull() && !value.inherits(JS${type}::info()))) {\n");
- push(@implContent, " throwAttributeTypeError(*state, \"$interfaceName\", \"$name\", \"$type\");\n");
- push(@implContent, " return false;\n");
- push(@implContent, " };\n");
- }
</del><ins>+ push(@implContent, " if (UNLIKELY(!value.isUndefinedOrNull() && !value.inherits(JS${type}::info()))) {\n");
+ push(@implContent, " throwAttributeTypeError(*state, \"$interfaceName\", \"$name\", \"$type\");\n");
+ push(@implContent, " return false;\n");
+ push(@implContent, " };\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@implContent, " " . GetNativeTypeFromSignature($attribute->signature) . " nativeValue = " . JSValueToNative($attribute->signature, "value", $attribute->signature->extendedAttributes->{"Conditional"}) . ";\n");
</span><span class="lines">@@ -3475,43 +3457,49 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub WillConvertUndefinedToDefaultParameterValue
-{
- my $parameterType = shift;
- my $defaultValue = shift;
</del><ins>+my %automaticallyGeneratedDefaultValues = (
+ "any" => "undefined",
</ins><span class="cx">
</span><del>- if ($defaultValue eq "[]") {
- # Dictionary(state, undefined) will construct an empty Dictionary.
- return 1 if $parameterType eq "Dictionary";
-
- # toRefPtrNativeArray() will convert undefined to an empty Vector.
- return 1 if $codeGenerator->GetArrayType($parameterType) or $codeGenerator->GetSequenceType($parameterType);
- }
-
</del><span class="cx"> # toString() will convert undefined to the string "undefined";
</span><del>- return 1 if $parameterType eq "DOMString" and $defaultValue eq "\"undefined\"";
</del><ins>+ # (note that this optimizes a behavior that is almost never useful)
+ "DOMString" => "\"undefined\"",
</ins><span class="cx">
</span><del>- return 1 if $parameterType eq "any" and $defaultValue eq "undefined";
</del><ins>+ # Dictionary(state, undefined) will construct an empty Dictionary.
+ "Dictionary" => "[]",
</ins><span class="cx">
</span><span class="cx"> # JSValue::toBoolean() will convert undefined to false.
</span><del>- return 1 if $parameterType eq "boolean" and $defaultValue eq "false";
</del><ins>+ "boolean" => "false",
</ins><span class="cx">
</span><span class="cx"> # JSValue::toInt*() / JSValue::toUint*() will convert undefined to 0.
</span><del>- if ($defaultValue eq "0") {
- return 1 if $parameterType eq "byte" or $parameterType eq "octet";
- return 1 if $parameterType eq "short" or $parameterType eq "unsigned short";
- return 1 if $parameterType eq "long" or $parameterType eq "unsigned long";
- return 1 if $parameterType eq "long long" or $parameterType eq "unsigned long long";
- }
</del><ins>+ "byte" => "0",
+ "long long" => "0",
+ "long" => "0",
+ "octet" => "0",
+ "short" => "0",
+ "unsigned long long" => "0",
+ "unsigned long" => "0",
+ "unsigned short" => "0",
</ins><span class="cx">
</span><del>- if ($defaultValue eq "NaN") {
- # toNumber() / toFloat() convert undefined to NaN.
- return 1 if $parameterType eq "double" or $parameterType eq "unrestricted double";
- return 1 if $parameterType eq "float" or $parameterType eq "unrestricted float";
- }
</del><ins>+ # toNumber() / toFloat() convert undefined to NaN.
+ "double" => "NaN",
+ "float" => "NaN",
+ "unrestricted double" => "NaN",
+ "unrestricted float" => "NaN",
+);
</ins><span class="cx">
</span><del>- return 1 if $codeGenerator->IsWrapperType($parameterType) and $defaultValue eq "null";
</del><ins>+sub WillConvertUndefinedToDefaultParameterValue
+{
+ my $parameterType = shift;
+ my $defaultValue = shift;
</ins><span class="cx">
</span><ins>+ my $automaticallyGeneratedDefaultValue = $automaticallyGeneratedDefaultValues{$parameterType};
+ return 1 if defined $automaticallyGeneratedDefaultValue && $automaticallyGeneratedDefaultValue eq $defaultValue;
+
+ # toRefPtrNativeArray() will convert undefined to an empty Vector.
+ return 1 if $defaultValue eq "[]" && $codeGenerator->GetArrayOrSequenceType($parameterType);
+
+ return 1 if $defaultValue eq "null" && $codeGenerator->IsWrapperType($parameterType);
+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4265,26 +4253,25 @@
</span><span class="cx">
</span><span class="cx"> my %nativeType = (
</span><span class="cx"> "DOMString" => "String",
</span><del>- "NodeFilter" => "RefPtr<NodeFilter>",
- "SerializedScriptValue" => "RefPtr<SerializedScriptValue>",
</del><ins>+ "DOMTimeStamp" => "DOMTimeStamp",
</ins><span class="cx"> "Date" => "double",
</span><span class="cx"> "Dictionary" => "Dictionary",
</span><ins>+ "NodeFilter" => "RefPtr<NodeFilter>",
+ "SerializedScriptValue" => "RefPtr<SerializedScriptValue>",
</ins><span class="cx"> "any" => "JSC::JSValue",
</span><span class="cx"> "boolean" => "bool",
</span><ins>+ "byte" => "int8_t",
</ins><span class="cx"> "double" => "double",
</span><span class="cx"> "float" => "float",
</span><ins>+ "long long" => "long long",
+ "long" => "int",
+ "octet" => "uint8_t",
+ "short" => "int16_t",
</ins><span class="cx"> "unrestricted double" => "double",
</span><span class="cx"> "unrestricted float" => "float",
</span><del>- "short" => "int16_t",
- "long" => "int",
</del><ins>+ "unsigned long long" => "unsigned long long",
</ins><span class="cx"> "unsigned long" => "unsigned",
</span><span class="cx"> "unsigned short" => "uint16_t",
</span><del>- "long long" => "long long",
- "unsigned long long" => "unsigned long long",
- "byte" => "int8_t",
- "octet" => "uint8_t",
- "DOMTimeStamp" => "DOMTimeStamp",
- "Symbol" => "PrivateName"
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> sub GetNativeType
</span><span class="lines">@@ -4299,9 +4286,7 @@
</span><span class="cx"> return "RefPtr<${type}>" if $codeGenerator->IsTypedArrayType($type) and not $type eq "ArrayBuffer";
</span><span class="cx"> return $nativeType{$type} if exists $nativeType{$type};
</span><span class="cx">
</span><del>- my $arrayType = $codeGenerator->GetArrayType($type);
- my $sequenceType = $codeGenerator->GetSequenceType($type);
- my $arrayOrSequenceType = $arrayType || $sequenceType;
</del><ins>+ my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($type);
</ins><span class="cx">
</span><span class="cx"> return "Vector<" . GetNativeVectorInnerType($arrayOrSequenceType) . ">" if $arrayOrSequenceType;
</span><span class="cx"> return "String" if $codeGenerator->IsStringBasedEnumType($type);
</span><span class="lines">@@ -4391,6 +4376,17 @@
</span><span class="cx"> return exists $nativeType{$type};
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+my %integerConversionFunction = (
+ "byte" => "toInt8",
+ "long long" => "toInt64",
+ "long" => "toInt32",
+ "octet" => "toUInt8",
+ "short" => "toInt16",
+ "unsigned long long" => "toUInt64",
+ "unsigned long" => "toUInt32",
+ "unsigned short" => "toUInt16",
+);
+
</ins><span class="cx"> sub JSValueToNative
</span><span class="cx"> {
</span><span class="cx"> my $signature = shift;
</span><span class="lines">@@ -4399,24 +4395,14 @@
</span><span class="cx">
</span><span class="cx"> my $type = $signature->type;
</span><span class="cx">
</span><del>- return "$value.toBoolean(state)" if $type eq "boolean";
- return "$value.toNumber(state)" if $type eq "double" or $type eq "unrestricted double" ;
- return "$value.toFloat(state)" if $type eq "float" or $type eq "unrestricted float" ;
</del><ins>+ my $function = $integerConversionFunction{$type};
+ if ($function) {
+ my $conversionType = "NormalConversion";
+ $conversionType = "EnforceRange" if $signature->extendedAttributes->{"EnforceRange"};
+ $conversionType = "Clamp" if $signature->extendedAttributes->{"Clamp"};
+ return "$function(state, $value, $conversionType)";
+ }
</ins><span class="cx">
</span><del>- my $intConversion = "NormalConversion";
- $intConversion = "EnforceRange" if $signature->extendedAttributes->{"EnforceRange"};
- $intConversion = "Clamp" if $signature->extendedAttributes->{"Clamp"};
- return "toInt8(state, $value, $intConversion)" if $type eq "byte";
- return "toUInt8(state, $value, $intConversion)" if $type eq "octet";
- return "toInt16(state, $value, $intConversion)" if $type eq "short";
- return "toUInt16(state, $value, $intConversion)" if $type eq "unsigned short";
- return "toInt32(state, $value, $intConversion)" if $type eq "long";
- return "toUInt32(state, $value, $intConversion)" if $type eq "unsigned long";
- return "toInt64(state, $value, $intConversion)" if $type eq "long long";
- return "toUInt64(state, $value, $intConversion)" if $type eq "unsigned long long";
-
- return "valueToDate(state, $value)" if $type eq "Date";
-
</del><span class="cx"> if ($type eq "DOMString") {
</span><span class="cx"> if ($signature->extendedAttributes->{"TreatNullAs"}) {
</span><span class="cx"> return "valueToStringTreatingNullAsEmptyString(state, $value)" if $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString";
</span><span class="lines">@@ -4424,19 +4410,9 @@
</span><span class="cx"> }
</span><span class="cx"> return "valueToStringWithUndefinedOrNullCheck(state, $value)" if $signature->isNullable;
</span><span class="cx"> return "$value.toString(state)->toAtomicString(state)" if $signature->extendedAttributes->{"AtomicString"};
</span><del>-
</del><span class="cx"> return "$value.toWTFString(state)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "any") {
- return $value;
- }
-
- if ($type eq "NodeFilter") {
- AddToImplIncludes("JS$type.h", $conditional);
- return "JS${type}::toWrapped(state->vm(), $value)";
- }
-
</del><span class="cx"> if ($type eq "SerializedScriptValue") {
</span><span class="cx"> AddToImplIncludes("SerializedScriptValue.h", $conditional);
</span><span class="cx"> return "SerializedScriptValue::create(state, $value, 0, 0)";
</span><span class="lines">@@ -4447,22 +4423,7 @@
</span><span class="cx"> return "{ state, $value }";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "DOMStringList" ) {
- AddToImplIncludes("JSDOMStringList.h", $conditional);
- return "toDOMStringList(state, $value)";
- }
-
- if ($codeGenerator->IsTypedArrayType($type)) {
- return "to$type($value)";
- }
-
- AddToImplIncludes("HTMLOptionElement.h", $conditional) if $type eq "HTMLOptionElement";
- AddToImplIncludes("Event.h", $conditional) if $type eq "Event";
-
- my $arrayType = $codeGenerator->GetArrayType($type);
- my $sequenceType = $codeGenerator->GetSequenceType($type);
- my $arrayOrSequenceType = $arrayType || $sequenceType;
-
</del><ins>+ my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($type);
</ins><span class="cx"> if ($arrayOrSequenceType) {
</span><span class="cx"> if ($codeGenerator->IsRefPtrType($arrayOrSequenceType)) {
</span><span class="cx"> AddToImplIncludes("JS${arrayOrSequenceType}.h");
</span><span class="lines">@@ -4471,15 +4432,22 @@
</span><span class="cx"> return "toNativeArray<" . GetNativeVectorInnerType($arrayOrSequenceType) . ">(state, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return "$value.toWTFString(state)" if $codeGenerator->IsStringBasedEnumType($type);
</del><ins>+ return $value if $type eq "any";
</ins><span class="cx">
</span><del>- if ($codeGenerator->IsEnumType($type)) {
- my $className = GetEnumerationClassName($type);
- return "parse$className(*state, $value)";
- }
</del><ins>+ return "$value.toBoolean(state)" if $type eq "boolean";
+ return "$value.toNumber(state)" if $type eq "double" or $type eq "unrestricted double";
+ return "$value.toFloat(state)" if $type eq "float" or $type eq "unrestricted float";
+ return "valueToDate(state, $value)" if $type eq "Date";
</ins><span class="cx">
</span><del>- # Default, assume autogenerated type conversion routines
</del><ins>+ return "to$type($value)" if $codeGenerator->IsTypedArrayType($type);
+ return "$value.toWTFString(state)" if $codeGenerator->IsStringBasedEnumType($type);
+ return "parse" . GetEnumerationClassName($type) . "(*state, $value)" if $codeGenerator->IsEnumType($type);
+
</ins><span class="cx"> AddToImplIncludes("JS$type.h", $conditional);
</span><ins>+
+ return "toDOMStringList(state, $value)" if $type eq "DOMStringList";
+ return "JSNodeFilter::toWrapped(state->vm(), $value)" if $type eq "NodeFilter";
+
</ins><span class="cx"> return "JS${type}::toWrapped($value)";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4494,32 +4462,24 @@
</span><span class="cx"> my $conditional = $signature->extendedAttributes->{"Conditional"};
</span><span class="cx"> my $type = $signature->type;
</span><span class="cx">
</span><ins>+ my $globalObject = $thisValue ? "$thisValue->globalObject()" : "jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())";
+
</ins><span class="cx"> return "jsBoolean($value)" if $type eq "boolean";
</span><span class="cx">
</span><del>- # Need to check Date type before IsPrimitiveType().
</del><span class="cx"> if ($type eq "Date") {
</span><del>- my $conv = $signature->extendedAttributes->{"TreatReturnedNaNDateAs"};
- if (defined $conv) {
- return "jsDateOrNull(state, $value)" if $conv eq "Null";
- return "jsDateOrNaN(state, $value)" if $conv eq "NaN";
-
- die "Unknown value for TreatReturnedNaNDateAs extended attribute";
- }
- return "jsDateOrNull(state, $value)";
</del><ins>+ my $handlingForNaN = $signature->extendedAttributes->{"TreatReturnedNaNDateAs"};
+ return "jsDateOrNull(state, $value)" if !defined $handlingForNaN || $handlingForNaN eq "Null";
+ return "jsDateOrNaN(state, $value)" if $handlingForNaN eq "NaN";
+ die "Unknown value for TreatReturnedNaNDateAs extended attribute";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "Symbol") {
- AddToImplIncludes("<runtime/Symbol.h>", $conditional);
- return "Symbol::create(state->vm(), *($value).uid())";
- }
-
- if ($codeGenerator->IsPrimitiveType($type) or $type eq "DOMTimeStamp") {
</del><ins>+ if ($codeGenerator->IsNumericType($type) or $type eq "DOMTimeStamp") {
</ins><span class="cx"> # We could instead overload a function to work with optional as well as non-optional numbers, but this
</span><span class="cx"> # is slightly better because it guarantees we will fail to compile if the IDL file doesn't match the C++.
</span><span class="cx"> my $function = $signature->isNullable ? "toNullableJSNumber" : "jsNumber";
</span><span class="cx"> if ($signature->extendedAttributes->{"Reflect"} and ($type eq "unsigned long" or $type eq "unsigned short")) {
</span><span class="cx"> $value =~ s/getUnsignedIntegralAttribute/getIntegralAttribute/g;
</span><del>- return "$function(std::max(0, " . $value . "))";
</del><ins>+ $value = "std::max(0, $value)";
</ins><span class="cx"> }
</span><span class="cx"> return "$function($value)";
</span><span class="cx"> }
</span><span class="lines">@@ -4536,34 +4496,16 @@
</span><span class="cx"> return "jsStringWithCache(state, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $globalObject;
- if ($thisValue) {
- $globalObject = "$thisValue->globalObject()";
- }
-
- if ($type eq "CSSStyleDeclaration") {
- AddToImplIncludes("StyleProperties.h", $conditional);
- }
-
- if ($type eq "NodeList") {
- AddToImplIncludes("NameNodeList.h", $conditional);
- }
-
</del><span class="cx"> my $arrayType = $codeGenerator->GetArrayType($type);
</span><del>- my $sequenceType = $codeGenerator->GetSequenceType($type);
- my $arrayOrSequenceType = $arrayType || $sequenceType;
</del><ins>+ my $arrayOrSequenceType = $arrayType || $codeGenerator->GetSequenceType($type);
</ins><span class="cx">
</span><span class="cx"> if ($arrayOrSequenceType) {
</span><span class="cx"> if ($arrayType eq "DOMString") {
</span><span class="cx"> AddToImplIncludes("JSDOMStringList.h", $conditional);
</span><del>- AddToImplIncludes("DOMStringList.h", $conditional);
-
</del><span class="cx"> } elsif ($codeGenerator->IsRefPtrType($arrayOrSequenceType)) {
</span><span class="cx"> AddToImplIncludes("JS${arrayOrSequenceType}.h", $conditional);
</span><del>- AddToImplIncludes("${arrayOrSequenceType}.h", $conditional);
</del><span class="cx"> }
</span><span class="cx"> AddToImplIncludes("<runtime/JSArray.h>", $conditional);
</span><del>-
</del><span class="cx"> return "jsArray(state, $globalObject, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4572,35 +4514,30 @@
</span><span class="cx"> if (defined $returnType and ($returnType eq "IDBKeyPath" or $returnType eq "IDBKey")) {
</span><span class="cx"> AddToImplIncludes("IDBBindingUtilities.h", $conditional);
</span><span class="cx"> return "toJS(*state, *$globalObject, $value)";
</span><del>- } else {
- return $value;
</del><span class="cx"> }
</span><del>- } elsif ($type eq "SerializedScriptValue") {
</del><ins>+ return $value;
+ }
+
+ if ($type eq "SerializedScriptValue") {
</ins><span class="cx"> AddToImplIncludes("SerializedScriptValue.h", $conditional);
</span><span class="cx"> return "$value ? $value->deserialize(state, castedThis->globalObject(), 0) : jsNull()";
</span><del>- } elsif ($codeGenerator->IsTypedArrayType($type)) {
- # Do nothing - all headers are already included.
- } else {
- # Default, include header with same name.
- AddToImplIncludes("JS$type.h", $conditional);
- AddToImplIncludes("$type.h", $conditional) if not $codeGenerator->SkipIncludeHeader($type);
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ AddToImplIncludes("StyleProperties.h", $conditional) if $type eq "CSSStyleDeclaration";
+ AddToImplIncludes("NameNodeList.h", $conditional) if $type eq "NodeList";
+ AddToImplIncludes("JS$type.h", $conditional) if !$codeGenerator->IsTypedArrayType($type);
+
</ins><span class="cx"> return $value if $codeGenerator->IsSVGAnimatedType($type);
</span><span class="cx">
</span><del>- if ($signature->extendedAttributes->{"NewObject"}) {
- return "toJSNewlyCreated(state, $globalObject, WTF::getPtr($value))";
- }
-
</del><span class="cx"> if ($codeGenerator->IsSVGAnimatedType($interfaceName) or ($interfaceName eq "SVGViewSpec" and $type eq "SVGTransformList")) {
</span><span class="cx"> # Convert from abstract RefPtr<ListProperty> to real type, so the right toJS() method can be invoked.
</span><del>- $value = "static_cast<" . GetNativeType($type) . ">($value" . ".get())";
</del><ins>+ $value = "static_cast<" . GetNativeType($type) . ">($value.get())";
</ins><span class="cx"> } elsif ($interfaceName eq "SVGViewSpec") {
</span><span class="cx"> # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
</span><span class="cx"> $value = "static_cast<" . GetNativeType($type) . ">($value)";
</span><span class="cx"> } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($type) and not $interfaceName =~ /List$/) {
</span><span class="cx"> my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
</span><del>- if ($codeGenerator->IsSVGTypeWithWritablePropertiesNeedingTearOff($type) and $inFunctionCall eq 0 and not defined $signature->extendedAttributes->{"Immutable"}) {
</del><ins>+ if ($codeGenerator->IsSVGTypeWithWritablePropertiesNeedingTearOff($type) and !$inFunctionCall and not defined $signature->extendedAttributes->{"Immutable"}) {
</ins><span class="cx"> my $getter = $value;
</span><span class="cx"> $getter =~ s/impl\.//;
</span><span class="cx"> $getter =~ s/impl->//;
</span><span class="lines">@@ -4609,8 +4546,8 @@
</span><span class="cx">
</span><span class="cx"> my $selfIsTearOffType = $codeGenerator->IsSVGTypeNeedingTearOff($interfaceName);
</span><span class="cx"> if ($selfIsTearOffType) {
</span><ins>+ # FIXME: Why SVGMatrix specifically?
</ins><span class="cx"> AddToImplIncludes("SVGMatrixTearOff.h", $conditional);
</span><del>- # FIXME: Blink: Don't create a new one everytime we access the matrix property. This means, e.g, === won't work.
</del><span class="cx"> $value = "SVGMatrixTearOff::create(castedThis->wrapped(), $value)";
</span><span class="cx"> } else {
</span><span class="cx"> AddToImplIncludes("SVGStaticPropertyTearOff.h", $conditional);
</span><span class="lines">@@ -4623,11 +4560,10 @@
</span><span class="cx"> $value = "${tearOffType}::create($value)";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if ($globalObject) {
- return "toJS(state, $globalObject, WTF::getPtr($value))";
- } else {
- return "toJS(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), WTF::getPtr($value))";
- }
</del><ins>+
+ my $function = $signature->extendedAttributes->{"NewObject"} ? "toJSNewlyCreated" : "toJS";
+
+ return "$function(state, $globalObject, WTF::getPtr($value))";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub ceilingToPowerOf2
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,13 +24,11 @@
</span><span class="cx">
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx">
</span><del>-#include "DOMStringList.h"
</del><span class="cx"> #include "JSDOMConstructor.h"
</span><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSTestNode.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><del>-#include "TestNode.h"
</del><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,12 +24,10 @@
</span><span class="cx">
</span><span class="cx"> #include "JSTestCallbackFunction.h"
</span><span class="cx">
</span><del>-#include "DOMStringList.h"
</del><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSTestNode.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><del>-#include "TestNode.h"
</del><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <runtime/JSString.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12) || ENABLE(Condition22) || ENABLE(Condition23)
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSTestObj.h"
</span><del>-#include "Node.h"
</del><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/JSString.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "TestNode.h"
</del><span class="cx"> #include "TestObj.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "WebCoreJSClientData.h"
</span><span class="lines">@@ -66,7 +65,6 @@
</span><span class="cx"> #include <runtime/JSArray.h>
</span><span class="cx"> #include <runtime/JSString.h>
</span><span class="cx"> #include <runtime/PropertyNameArray.h>
</span><del>-#include <runtime/Symbol.h>
</del><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1)
</span><span class="lines">@@ -441,8 +439,6 @@
</span><span class="cx"> bool setJSTestObjXMLObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjCreate(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestObjCreate(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><del>-JSC::EncodedJSValue jsTestObjReadOnlySymbolAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
-JSC::EncodedJSValue jsTestObjConstructorStaticReadOnlySymbolAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</del><span class="cx"> JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="lines">@@ -665,7 +661,6 @@
</span><span class="cx"> { "staticReadOnlyLongAttr", DontDelete | ReadOnly, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConstructorStaticReadOnlyLongAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</span><span class="cx"> { "staticStringAttr", DontDelete, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConstructorStaticStringAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjConstructorStaticStringAttr) } },
</span><span class="cx"> { "TestSubObj", DontDelete | ReadOnly, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConstructorTestSubObj), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</span><del>- { "staticReadOnlySymbolAttr", DontDelete | ReadOnly, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConstructorStaticReadOnlySymbolAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</del><span class="cx"> { "nullableStringStaticMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjConstructorFunctionNullableStringStaticMethod), (intptr_t) (0) } },
</span><span class="cx"> { "staticMethodWithCallbackAndOptionalArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjConstructorFunctionStaticMethodWithCallbackAndOptionalArg), (intptr_t) (0) } },
</span><span class="cx"> { "staticMethodWithCallbackArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjConstructorFunctionStaticMethodWithCallbackArg), (intptr_t) (1) } },
</span><span class="lines">@@ -752,7 +747,6 @@
</span><span class="cx"> { "stringAttrTreatingNullAsEmptyString", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrTreatingNullAsEmptyString), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStringAttrTreatingNullAsEmptyString) } },
</span><span class="cx"> { "XMLObjAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjXMLObjAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjXMLObjAttr) } },
</span><span class="cx"> { "create", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjCreate), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjCreate) } },
</span><del>- { "readOnlySymbolAttr", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReadOnlySymbolAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</del><span class="cx"> { "reflectedStringAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedStringAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjReflectedStringAttr) } },
</span><span class="cx"> { "reflectedIntegralAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedIntegralAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjReflectedIntegralAttr) } },
</span><span class="cx"> { "reflectedUnsignedIntegralAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedUnsignedIntegralAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjReflectedUnsignedIntegralAttr) } },
</span><span class="lines">@@ -1410,30 +1404,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-EncodedJSValue jsTestObjReadOnlySymbolAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
-{
- UNUSED_PARAM(state);
- UNUSED_PARAM(thisValue);
- JSValue decodedThisValue = JSValue::decode(thisValue);
- auto* castedThis = jsDynamicCast<JSTestObj*>(decodedThisValue);
- if (UNLIKELY(!castedThis)) {
- return throwGetterTypeError(*state, "TestObj", "readOnlySymbolAttr");
- }
- auto& impl = castedThis->wrapped();
- JSValue result = Symbol::create(state->vm(), *(impl.readOnlySymbolAttr()).uid());
- return JSValue::encode(result);
-}
-
-
-EncodedJSValue jsTestObjConstructorStaticReadOnlySymbolAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
-{
- UNUSED_PARAM(state);
- UNUSED_PARAM(thisValue);
- JSValue result = Symbol::create(state->vm(), *(TestObj::staticReadOnlySymbolAttr()).uid());
- return JSValue::encode(result);
-}
-
-
</del><span class="cx"> EncodedJSValue jsTestObjReflectedStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSDOMConstructor.h"
</span><span class="cx"> #include "JSMessagePort.h"
</span><del>-#include "MessagePort.h"
</del><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><span class="cx"> #include <runtime/JSArray.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -71,10 +71,6 @@
</span><span class="cx"> attribute TestObj XMLObjAttr;
</span><span class="cx"> attribute boolean create;
</span><span class="cx">
</span><del>- // Readonly Symbol typed attributes.
- readonly attribute Symbol readOnlySymbolAttr;
- static readonly attribute Symbol staticReadOnlySymbolAttr;
-
</del><span class="cx"> // Reflected DOM attributes
</span><span class="cx"> [Reflect] attribute DOMString reflectedStringAttr;
</span><span class="cx"> [Reflect] attribute long reflectedIntegralAttr;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTBlendMinMaxidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ Conditional=WEBGL,
+ GenerateIsReachable=ImplWebGLRenderingContext,
</ins><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=WEBGL,
- GenerateIsReachable=ImplWebGLRenderingContext
</del><span class="cx"> ] interface EXTBlendMinMax {
</span><del>- const unsigned int MIN_EXT = 0x8007;
- const unsigned int MAX_EXT = 0x8008;
</del><ins>+ const unsigned long MIN_EXT = 0x8007;
+ const unsigned long MAX_EXT = 0x8008;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTTextureFilterAnisotropicidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,11 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface EXTTextureFilterAnisotropic {
</span><del>- const unsigned int TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
- const unsigned int MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
</del><ins>+ const unsigned long TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
+ const unsigned long MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTsRGBidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTsRGB.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTsRGB.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/EXTsRGB.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ Conditional=WEBGL,
+ GenerateIsReachable=ImplWebGLRenderingContext,
</ins><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=WEBGL,
- GenerateIsReachable=ImplWebGLRenderingContext
</del><span class="cx"> ] interface EXTsRGB {
</span><del>- const unsigned int SRGB_EXT = 0x8C40;
- const unsigned int SRGB_ALPHA_EXT = 0x8C42;
- const unsigned int SRGB8_ALPHA8_EXT = 0x8C43;
- const unsigned int FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT = 0x8210;
</del><ins>+ const unsigned long SRGB_EXT = 0x8C40;
+ const unsigned long SRGB_ALPHA_EXT = 0x8C42;
+ const unsigned long SRGB8_ALPHA8_EXT = 0x8C43;
+ const unsigned long FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT = 0x8210;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESStandardDerivativesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESStandardDerivatives.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESStandardDerivatives.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/OESStandardDerivatives.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><ins>+ DoNotCheckConstants,
</ins><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface OESStandardDerivatives {
</span><del>- const unsigned int FRAGMENT_SHADER_DERIVATIVE_HINT_OES = 0x8B8B;
</del><ins>+ const unsigned long FRAGMENT_SHADER_DERIVATIVE_HINT_OES = 0x8B8B;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESVertexArrayObjectidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESVertexArrayObject.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESVertexArrayObject.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/OESVertexArrayObject.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface OESVertexArrayObject {
</span><del>- const unsigned int VERTEX_ARRAY_BINDING_OES = 0x85B5;
-
</del><ins>+ const unsigned long VERTEX_ARRAY_BINDING_OES = 0x85B5;
+
</ins><span class="cx"> [StrictTypeChecking] WebGLVertexArrayObjectOES createVertexArrayOES();
</span><span class="cx"> [StrictTypeChecking] void deleteVertexArrayOES(optional WebGLVertexArrayObjectOES? arrayObject = null);
</span><span class="cx"> [StrictTypeChecking] boolean isVertexArrayOES(optional WebGLVertexArrayObjectOES? arrayObject = null);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTextureATCidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,13 +24,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><ins>+ DoNotCheckConstants,
</ins><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface WebGLCompressedTextureATC {
</span><del>- /* Compressed Texture Formats */
- const unsigned int COMPRESSED_RGB_ATC_WEBGL = 0x8C92;
- const unsigned int COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL = 0x8C93;
- const unsigned int COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL = 0x87EE;
</del><ins>+ const unsigned long COMPRESSED_RGB_ATC_WEBGL = 0x8C92;
+ const unsigned long COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL = 0x8C93;
+ const unsigned long COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL = 0x87EE;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTexturePVRTCidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,14 +24,13 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><ins>+ DoNotCheckConstants,
</ins><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface WebGLCompressedTexturePVRTC {
</span><del>- /* Compressed Texture Formats */
- const unsigned int COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 0x8C00;
- const unsigned int COMPRESSED_RGB_PVRTC_2BPPV1_IMG = 0x8C01;
- const unsigned int COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 0x8C02;
- const unsigned int COMPRESSED_RGBA_PVRTC_2BPPV1_IMG = 0x8C03;
</del><ins>+ const unsigned long COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 0x8C00;
+ const unsigned long COMPRESSED_RGB_PVRTC_2BPPV1_IMG = 0x8C01;
+ const unsigned long COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 0x8C02;
+ const unsigned long COMPRESSED_RGBA_PVRTC_2BPPV1_IMG = 0x8C03;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTextureS3TCidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,14 +24,13 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><ins>+ DoNotCheckConstants,
</ins><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface WebGLCompressedTextureS3TC {
</span><del>- /* Compressed Texture Formats */
- const unsigned int COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
- const unsigned int COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
- const unsigned int COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2;
- const unsigned int COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
</del><ins>+ const unsigned long COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
+ const unsigned long COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
+ const unsigned long COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2;
+ const unsigned long COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDebugRendererInfoidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><ins>+ DoNotCheckConstants,
</ins><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface WebGLDebugRendererInfo {
</span><del>- const unsigned int UNMASKED_VENDOR_WEBGL = 0x9245;
- const unsigned int UNMASKED_RENDERER_WEBGL = 0x9246;
</del><ins>+ const unsigned long UNMASKED_VENDOR_WEBGL = 0x9245;
+ const unsigned long UNMASKED_RENDERER_WEBGL = 0x9246;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDepthTextureidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDepthTexture.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDepthTexture.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Source/WebCore/html/canvas/WebGLDepthTexture.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- NoInterfaceObject,
</del><span class="cx"> Conditional=WEBGL,
</span><ins>+ DoNotCheckConstants,
</ins><span class="cx"> GenerateIsReachable=ImplWebGLRenderingContext,
</span><del>- DoNotCheckConstants
</del><ins>+ NoInterfaceObject,
</ins><span class="cx"> ] interface WebGLDepthTexture {
</span><del>- const unsigned int UNSIGNED_INT_24_8_WEBGL = 0x84FA;
</del><ins>+ const unsigned long UNSIGNED_INT_24_8_WEBGL = 0x84FA;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Tools/ChangeLog 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-04-30 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Streamline and remove unused bindings generation code
+ https://bugs.webkit.org/show_bug.cgi?id=157237
+
+ Reviewed by Chris Dumez.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ Replace non-standard "int" with standard "long", which means the same thing.
+
+2016-04-30 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Next batch of conversions to use C++ enum class instead of strings for enumerations
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157232
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityControlleridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> readonly attribute DOMString platformName;
</span><span class="cx"> readonly attribute AccessibilityUIElement rootElement;
</span><span class="cx"> readonly attribute AccessibilityUIElement focusedElement;
</span><del>- AccessibilityUIElement elementAtPoint(int x, int y);
</del><ins>+ AccessibilityUIElement elementAtPoint(long x, long y);
</ins><span class="cx"> AccessibilityUIElement accessibleElementById(DOMString id);
</span><span class="cx">
</span><span class="cx"> boolean addNotificationListener(object functionCallback);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> readonly attribute DOMString documentURI;
</span><span class="cx">
</span><span class="cx"> // Element access.
</span><del>- AccessibilityUIElement elementAtPoint(int x, int y);
</del><ins>+ AccessibilityUIElement elementAtPoint(long x, long y);
</ins><span class="cx"> AccessibilityUIElement childAtIndex(unsigned long index);
</span><span class="cx"> unsigned long indexOfChild(AccessibilityUIElement child);
</span><span class="cx"> AccessibilityUIElement linkedUIElementAtIndex(unsigned long index);
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> readonly attribute DOMString url;
</span><span class="cx"> readonly attribute DOMString speak;
</span><span class="cx"> readonly attribute DOMString orientation;
</span><del>- readonly attribute int insertionPointLineNumber;
</del><ins>+ readonly attribute long insertionPointLineNumber;
</ins><span class="cx"> readonly attribute DOMString selectedTextRange;
</span><span class="cx">
</span><span class="cx"> DOMString stringAttributeValue(DOMString attr);
</span><span class="lines">@@ -70,9 +70,9 @@
</span><span class="cx"> boolean isDecrementActionSupported();
</span><span class="cx">
</span><span class="cx"> readonly attribute DOMString stringValue;
</span><del>- readonly attribute int intValue;
- readonly attribute int minValue;
- readonly attribute int maxValue;
</del><ins>+ readonly attribute long intValue;
+ readonly attribute long minValue;
+ readonly attribute long maxValue;
</ins><span class="cx">
</span><span class="cx"> readonly attribute boolean isEnabled;
</span><span class="cx"> readonly attribute boolean isRequired;
</span><span class="lines">@@ -91,22 +91,22 @@
</span><span class="cx"> readonly attribute boolean isIgnored;
</span><span class="cx"> readonly attribute boolean isOffScreen;
</span><span class="cx"> readonly attribute boolean isValid;
</span><del>- readonly attribute int hierarchicalLevel;
</del><ins>+ readonly attribute long hierarchicalLevel;
</ins><span class="cx"> readonly attribute boolean ariaIsGrabbed;
</span><span class="cx"> readonly attribute DOMString ariaDropEffects;
</span><span class="cx"> readonly attribute DOMString classList;
</span><span class="cx">
</span><del>- readonly attribute int x;
- readonly attribute int y;
- readonly attribute int width;
- readonly attribute int height;
- readonly attribute int clickPointX;
- readonly attribute int clickPointY;
</del><ins>+ readonly attribute long x;
+ readonly attribute long y;
+ readonly attribute long width;
+ readonly attribute long height;
+ readonly attribute long clickPointX;
+ readonly attribute long clickPointY;
</ins><span class="cx">
</span><del>- readonly attribute int childrenCount;
- readonly attribute int selectedChildrenCount;
- readonly attribute int rowCount;
- readonly attribute int columnCount;
</del><ins>+ readonly attribute long childrenCount;
+ readonly attribute long selectedChildrenCount;
+ readonly attribute long rowCount;
+ readonly attribute long columnCount;
</ins><span class="cx">
</span><span class="cx"> // Actions.
</span><span class="cx"> void increment();
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx"> DOMString attributesOfDocumentLinks();
</span><span class="cx">
</span><span class="cx"> // Text info.
</span><del>- DOMString characterAtOffset(int offset);
- DOMString wordAtOffset(int offset);
- DOMString lineAtOffset(int offset);
- DOMString sentenceAtOffset(int offset);
</del><ins>+ DOMString characterAtOffset(long offset);
+ DOMString wordAtOffset(long offset);
+ DOMString lineAtOffset(long offset);
+ DOMString sentenceAtOffset(long offset);
</ins><span class="cx">
</span><span class="cx"> // Table info.
</span><span class="cx"> DOMString attributesOfColumnHeaders();
</span><span class="lines">@@ -138,11 +138,11 @@
</span><span class="cx"> AccessibilityUIElement disclosedByRow();
</span><span class="cx"> AccessibilityUIElement disclosedRowAtIndex(unsigned long index);
</span><span class="cx"> AccessibilityUIElement rowAtIndex(unsigned long index);
</span><del>- int indexInTable();
</del><ins>+ long indexInTable();
</ins><span class="cx"> DOMString rowIndexRange();
</span><span class="cx"> DOMString columnIndexRange();
</span><del>- int rowCount();
- int columnCount();
</del><ins>+ long rowCount();
+ long columnCount();
</ins><span class="cx"> object columnHeaders();
</span><span class="cx"> object rowHeaders();
</span><span class="cx">
</span><span class="lines">@@ -152,14 +152,14 @@
</span><span class="cx">
</span><span class="cx"> // Paramaterized attributes.
</span><span class="cx"> DOMString parameterizedAttributeNames();
</span><del>- int lineForIndex(int index);
- DOMString rangeForLine(int index);
- DOMString rangeForPosition(int x, int y);
</del><ins>+ long lineForIndex(long index);
+ DOMString rangeForLine(long index);
+ DOMString rangeForPosition(long x, long y);
</ins><span class="cx"> DOMString boundsForRange(unsigned long location, unsigned long length);
</span><span class="cx"> DOMString stringForRange(unsigned long location, unsigned long length);
</span><span class="cx"> DOMString attributedStringForRange(unsigned long location, unsigned long length);
</span><span class="cx"> boolean attributedStringRangeIsMisspelled(unsigned long location, unsigned long length);
</span><del>- [PassContext] unsigned int uiElementCountForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
</del><ins>+ [PassContext] unsigned long uiElementCountForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
</ins><span class="cx"> [PassContext] AccessibilityUIElement uiElementForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
</span><span class="cx"> [PassContext] DOMString selectTextWithCriteria(DOMString ambiguityResolution, object searchStrings, DOMString replacementString, DOMString activity);
</span><span class="cx"> boolean setSelectedTextRange(unsigned long location, unsigned long length);
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> readonly attribute AccessibilityUIElement verticalScrollbar;
</span><span class="cx">
</span><span class="cx"> void scrollToMakeVisible();
</span><del>- void scrollToGlobalPoint(int x, int y);
- void scrollToMakeVisibleWithSubFocus(int x, int y, int width, int height);
</del><ins>+ void scrollToGlobalPoint(long x, long y);
+ void scrollToMakeVisibleWithSubFocus(long x, long y, long width, long height);
</ins><span class="cx">
</span><span class="cx"> void takeFocus();
</span><span class="cx"> boolean scrollPageDown();
</span><span class="lines">@@ -186,18 +186,18 @@
</span><span class="cx"> void resetSelectedTextMarkerRange();
</span><span class="cx"> AccessibilityTextMarker startTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange range);
</span><span class="cx"> AccessibilityTextMarker endTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange range);
</span><del>- AccessibilityTextMarker endTextMarkerForBounds(int x, int y, int width, int height);
- AccessibilityTextMarker startTextMarkerForBounds(int x, int y, int width, int height);
- AccessibilityTextMarker textMarkerForPoint(int x, int y);
</del><ins>+ AccessibilityTextMarker endTextMarkerForBounds(long x, long y, long width, long height);
+ AccessibilityTextMarker startTextMarkerForBounds(long x, long y, long width, long height);
+ AccessibilityTextMarker textMarkerForPoint(long x, long y);
</ins><span class="cx"> AccessibilityTextMarker previousTextMarker(AccessibilityTextMarker marker);
</span><span class="cx"> AccessibilityTextMarker nextTextMarker(AccessibilityTextMarker marker);
</span><span class="cx"> AccessibilityUIElement accessibilityElementForTextMarker(AccessibilityTextMarker marker);
</span><span class="cx"> DOMString stringForTextMarkerRange(AccessibilityTextMarkerRange range);
</span><del>- int textMarkerRangeLength(AccessibilityTextMarkerRange range);
</del><ins>+ long textMarkerRangeLength(AccessibilityTextMarkerRange range);
</ins><span class="cx"> boolean attributedStringForTextMarkerRangeContainsAttribute(DOMString attr, AccessibilityTextMarkerRange range);
</span><del>- int indexForTextMarker(AccessibilityTextMarker marker);
</del><ins>+ long indexForTextMarker(AccessibilityTextMarker marker);
</ins><span class="cx"> boolean isTextMarkerValid(AccessibilityTextMarker marker);
</span><del>- AccessibilityTextMarker textMarkerForIndex(int textIndex);
</del><ins>+ AccessibilityTextMarker textMarkerForIndex(long textIndex);
</ins><span class="cx"> readonly attribute AccessibilityTextMarker startTextMarker;
</span><span class="cx"> readonly attribute AccessibilityTextMarker endTextMarker;
</span><span class="cx"> boolean setSelectedVisibleTextRange(AccessibilityTextMarkerRange range);
</span><span class="lines">@@ -222,8 +222,8 @@
</span><span class="cx"> // iOS specific accessibility methods.
</span><span class="cx"> readonly attribute DOMString identifier;
</span><span class="cx"> readonly attribute DOMString traits;
</span><del>- readonly attribute int elementTextPosition;
- readonly attribute int elementTextLength;
</del><ins>+ readonly attribute long elementTextPosition;
+ readonly attribute long elementTextLength;
</ins><span class="cx"> readonly attribute DOMString stringForSelection;
</span><span class="cx"> object elementsForRange(unsigned long location, unsigned long length);
</span><span class="cx"> void increaseTextSelection();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (200298 => 200299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-04-30 22:06:21 UTC (rev 200298)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-05-01 04:17:54 UTC (rev 200299)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> void setTabKeyCyclesThroughElements(boolean enabled);
</span><span class="cx"> void setSerializeHTTPLoads();
</span><span class="cx"> void dispatchPendingLoadRequests();
</span><del>- void setCacheModel(int model);
</del><ins>+ void setCacheModel(long model);
</ins><span class="cx"> void setAsynchronousSpellCheckingEnabled(boolean value);
</span><span class="cx"> void setPrinting();
</span><span class="cx"> void setShouldDecideNavigationPolicyAfterDelay(boolean value);
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void display();
</span><span class="cx">
</span><span class="cx"> // Printing
</span><del>- boolean isPageBoxVisible(int pageIndex);
</del><ins>+ boolean isPageBoxVisible(long pageIndex);
</ins><span class="cx">
</span><span class="cx"> [PassContext] void setValueForUser(object element, DOMString value);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>