Commit 6d052a1e authored by haraken@chromium.org's avatar haraken@chromium.org

Rename [HasIndexGetter], [HasNameGetter] and [HasCustomIndexSetter] IDLs

https://bugs.webkit.org/show_bug.cgi?id=77848

Reviewed by Adam Barth.

For naming consistency with [CustomGetter] and [CustomSetter],
this patch renames the following IDLs:

[HasIndexGetter] => [IndexedGetter]  (Remove "Has". This IDL is for "indexed" properties
in the Web IDL: http://dev.w3.org/2006/webapi/WebIDL/#idl-indexed-properties)
[HasCustomIndexSetter] => [CustomIndexedSetter]  (Ditto.)
[HasNameGetter] => [NamedGetter] (Remove "Has". This IDL is for "named" properties
in the Web IDL: http://dev.w3.org/2006/webapi/WebIDL/#idl-named-properties)

No tests. No change in behavior.

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotBody):
(GenerateGetOwnPropertyDescriptorBody):
(GenerateHeader):
(GenerateImplementation):
* bindings/scripts/CodeGeneratorV8.pm:
(GenerateHeaderNamedAndIndexedPropertyAccessors):
(GenerateImplementationIndexer):
(GenerateImplementationNamedPropertyGetter):

* bindings/scripts/test/TestEventTarget.idl: No change in run-bindings-tests results.
* bindings/scripts/test/TestTypedArray.idl: Ditto.

* Modules/gamepad/GamepadList.idl:
* css/CSSRuleList.idl:
* css/CSSStyleDeclaration.idl:
* css/CSSValueList.idl:
* css/MediaList.idl:
* css/StyleSheetList.idl:
* css/WebKitCSSFilterValue.idl:
* css/WebKitCSSKeyframesRule.idl:
* css/WebKitCSSTransformValue.idl:
* dom/ClientRectList.idl:
* dom/DOMStringList.idl:
* dom/DOMStringMap.idl:
* dom/DataTransferItemList.idl:
* dom/NamedNodeMap.idl:
* dom/NodeList.idl:
* dom/TouchList.idl:
* fileapi/EntryArray.idl:
* fileapi/EntryArraySync.idl:
* fileapi/FileList.idl:
* html/DOMSettableTokenList.idl:
* html/DOMTokenList.idl:
* html/HTMLAllCollection.idl:
* html/HTMLCollection.idl:
* html/HTMLFormElement.idl:
* html/HTMLOptionsCollection.idl:
* html/HTMLPropertiesCollection.idl:
* html/HTMLSelectElement.idl:
* html/TextTrackCueList.idl:
* html/canvas/CanvasPixelArray.idl:
* html/canvas/Float32Array.idl:
* html/canvas/Float64Array.idl:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.idl:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.idl:
* html/canvas/Uint8ClampedArray.idl:
* html/track/TextTrackList.idl:
* mediastream/MediaStreamList.idl:
* mediastream/MediaStreamTrackList.idl:
* page/SpeechInputResultList.idl:
* page/WebKitAnimationList.idl:
* plugins/DOMMimeTypeArray.idl:
* plugins/DOMPlugin.idl:
* plugins/DOMPluginArray.idl:
* storage/Storage.idl:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106798 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6e77be08
2012-02-06 Kentaro Hara <haraken@chromium.org>
Rename [HasIndexGetter], [HasNameGetter] and [HasCustomIndexSetter] IDLs
https://bugs.webkit.org/show_bug.cgi?id=77848
Reviewed by Adam Barth.
For naming consistency with [CustomGetter] and [CustomSetter],
this patch renames the following IDLs:
[HasIndexGetter] => [IndexedGetter] (Remove "Has". This IDL is for "indexed" properties
in the Web IDL: http://dev.w3.org/2006/webapi/WebIDL/#idl-indexed-properties)
[HasCustomIndexSetter] => [CustomIndexedSetter] (Ditto.)
[HasNameGetter] => [NamedGetter] (Remove "Has". This IDL is for "named" properties
in the Web IDL: http://dev.w3.org/2006/webapi/WebIDL/#idl-named-properties)
No tests. No change in behavior.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotBody):
(GenerateGetOwnPropertyDescriptorBody):
(GenerateHeader):
(GenerateImplementation):
* bindings/scripts/CodeGeneratorV8.pm:
(GenerateHeaderNamedAndIndexedPropertyAccessors):
(GenerateImplementationIndexer):
(GenerateImplementationNamedPropertyGetter):
* bindings/scripts/test/TestEventTarget.idl: No change in run-bindings-tests results.
* bindings/scripts/test/TestTypedArray.idl: Ditto.
* Modules/gamepad/GamepadList.idl:
* css/CSSRuleList.idl:
* css/CSSStyleDeclaration.idl:
* css/CSSValueList.idl:
* css/MediaList.idl:
* css/StyleSheetList.idl:
* css/WebKitCSSFilterValue.idl:
* css/WebKitCSSKeyframesRule.idl:
* css/WebKitCSSTransformValue.idl:
* dom/ClientRectList.idl:
* dom/DOMStringList.idl:
* dom/DOMStringMap.idl:
* dom/DataTransferItemList.idl:
* dom/NamedNodeMap.idl:
* dom/NodeList.idl:
* dom/TouchList.idl:
* fileapi/EntryArray.idl:
* fileapi/EntryArraySync.idl:
* fileapi/FileList.idl:
* html/DOMSettableTokenList.idl:
* html/DOMTokenList.idl:
* html/HTMLAllCollection.idl:
* html/HTMLCollection.idl:
* html/HTMLFormElement.idl:
* html/HTMLOptionsCollection.idl:
* html/HTMLPropertiesCollection.idl:
* html/HTMLSelectElement.idl:
* html/TextTrackCueList.idl:
* html/canvas/CanvasPixelArray.idl:
* html/canvas/Float32Array.idl:
* html/canvas/Float64Array.idl:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.idl:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.idl:
* html/canvas/Uint8ClampedArray.idl:
* html/track/TextTrackList.idl:
* mediastream/MediaStreamList.idl:
* mediastream/MediaStreamTrackList.idl:
* page/SpeechInputResultList.idl:
* page/WebKitAnimationList.idl:
* plugins/DOMMimeTypeArray.idl:
* plugins/DOMPlugin.idl:
* plugins/DOMPluginArray.idl:
* storage/Storage.idl:
2012-02-06 Allan Sandfeld Jensen <allan.jensen@nokia.com>
Ensure timers and other active DOM objects do not fire in suspended documents.
......@@ -27,7 +27,7 @@ module dom {
interface [
Conditional=GAMEPAD,
HasIndexGetter
IndexedGetter
] GamepadList {
readonly attribute unsigned long length;
Gamepad item(in [Optional=CallWithDefaultValue] unsigned long index);
......
......@@ -419,7 +419,7 @@ sub GenerateGetOwnPropertySlotBody
}
my $manualLookupGetterGeneration = sub {
my $requiresManualLookup = $dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNameGetter"};
my $requiresManualLookup = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NamedGetter"};
if ($requiresManualLookup) {
push(@getOwnPropertySlotImpl, " const ${namespaceMaybe}HashEntry* entry = ${className}Table.entry(exec, propertyName);\n");
push(@getOwnPropertySlotImpl, " if (entry) {\n");
......@@ -433,7 +433,7 @@ sub GenerateGetOwnPropertySlotBody
&$manualLookupGetterGeneration();
}
if ($dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
push(@getOwnPropertySlotImpl, " bool ok;\n");
push(@getOwnPropertySlotImpl, " unsigned index = propertyName.toUInt32(ok);\n");
......@@ -453,7 +453,7 @@ sub GenerateGetOwnPropertySlotBody
push(@getOwnPropertySlotImpl, " }\n");
}
if ($dataNode->extendedAttributes->{"HasNameGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
push(@getOwnPropertySlotImpl, " if (canGetItemsForName(exec, static_cast<$implClassName*>(thisObject->impl()), propertyName)) {\n");
push(@getOwnPropertySlotImpl, " slot.setCustom(thisObject, thisObject->nameGetter);\n");
push(@getOwnPropertySlotImpl, " return true;\n");
......@@ -511,7 +511,7 @@ sub GenerateGetOwnPropertyDescriptorBody
}
my $manualLookupGetterGeneration = sub {
my $requiresManualLookup = $dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNameGetter"};
my $requiresManualLookup = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NamedGetter"};
if ($requiresManualLookup) {
push(@getOwnPropertyDescriptorImpl, " const ${namespaceMaybe}HashEntry* entry = ${className}Table.entry(exec, propertyName);\n");
push(@getOwnPropertyDescriptorImpl, " if (entry) {\n");
......@@ -527,13 +527,13 @@ sub GenerateGetOwnPropertyDescriptorBody
&$manualLookupGetterGeneration();
}
if ($dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
push(@getOwnPropertyDescriptorImpl, " bool ok;\n");
push(@getOwnPropertyDescriptorImpl, " unsigned index = propertyName.toUInt32(ok);\n");
push(@getOwnPropertyDescriptorImpl, " if (ok && index < static_cast<$implClassName*>(thisObject->impl())->length()) {\n");
if ($dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
# Assume that if there's a setter, the index will be writable
if ($dataNode->extendedAttributes->{"HasCustomIndexSetter"}) {
if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
push(@getOwnPropertyDescriptorImpl, " descriptor.setDescriptor(thisObject->getByIndex(exec, index), ${namespaceMaybe}DontDelete);\n");
} else {
push(@getOwnPropertyDescriptorImpl, " descriptor.setDescriptor(thisObject->getByIndex(exec, index), ${namespaceMaybe}DontDelete | ${namespaceMaybe}ReadOnly);\n");
......@@ -542,7 +542,7 @@ sub GenerateGetOwnPropertyDescriptorBody
push(@getOwnPropertyDescriptorImpl, " ${namespaceMaybe}PropertySlot slot;\n");
push(@getOwnPropertyDescriptorImpl, " slot.setCustomIndex(thisObject, index, indexGetter);\n");
# Assume that if there's a setter, the index will be writable
if ($dataNode->extendedAttributes->{"HasCustomIndexSetter"}) {
if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
push(@getOwnPropertyDescriptorImpl, " descriptor.setDescriptor(slot.getValue(exec, propertyName), ${namespaceMaybe}DontDelete);\n");
} else {
push(@getOwnPropertyDescriptorImpl, " descriptor.setDescriptor(slot.getValue(exec, propertyName), ${namespaceMaybe}DontDelete | ${namespaceMaybe}ReadOnly);\n");
......@@ -552,7 +552,7 @@ sub GenerateGetOwnPropertyDescriptorBody
push(@getOwnPropertyDescriptorImpl, " }\n");
}
if ($dataNode->extendedAttributes->{"HasNameGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
push(@getOwnPropertyDescriptorImpl, " if (canGetItemsForName(exec, static_cast<$implClassName*>(thisObject->impl()), propertyName)) {\n");
push(@getOwnPropertyDescriptorImpl, " ${namespaceMaybe}PropertySlot slot;\n");
push(@getOwnPropertyDescriptorImpl, " slot.setCustom(thisObject, nameGetter);\n");
......@@ -755,18 +755,18 @@ sub GenerateHeader
my $hasGetter = $numAttributes > 0
|| !$dataNode->extendedAttributes->{"OmitConstructor"}
|| $dataNode->extendedAttributes->{"HasIndexGetter"}
|| $dataNode->extendedAttributes->{"IndexedGetter"}
|| $dataNode->extendedAttributes->{"HasNumericIndexGetter"}
|| $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"HasNameGetter"}
|| $dataNode->extendedAttributes->{"NamedGetter"}
|| $dataNode->extendedAttributes->{"HasOverridingNameGetter"};
# Getters
if ($hasGetter) {
push(@headerContent, " static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);\n");
push(@headerContent, " static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);\n");
push(@headerContent, " static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"HasOverridingNameGetter"};
push(@headerContent, " static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"HasOverridingNameGetter"};
push(@headerContent, " bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);\n") if $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"};
push(@headerContent, " bool getOwnPropertyDescriptorDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);\n") if $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"};
$structureFlags{"JSC::OverridesGetOwnPropertySlot"} = 1;
......@@ -783,12 +783,12 @@ sub GenerateHeader
my $hasSetter = $hasReadWriteProperties
|| $dataNode->extendedAttributes->{"CustomPutFunction"}
|| $dataNode->extendedAttributes->{"DelegatingPutFunction"}
|| $dataNode->extendedAttributes->{"HasCustomIndexSetter"};
|| $dataNode->extendedAttributes->{"CustomIndexedSetter"};
# Getters
if ($hasSetter) {
push(@headerContent, " static void put(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&);\n");
push(@headerContent, " static void putByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::JSValue);\n") if $dataNode->extendedAttributes->{"HasCustomIndexSetter"};
push(@headerContent, " static void putByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::JSValue);\n") if $dataNode->extendedAttributes->{"CustomIndexedSetter"};
push(@headerContent, " bool putDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&);\n") if $dataNode->extendedAttributes->{"DelegatingPutFunction"};
}
......@@ -828,7 +828,7 @@ sub GenerateHeader
}
# Custom getOwnPropertyNames function
if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"} || $dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"} || $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
push(@headerContent, " static void getOwnPropertyNames(JSC::JSObject*, JSC::ExecState*, JSC::PropertyNameArray&, JSC::EnumerationMode mode = JSC::ExcludeDontEnumProperties);\n");
$structureFlags{"JSC::OverridesGetPropertyNames"} = 1;
}
......@@ -944,7 +944,7 @@ sub GenerateHeader
push(@headerContent, "Base::StructureFlags;\n");
# Index getter
if ($dataNode->extendedAttributes->{"HasIndexGetter"}) {
if ($dataNode->extendedAttributes->{"IndexedGetter"}) {
push(@headerContent, " static JSC::JSValue indexGetter(JSC::ExecState*, JSC::JSValue, unsigned);\n");
}
if ($dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
......@@ -953,11 +953,11 @@ sub GenerateHeader
}
# Index setter
if ($dataNode->extendedAttributes->{"HasCustomIndexSetter"}) {
if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
push(@headerContent, " void indexSetter(JSC::ExecState*, unsigned index, JSC::JSValue);\n");
}
# Name getter
if ($dataNode->extendedAttributes->{"HasNameGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
push(@headerContent, "private:\n");
push(@headerContent, " static bool canGetItemsForName(JSC::ExecState*, $implClassName*, const JSC::Identifier&);\n");
push(@headerContent, " static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
......@@ -1331,7 +1331,7 @@ sub GenerateImplementation
AddIncludesForSVGAnimatedType($interfaceName) if $className =~ /^JSSVGAnimated/;
$implIncludes{"<wtf/GetPtr.h>"} = 1;
$implIncludes{"<runtime/PropertyNameArray.h>"} = 1 if $dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"};
$implIncludes{"<runtime/PropertyNameArray.h>"} = 1 if $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"};
AddIncludesForTypeInImpl($interfaceName);
......@@ -1622,11 +1622,11 @@ sub GenerateImplementation
my $hasGetter = $numAttributes > 0
|| !$dataNode->extendedAttributes->{"OmitConstructor"}
|| $dataNode->extendedAttributes->{"HasIndexGetter"}
|| $dataNode->extendedAttributes->{"IndexedGetter"}
|| $dataNode->extendedAttributes->{"HasNumericIndexGetter"}
|| $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"HasNameGetter"}
|| $dataNode->extendedAttributes->{"NamedGetter"}
|| $dataNode->extendedAttributes->{"HasOverridingNameGetter"};
# Attributes
......@@ -1646,7 +1646,7 @@ sub GenerateImplementation
push(@implContent, "}\n\n");
}
if (($dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"})
if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"})
&& !$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
push(@implContent, "bool ${className}::getOwnPropertySlotByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, PropertySlot& slot)\n");
push(@implContent, "{\n");
......@@ -1826,7 +1826,7 @@ sub GenerateImplementation
my $hasSetter = $hasReadWriteProperties
|| $dataNode->extendedAttributes->{"DelegatingPutFunction"}
|| $dataNode->extendedAttributes->{"HasCustomIndexSetter"};
|| $dataNode->extendedAttributes->{"CustomIndexedSetter"};
if ($hasSetter) {
if (!$dataNode->extendedAttributes->{"CustomPutFunction"}) {
......@@ -1834,7 +1834,7 @@ sub GenerateImplementation
push(@implContent, "{\n");
push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);\n");
if ($dataNode->extendedAttributes->{"HasCustomIndexSetter"}) {
if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
push(@implContent, " bool ok;\n");
push(@implContent, " unsigned index = propertyName.toUInt32(ok);\n");
push(@implContent, " if (ok) {\n");
......@@ -1855,7 +1855,7 @@ sub GenerateImplementation
push(@implContent, "}\n\n");
}
if ($dataNode->extendedAttributes->{"HasCustomIndexSetter"}) {
if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
push(@implContent, "void ${className}::putByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, JSValue value)\n");
push(@implContent, "{\n");
push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
......@@ -2028,12 +2028,12 @@ sub GenerateImplementation
}
}
if (($dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"CustomGetPropertyNames"}) {
if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"CustomGetPropertyNames"}) {
push(@implContent, "void ${className}::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)\n");
push(@implContent, "{\n");
push(@implContent, " ${className}* thisObject = jsCast<${className}*>(object);\n");
push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);\n");
if ($dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
push(@implContent, " for (unsigned i = 0; i < static_cast<${implClassName}*>(thisObject->impl())->length(); ++i)\n");
push(@implContent, " propertyNames.add(Identifier::from(exec, i));\n");
}
......@@ -2205,7 +2205,7 @@ sub GenerateImplementation
}
}
if ($dataNode->extendedAttributes->{"HasIndexGetter"}) {
if ($dataNode->extendedAttributes->{"IndexedGetter"}) {
push(@implContent, "\nJSValue ${className}::indexGetter(ExecState* exec, JSValue slotBase, unsigned index)\n");
push(@implContent, "{\n");
push(@implContent, " ${className}* thisObj = static_cast<$className*>(asObject(slotBase));\n");
......
......@@ -563,9 +563,9 @@ sub GenerateHeaderNamedAndIndexedPropertyAccessors
{
my $dataNode = shift;
my $interfaceName = $dataNode->name;
my $hasCustomIndexedGetter = $dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomIndexedSetter = $dataNode->extendedAttributes->{"HasCustomIndexSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"};
my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"HasNameGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomIndexedGetter = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomIndexedSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"};
my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomNamedSetter = $dataNode->extendedAttributes->{"DelegatingPutFunction"};
my $hasCustomDeleters = $dataNode->extendedAttributes->{"CustomDeleteProperty"};
my $hasCustomEnumerator = $dataNode->extendedAttributes->{"CustomGetPropertyNames"};
......@@ -2040,8 +2040,8 @@ sub GenerateImplementationIndexer
my $interfaceName = $dataNode->name;
# FIXME: Figure out what HasNumericIndexGetter is really supposed to do. Right now, it's only set on WebGL-related files.
my $hasCustomSetter = $dataNode->extendedAttributes->{"HasCustomIndexSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"};
my $hasGetter = $dataNode->extendedAttributes->{"HasIndexGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"};
my $hasGetter = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
# FIXME: Find a way to not have to special-case HTMLOptionsCollection.
if ($interfaceName eq "HTMLOptionsCollection") {
......@@ -2142,7 +2142,7 @@ sub GenerateImplementationNamedPropertyGetter
$hasCustomGetter = 0;
}
my $hasGetter = $dataNode->extendedAttributes->{"HasNameGetter"} || $hasCustomGetter;
my $hasGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $hasCustomGetter;
if (!$hasGetter) {
return;
}
......
......@@ -30,8 +30,8 @@ module events {
interface [
EventTarget,
HasIndexGetter,
HasNameGetter,
IndexedGetter,
NamedGetter,
MasqueradesAsUndefined
] TestEventTarget {
......
......@@ -28,7 +28,7 @@ module html {
interface [
CustomConstructor,
HasNumericIndexGetter,
HasCustomIndexSetter,
CustomIndexedSetter,
GenerateNativeConverter,
JSNoStaticTables,
JSCustomToJS,
......
......@@ -28,7 +28,7 @@ module css {
// Introduced in DOM Level 2:
interface [
JSCustomIsReachable,
HasIndexGetter,
IndexedGetter,
V8DependentLifetime
] CSSRuleList {
readonly attribute unsigned long length;
......
......@@ -25,8 +25,8 @@ module css {
JSCustomMarkFunction,
JSGenerateIsReachable=ImplRoot,
DelegatingPutFunction,
HasNameGetter,
HasIndexGetter,
NamedGetter,
IndexedGetter,
CustomGetPropertyNames,
V8DependentLifetime
] CSSStyleDeclaration {
......
......@@ -27,7 +27,7 @@ module css {
// Introduced in DOM Level 2:
interface [
HasIndexGetter
IndexedGetter
] CSSValueList : CSSValue {
readonly attribute unsigned long length;
CSSValue item(in [Optional=CallWithDefaultValue] unsigned long index);
......
......@@ -28,7 +28,7 @@ module stylesheets {
// Introduced in DOM Level 2:
interface [
JSGenerateIsReachable,
HasIndexGetter
IndexedGetter
] MediaList {
attribute [TreatNullAs=NullString, ConvertNullStringTo=Null] DOMString mediaText
......
......@@ -23,8 +23,8 @@ module stylesheets {
// Introduced in DOM Level 2:
interface [
JSGenerateIsReachable=ImplDocument,
HasIndexGetter,
HasNameGetter,
IndexedGetter,
NamedGetter,
V8DependentLifetime
] StyleSheetList {
readonly attribute unsigned long length;
......
......@@ -27,7 +27,7 @@ module css {
interface [
Conditional=CSS_FILTERS,
HasIndexGetter,
IndexedGetter,
DontCheckEnums
] WebKitCSSFilterValue : CSSValueList {
......
......@@ -30,7 +30,7 @@ module css {
// Introduced in DOM Level ?:
interface [
HasIndexGetter
IndexedGetter
] WebKitCSSKeyframesRule : CSSRule {
attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString name;
......
......@@ -29,7 +29,7 @@
module css {
interface [
HasIndexGetter,
IndexedGetter,
DontCheckEnums
] WebKitCSSTransformValue : CSSValueList {
......
......@@ -27,7 +27,7 @@
module view {
interface [
HasIndexGetter
IndexedGetter
] ClientRectList {
readonly attribute unsigned long length;
ClientRect item(in [IsIndex,Optional=CallWithDefaultValue] unsigned long index);
......
......@@ -26,7 +26,7 @@
module core {
interface [
HasIndexGetter
IndexedGetter
] DOMStringList {
readonly attribute unsigned long length;
[ConvertNullStringTo=Null] DOMString item(in [IsIndex,Optional=CallWithDefaultValue] unsigned long index);
......
......@@ -27,7 +27,7 @@ module core {
interface [
JSGenerateIsReachable=ImplElementRoot,
HasNameGetter,
NamedGetter,
CustomDeleteProperty,
CustomGetPropertyNames,
DelegatingPutFunction,
......
......@@ -32,7 +32,7 @@ module core {
interface [
Conditional=DATA_TRANSFER_ITEMS,
HasIndexGetter,
IndexedGetter,
GenerateNativeConverter,
#if defined(V8_BINDING) && V8_BINDING
CustomDeleteProperty,
......
......@@ -23,8 +23,8 @@ module core {
interface [
JSGenerateIsReachable=ImplElementRoot,
JSCustomMarkFunction,
HasIndexGetter,
HasNameGetter
IndexedGetter,
NamedGetter
] NamedNodeMap {
Node getNamedItem(in [Optional=CallWithDefaultValue] DOMString name);
......
......@@ -22,8 +22,8 @@ module core {
interface [
JSCustomIsReachable,
HasIndexGetter,
HasNameGetter
IndexedGetter,
NamedGetter
] NodeList {
Node item(in [IsIndex,Optional=CallWithDefaultValue] unsigned long index);
......
......@@ -27,7 +27,7 @@ module events {
interface [
Conditional=TOUCH_EVENTS,
HasIndexGetter
IndexedGetter
] TouchList {
readonly attribute unsigned long length;
......
......@@ -31,7 +31,7 @@
module storage {
interface [
Conditional=FILE_SYSTEM,
HasIndexGetter,
IndexedGetter,
JSNoStaticTables
] EntryArray {
readonly attribute unsigned long length;
......
......@@ -31,7 +31,7 @@
module storage {
interface [
Conditional=FILE_SYSTEM,
HasIndexGetter,
IndexedGetter,
JSNoStaticTables
] EntryArraySync {
readonly attribute unsigned long length;
......
......@@ -26,7 +26,7 @@
module html {
interface [
HasIndexGetter,
IndexedGetter,
JSNoStaticTables
] FileList {
readonly attribute unsigned long length;
......
......@@ -25,7 +25,7 @@
module core {
interface [
HasIndexGetter,
IndexedGetter,
JSGenerateToJS
] DOMSettableTokenList : DOMTokenList {
attribute DOMString value;
......
......@@ -26,7 +26,7 @@ module core {
interface [
JSGenerateIsReachable=ImplElementRoot,
HasIndexGetter
IndexedGetter
] DOMTokenList {
readonly attribute unsigned long length;
[ConvertNullStringTo=Null] DOMString item(in unsigned long index);
......
......@@ -26,8 +26,8 @@
module html {
interface [
HasIndexGetter,
HasNameGetter,
IndexedGetter,
NamedGetter,
CustomCall,
MasqueradesAsUndefined,
JSGenerateIsReachable
......
......@@ -21,8 +21,8 @@
module html {
interface [
HasIndexGetter,
HasNameGetter,
IndexedGetter,
NamedGetter,
JSCustomToJS,
JSGenerateIsReachable,
ObjCPolymorphic
......
......@@ -21,7 +21,7 @@
module html {
interface [
HasIndexGetter,
IndexedGetter,
HasOverridingNameGetter
] HTMLFormElement : HTMLElement {