From: haraken@chromium.org Date: Thu, 9 Feb 2012 06:43:18 +0000 (+0000) Subject: Rename [HasNumericIndexGetter] to [NumericIndexedGetter] X-Git-Tag: 070512121124~13368 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66bb1b94949527f616f0df5b0e22024b91d93291;p=profile%2Fivi%2Fwebkit-efl.git Rename [HasNumericIndexGetter] to [NumericIndexedGetter] https://bugs.webkit.org/show_bug.cgi?id=78096 Reviewed by Adam Barth. This patch renames [HasNumericIndexGetter] to [NumericIndexedGetter], for naming consistency with [IndexedGetter] and [CustomIndexedGetter]. No tests. No change in behavior. * bindings/scripts/CodeGeneratorJS.pm: (GenerateGetOwnPropertySlotBody): (GenerateGetOwnPropertyDescriptorBody): (GenerateHeader): (GenerateImplementation): * bindings/scripts/CodeGeneratorV8.pm: (GenerateHeaderNamedAndIndexedPropertyAccessors): (GenerateImplementationIndexer): * bindings/scripts/test/TestTypedArray.idl: No change in run-bindings-tests results. * 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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107181 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 81ddcb7..3b9dc1c 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,37 @@ +2012-02-08 Kentaro Hara + + Rename [HasNumericIndexGetter] to [NumericIndexedGetter] + https://bugs.webkit.org/show_bug.cgi?id=78096 + + Reviewed by Adam Barth. + + This patch renames [HasNumericIndexGetter] to [NumericIndexedGetter], + for naming consistency with [IndexedGetter] and [CustomIndexedGetter]. + + No tests. No change in behavior. + + * bindings/scripts/CodeGeneratorJS.pm: + (GenerateGetOwnPropertySlotBody): + (GenerateGetOwnPropertyDescriptorBody): + (GenerateHeader): + (GenerateImplementation): + * bindings/scripts/CodeGeneratorV8.pm: + (GenerateHeaderNamedAndIndexedPropertyAccessors): + (GenerateImplementationIndexer): + + * bindings/scripts/test/TestTypedArray.idl: No change in run-bindings-tests results. + + * 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: + 2012-02-08 Tony Chang refactor RenderFlexibleBox to return preferred sizes of all children diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm index 5499246..2e91426 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm @@ -433,7 +433,7 @@ sub GenerateGetOwnPropertySlotBody &$manualLookupGetterGeneration(); } - if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@getOwnPropertySlotImpl, " bool ok;\n"); push(@getOwnPropertySlotImpl, " unsigned index = propertyName.toUInt32(ok);\n"); @@ -444,7 +444,7 @@ sub GenerateGetOwnPropertySlotBody } else { push(@getOwnPropertySlotImpl, " if (ok && index < static_cast<$implClassName*>(thisObject->impl())->length()) {\n"); } - if ($dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@getOwnPropertySlotImpl, " slot.setValue(thisObject->getByIndex(exec, index));\n"); } else { push(@getOwnPropertySlotImpl, " slot.setCustomIndex(thisObject, index, indexGetter);\n"); @@ -527,11 +527,11 @@ sub GenerateGetOwnPropertyDescriptorBody &$manualLookupGetterGeneration(); } - if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) { 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"}) { + if ($dataNode->extendedAttributes->{"NumericIndexedGetter"}) { # Assume that if there's a setter, the index will be writable if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) { push(@getOwnPropertyDescriptorImpl, " descriptor.setDescriptor(thisObject->getByIndex(exec, index), ${namespaceMaybe}DontDelete);\n"); @@ -756,7 +756,7 @@ sub GenerateHeader my $hasGetter = $numAttributes > 0 || !$dataNode->extendedAttributes->{"OmitConstructor"} || $dataNode->extendedAttributes->{"IndexedGetter"} - || $dataNode->extendedAttributes->{"HasNumericIndexGetter"} + || $dataNode->extendedAttributes->{"NumericIndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"} || $dataNode->extendedAttributes->{"JSCustomGetOwnPropertySlotDelegate"} || $dataNode->extendedAttributes->{"NamedGetter"} @@ -766,7 +766,7 @@ sub GenerateHeader 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->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"CustomNamedGetter"}; + push(@headerContent, " static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) && !$dataNode->extendedAttributes->{"CustomNamedGetter"}; push(@headerContent, " bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);\n") if $dataNode->extendedAttributes->{"JSCustomGetOwnPropertySlotDelegate"}; push(@headerContent, " bool getOwnPropertyDescriptorDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);\n") if $dataNode->extendedAttributes->{"JSCustomGetOwnPropertySlotDelegate"}; $structureFlags{"JSC::OverridesGetOwnPropertySlot"} = 1; @@ -828,7 +828,7 @@ sub GenerateHeader } # Custom getOwnPropertyNames function - if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"} || $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"} || $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@headerContent, " static void getOwnPropertyNames(JSC::JSObject*, JSC::ExecState*, JSC::PropertyNameArray&, JSC::EnumerationMode mode = JSC::ExcludeDontEnumProperties);\n"); $structureFlags{"JSC::OverridesGetPropertyNames"} = 1; } @@ -947,9 +947,8 @@ sub GenerateHeader if ($dataNode->extendedAttributes->{"IndexedGetter"}) { push(@headerContent, " static JSC::JSValue indexGetter(JSC::ExecState*, JSC::JSValue, unsigned);\n"); } - if ($dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@headerContent, " JSC::JSValue getByIndex(JSC::ExecState*, unsigned index);\n"); - } # Index setter @@ -1331,7 +1330,7 @@ sub GenerateImplementation AddIncludesForSVGAnimatedType($interfaceName) if $className =~ /^JSSVGAnimated/; $implIncludes{""} = 1; - $implIncludes{""} = 1 if $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}; + $implIncludes{""} = 1 if $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}; AddIncludesForTypeInImpl($interfaceName); @@ -1623,7 +1622,7 @@ sub GenerateImplementation my $hasGetter = $numAttributes > 0 || !$dataNode->extendedAttributes->{"OmitConstructor"} || $dataNode->extendedAttributes->{"IndexedGetter"} - || $dataNode->extendedAttributes->{"HasNumericIndexGetter"} + || $dataNode->extendedAttributes->{"NumericIndexedGetter"} || $dataNode->extendedAttributes->{"JSCustomGetOwnPropertySlotDelegate"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"} || $dataNode->extendedAttributes->{"NamedGetter"} @@ -1646,14 +1645,14 @@ sub GenerateImplementation push(@implContent, "}\n\n"); } - if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) + if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) && !$dataNode->extendedAttributes->{"CustomNamedGetter"}) { push(@implContent, "bool ${className}::getOwnPropertySlotByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, PropertySlot& slot)\n"); push(@implContent, "{\n"); push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n"); push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);\n"); push(@implContent, " if (propertyName < static_cast<$implClassName*>(thisObject->impl())->length()) {\n"); - if ($dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@implContent, " slot.setValue(thisObject->getByIndex(exec, propertyName));\n"); } else { push(@implContent, " slot.setCustomIndex(thisObject, propertyName, thisObject->indexGetter);\n"); @@ -1663,7 +1662,7 @@ sub GenerateImplementation push(@implContent, " return thisObject->methodTable()->getOwnPropertySlot(thisObject, exec, Identifier::from(exec, propertyName), slot);\n"); push(@implContent, "}\n\n"); } - + if ($numAttributes > 0) { foreach my $attribute (@{$dataNode->attributes}) { my $name = $attribute->signature->name; @@ -2028,12 +2027,12 @@ sub GenerateImplementation } } - if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"CustomGetPropertyNames"}) { + if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) && !$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->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@implContent, " for (unsigned i = 0; i < static_cast<${implClassName}*>(thisObject->impl())->length(); ++i)\n"); push(@implContent, " propertyNames.add(Identifier::from(exec, i));\n"); } @@ -2222,8 +2221,8 @@ sub GenerateImplementation $implIncludes{"Node.h"} = 1; } } - - if ($dataNode->extendedAttributes->{"HasNumericIndexGetter"}) { + + if ($dataNode->extendedAttributes->{"NumericIndexedGetter"}) { push(@implContent, "\nJSValue ${className}::getByIndex(ExecState*, unsigned index)\n"); push(@implContent, "{\n"); push(@implContent, " ASSERT_GC_OBJECT_INHERITS(this, &s_info);\n"); diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm index 9bcc69a..10015ad 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm @@ -564,7 +564,7 @@ sub GenerateHeaderNamedAndIndexedPropertyAccessors my $dataNode = shift; my $interfaceName = $dataNode->name; my $hasCustomIndexedGetter = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}; - my $hasCustomIndexedSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"}; + my $hasCustomIndexedSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"NumericIndexedGetter"}; my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}; my $hasCustomNamedSetter = $dataNode->extendedAttributes->{"CustomNamedSetter"}; my $hasCustomDeleters = $dataNode->extendedAttributes->{"CustomDeleteProperty"}; @@ -2047,8 +2047,8 @@ sub GenerateImplementationIndexer my $indexer = shift; 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->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"}; + # FIXME: Figure out what NumericIndexedGetter is really supposed to do. Right now, it's only set on WebGL-related files. + my $hasCustomSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"NumericIndexedGetter"}; my $hasGetter = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}; # FIXME: Find a way to not have to special-case HTMLOptionsCollection. diff --git a/Source/WebCore/bindings/scripts/test/TestTypedArray.idl b/Source/WebCore/bindings/scripts/test/TestTypedArray.idl index 088d78e..4ea69e5 100644 --- a/Source/WebCore/bindings/scripts/test/TestTypedArray.idl +++ b/Source/WebCore/bindings/scripts/test/TestTypedArray.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/CanvasPixelArray.idl b/Source/WebCore/html/canvas/CanvasPixelArray.idl index b6e4a2e..a12c8ce 100644 --- a/Source/WebCore/html/canvas/CanvasPixelArray.idl +++ b/Source/WebCore/html/canvas/CanvasPixelArray.idl @@ -30,7 +30,7 @@ module html { #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT || defined(V8_BINDING) && V8_BINDING interface [ OmitConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter ] CanvasPixelArray { #if !defined(V8_BINDING) || !V8_BINDING diff --git a/Source/WebCore/html/canvas/Float32Array.idl b/Source/WebCore/html/canvas/Float32Array.idl index 092ea6a..785ed81 100644 --- a/Source/WebCore/html/canvas/Float32Array.idl +++ b/Source/WebCore/html/canvas/Float32Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Float64Array.idl b/Source/WebCore/html/canvas/Float64Array.idl index 1b6b449..7180811 100644 --- a/Source/WebCore/html/canvas/Float64Array.idl +++ b/Source/WebCore/html/canvas/Float64Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Int16Array.idl b/Source/WebCore/html/canvas/Int16Array.idl index 705f3ae..40e18d5 100644 --- a/Source/WebCore/html/canvas/Int16Array.idl +++ b/Source/WebCore/html/canvas/Int16Array.idl @@ -26,7 +26,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Int32Array.idl b/Source/WebCore/html/canvas/Int32Array.idl index 770f425..0f5320a 100644 --- a/Source/WebCore/html/canvas/Int32Array.idl +++ b/Source/WebCore/html/canvas/Int32Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Int8Array.idl b/Source/WebCore/html/canvas/Int8Array.idl index 95dcfb4..9984ada 100644 --- a/Source/WebCore/html/canvas/Int8Array.idl +++ b/Source/WebCore/html/canvas/Int8Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Uint16Array.idl b/Source/WebCore/html/canvas/Uint16Array.idl index e786568..83877b5 100644 --- a/Source/WebCore/html/canvas/Uint16Array.idl +++ b/Source/WebCore/html/canvas/Uint16Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Uint32Array.idl b/Source/WebCore/html/canvas/Uint32Array.idl index bdf12b0..2726473 100644 --- a/Source/WebCore/html/canvas/Uint32Array.idl +++ b/Source/WebCore/html/canvas/Uint32Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Uint8Array.idl b/Source/WebCore/html/canvas/Uint8Array.idl index 19c8828..4892da8 100644 --- a/Source/WebCore/html/canvas/Uint8Array.idl +++ b/Source/WebCore/html/canvas/Uint8Array.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables, diff --git a/Source/WebCore/html/canvas/Uint8ClampedArray.idl b/Source/WebCore/html/canvas/Uint8ClampedArray.idl index 49e7fb1..a9a49f3 100644 --- a/Source/WebCore/html/canvas/Uint8ClampedArray.idl +++ b/Source/WebCore/html/canvas/Uint8ClampedArray.idl @@ -27,7 +27,7 @@ module html { interface [ CustomConstructor, - HasNumericIndexGetter, + NumericIndexedGetter, CustomIndexedSetter, JSGenerateToNativeObject, JSNoStaticTables,