Index: Source/WebCore/bindings/scripts/CodeGeneratorV8.pm |
=================================================================== |
--- Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (revision 144311) |
+++ Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (working copy) |
@@ -1155,18 +1155,6 @@ |
push(@implContentDecls, "#endif // ${conditionalString}\n\n") if $conditionalString; |
} |
-sub GenerateReplaceableAttrSetterCallback |
-{ |
- my $interface = shift; |
- my $interfaceName = $interface->name; |
- |
- push(@implContentDecls, "static void ${interfaceName}ReplaceableAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n"); |
- push(@implContentDecls, "{\n"); |
- push(@implContentDecls, GenerateFeatureObservation($interface->extendedAttributes->{"V8MeasureAs"})); |
- push(@implContentDecls, " return ${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter(name, value, info);\n"); |
- push(@implContentDecls, "}\n\n"); |
-} |
- |
sub GenerateReplaceableAttrSetter |
{ |
my $interface = shift; |
@@ -1176,6 +1164,8 @@ |
static void ${interfaceName}ReplaceableAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info) |
{ |
END |
+ push(@implContentDecls, GenerateFeatureObservation($interface->extendedAttributes->{"V8MeasureAs"})); |
+ |
if ($interface->extendedAttributes->{"CheckSecurity"}) { |
AddToImplIncludes("Frame.h"); |
push(@implContentDecls, <<END); |
@@ -2349,14 +2339,14 @@ |
} |
$data = "&V8${constructorType}::info"; |
$getter = "${interfaceName}V8Internal::${interfaceName}ConstructorGetter"; |
- $setter = "${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetterCallback"; |
+ $setter = "${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter"; |
} else { |
# Default Getter and Setter |
$getter = "${interfaceName}V8Internal::${attrName}AttrGetterCallback"; |
$setter = "${interfaceName}V8Internal::${attrName}AttrSetterCallback"; |
if (!HasCustomSetter($attrExt) && $attrExt->{"Replaceable"}) { |
- $setter = "${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetterCallback"; |
+ $setter = "${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter"; |
} |
} |
@@ -2775,7 +2765,6 @@ |
if ($hasConstructors || $hasReplaceable) { |
GenerateReplaceableAttrSetter($interface); |
- GenerateReplaceableAttrSetterCallback($interface); |
} |
if (NeedsCustomOpaqueRootForGC($interface)) { |