<!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>[167175] trunk/Source/WebCore</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/167175">167175</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-04-11 17:26:02 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove "numeric index getter" stuff from bindings code generator.
<https://webkit.org/b/131565>
This was used for an earlier generation of typed arrays. Now that JSC
has native typed array support, we're not using this functionality and
can just remove it.
Reviewed by Geoffrey Garen.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotBody):
(HasComplexGetOwnProperty):
(InterfaceRequiresAttributesOnInstance):
(InstanceOverridesGetOwnPropertySlot):
(GenerateHeader):
(GenerateImplementation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167174 => 167175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-12 00:25:06 UTC (rev 167174)
+++ trunk/Source/WebCore/ChangeLog 2014-04-12 00:26:02 UTC (rev 167175)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-11 Andreas Kling <akling@apple.com>
+
+ Remove "numeric index getter" stuff from bindings code generator.
+ <https://webkit.org/b/131565>
+
+ This was used for an earlier generation of typed arrays. Now that JSC
+ has native typed array support, we're not using this functionality and
+ can just remove it.
+
+ Reviewed by Geoffrey Garen.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateGetOwnPropertySlotBody):
+ (HasComplexGetOwnProperty):
+ (InterfaceRequiresAttributesOnInstance):
+ (InstanceOverridesGetOwnPropertySlot):
+ (GenerateHeader):
+ (GenerateImplementation):
+
</ins><span class="cx"> 2014-04-11 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Replay: consolidate decoding macros used in SerializationMethods
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (167174 => 167175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-12 00:25:06 UTC (rev 167174)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-12 00:26:02 UTC (rev 167175)
</span><span class="lines">@@ -392,7 +392,6 @@
</span><span class="cx"> my $namespaceMaybe = ($inlined ? "JSC::" : "");
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><del>- my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
</del><span class="cx">
</span><span class="cx"> my @getOwnPropertySlotImpl = ();
</span><span class="cx">
</span><span class="lines">@@ -403,7 +402,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $manualLookupGetterGeneration = sub {
</span><del>- my $requiresManualLookup = ($indexedGetterFunction && !$hasNumericIndexedGetter) || $namedGetterFunction;
</del><ins>+ my $requiresManualLookup = $indexedGetterFunction || $namedGetterFunction;
</ins><span class="cx"> if ($requiresManualLookup) {
</span><span class="cx"> push(@getOwnPropertySlotImpl, " const ${namespaceMaybe}HashTableValue* entry = getStaticValueSlotEntryWithoutCaching<$className>(exec, propertyName);\n");
</span><span class="cx"> push(@getOwnPropertySlotImpl, " if (entry) {\n");
</span><span class="lines">@@ -433,11 +432,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> push(@getOwnPropertySlotImpl, " unsigned attributes = ${namespaceMaybe}DontDelete | ${namespaceMaybe}ReadOnly;\n");
</span><span class="cx"> }
</span><del>- if ($hasNumericIndexedGetter) {
- push(@getOwnPropertySlotImpl, " slot.setValue(thisObject, attributes, thisObject->getByIndex(exec, index));\n");
- } else {
- push(@getOwnPropertySlotImpl, " slot.setCustomIndex(thisObject, attributes, index, indexGetter);\n");
- }
</del><ins>+ push(@getOwnPropertySlotImpl, " slot.setCustomIndex(thisObject, attributes, index, indexGetter);\n");
</ins><span class="cx"> push(@getOwnPropertySlotImpl, " return true;\n");
</span><span class="cx"> push(@getOwnPropertySlotImpl, " }\n");
</span><span class="cx"> }
</span><span class="lines">@@ -592,7 +587,6 @@
</span><span class="cx">
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><del>- my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
</del><span class="cx">
</span><span class="cx"> my $hasImpureNamedGetter = $namedGetterFunction
</span><span class="cx"> || $interface->extendedAttributes->{"CustomNamedGetter"}
</span><span class="lines">@@ -614,7 +608,6 @@
</span><span class="cx"> my $interfaceName = $interface->name;
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><del>- my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
</del><span class="cx">
</span><span class="cx"> # FIXME: All these return 1 if ... should ideally be removed.
</span><span class="cx"> # Some of them are unavoidable due to DOM weirdness, in which case we should
</span><span class="lines">@@ -732,7 +725,6 @@
</span><span class="cx">
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><del>- my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
</del><span class="cx">
</span><span class="cx"> my $hasImpureNamedGetter = $namedGetterFunction
</span><span class="cx"> || $interface->extendedAttributes->{"CustomNamedGetter"}
</span><span class="lines">@@ -898,7 +890,6 @@
</span><span class="cx">
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><del>- my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
</del><span class="cx">
</span><span class="cx"> my $hasImpureNamedGetter =
</span><span class="cx"> $namedGetterFunction
</span><span class="lines">@@ -1124,11 +1115,7 @@
</span><span class="cx">
</span><span class="cx"> # Index getter
</span><span class="cx"> if ($indexedGetterFunction) {
</span><del>- if ($hasNumericIndexedGetter) {
- push(@headerContent, " JSC::JSValue getByIndex(JSC::ExecState*, unsigned index);\n");
- } else {
- push(@headerContent, " static JSC::EncodedJSValue indexGetter(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, unsigned);\n");
- }
</del><ins>+ push(@headerContent, " static JSC::EncodedJSValue indexGetter(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, unsigned);\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Index setter
</span><span class="lines">@@ -1725,7 +1712,6 @@
</span><span class="cx">
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><del>- my $hasNumericIndexedGetter = $indexedGetterFunction ? $codeGenerator->IsNumericType($indexedGetterFunction->signature->type) : 0;
</del><span class="cx">
</span><span class="cx"> # - Add default header template
</span><span class="cx"> push(@implContentHeader, GenerateImplementationContentHeader($interface));
</span><span class="lines">@@ -2095,11 +2081,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " unsigned attributes = DontDelete | ReadOnly;\n");
</span><span class="cx"> }
</span><del>- if ($hasNumericIndexedGetter) {
- push(@implContent, " slot.setValue(thisObject, attributes, thisObject->getByIndex(exec, index));\n");
- } else {
- push(@implContent, " slot.setCustomIndex(thisObject, attributes, index, thisObject->indexGetter);\n");
- }
</del><ins>+ push(@implContent, " slot.setCustomIndex(thisObject, attributes, index, thisObject->indexGetter);\n");
</ins><span class="cx"> push(@implContent, " return true;\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><span class="cx"> }
</span><span class="lines">@@ -2850,7 +2832,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($indexedGetterFunction && !$hasNumericIndexedGetter) {
</del><ins>+ if ($indexedGetterFunction) {
</ins><span class="cx"> push(@implContent, "\nEncodedJSValue ${className}::indexGetter(ExecState* exec, JSObject* slotBase, EncodedJSValue, unsigned index)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " ${className}* thisObj = jsCast<$className*>(slotBase);\n");
</span><span class="lines">@@ -2868,22 +2850,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($hasNumericIndexedGetter) {
- push(@implContent, "\nJSValue ${className}::getByIndex(ExecState*, unsigned index)\n");
- push(@implContent, "{\n");
- push(@implContent, " ASSERT_GC_OBJECT_INHERITS(this, info());\n");
- push(@implContent, " double result = impl().item(index);\n");
- # jsNumber conversion doesn't suppress signalling NaNs, so enforce that here.
- push(@implContent, " if (std::isnan(result))\n");
- push(@implContent, " return jsNaN();\n");
- push(@implContent, " return JSValue(result);\n");
- push(@implContent, "}\n\n");
- if ($interfaceName =~ /^HTML\w*Collection$/) {
- $implIncludes{"JSNode.h"} = 1;
- $implIncludes{"Node.h"} = 1;
- }
- }
-
</del><span class="cx"> if ($interfaceName eq "DOMNamedFlowCollection") {
</span><span class="cx"> if ($namedGetterFunction) {
</span><span class="cx"> push(@implContent, "bool ${className}::canGetItemsForName(ExecState*, $interfaceName* collection, PropertyName propertyName)\n");
</span></span></pre>
</div>
</div>
</body>
</html>