Index: Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp |
=================================================================== |
--- Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (revision 144311) |
+++ Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (working copy) |
@@ -1548,11 +1548,6 @@ |
info.This()->ForceSet(name, value); |
} |
-static void TestObjReplaceableAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info) |
-{ |
- return TestObjV8Internal::TestObjReplaceableAttrSetter(name, value, info); |
-} |
- |
static v8::Handle<v8::Value> voidMethodMethod(const v8::Arguments& args) |
{ |
TestObj* imp = V8TestObj::toNative(args.Holder()); |
@@ -2896,15 +2891,15 @@ |
#endif // ENABLE(Condition1) || ENABLE(Condition2) |
#if ENABLE(Condition1) |
// Attribute 'conditionalAttr4' (Type: 'attribute' ExtAttr: 'Conditional') |
- {"conditionalAttr4", TestObjV8Internal::TestObjConstructorGetter, TestObjV8Internal::TestObjReplaceableAttrSetterCallback, &V8TestObjectA::info, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
+ {"conditionalAttr4", TestObjV8Internal::TestObjConstructorGetter, TestObjV8Internal::TestObjReplaceableAttrSetter, &V8TestObjectA::info, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
#endif // ENABLE(Condition1) |
#if ENABLE(Condition1) && ENABLE(Condition2) |
// Attribute 'conditionalAttr5' (Type: 'attribute' ExtAttr: 'Conditional') |
- {"conditionalAttr5", TestObjV8Internal::TestObjConstructorGetter, TestObjV8Internal::TestObjReplaceableAttrSetterCallback, &V8TestObjectB::info, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
+ {"conditionalAttr5", TestObjV8Internal::TestObjConstructorGetter, TestObjV8Internal::TestObjReplaceableAttrSetter, &V8TestObjectB::info, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
#endif // ENABLE(Condition1) && ENABLE(Condition2) |
#if ENABLE(Condition1) || ENABLE(Condition2) |
// Attribute 'conditionalAttr6' (Type: 'attribute' ExtAttr: 'Conditional') |
- {"conditionalAttr6", TestObjV8Internal::TestObjConstructorGetter, TestObjV8Internal::TestObjReplaceableAttrSetterCallback, &V8TestObjectC::info, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
+ {"conditionalAttr6", TestObjV8Internal::TestObjConstructorGetter, TestObjV8Internal::TestObjReplaceableAttrSetter, &V8TestObjectC::info, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
#endif // ENABLE(Condition1) || ENABLE(Condition2) |
// Attribute 'cachedAttribute1' (Type: 'readonly attribute' ExtAttr: 'CachedAttribute') |
{"cachedAttribute1", TestObjV8Internal::cachedAttribute1AttrGetterCallback, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
@@ -2933,7 +2928,7 @@ |
// Attribute 'hash' (Type: 'readonly attribute' ExtAttr: '') |
{"hash", TestObjV8Internal::hashAttrGetterCallback, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
// Attribute 'replaceableAttribute' (Type: 'readonly attribute' ExtAttr: 'Replaceable') |
- {"replaceableAttribute", TestObjV8Internal::replaceableAttributeAttrGetterCallback, TestObjV8Internal::TestObjReplaceableAttrSetterCallback, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
+ {"replaceableAttribute", TestObjV8Internal::replaceableAttributeAttrGetterCallback, TestObjV8Internal::TestObjReplaceableAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
}; |
static const V8DOMConfiguration::BatchedMethod V8TestObjMethods[] = { |