Diff
Modified: trunk/Source/WebCore/ChangeLog (128519 => 128520)
--- trunk/Source/WebCore/ChangeLog 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/ChangeLog 2012-09-13 23:01:34 UTC (rev 128520)
@@ -1,3 +1,60 @@
+2012-09-13 Joshua Bell <[email protected]>
+
+ [V8] Binding: Generate batched attribute/const/callback struct names can collide
+ https://bugs.webkit.org/show_bug.cgi?id=96700
+
+ Reviewed by Kentaro Hara.
+
+ The V8 binding code generator spits out static arrays for batched configuration of
+ consts, attributes, and callbacks. Prior to this patch, it would spit them out
+ in the WebCore namespace with names like <BaseType>Callbacks which could collide with
+ other code. This change renames them from <BaseType><Suffix> to V8<BaseType><Suffix>.
+
+ Tests: Rebaselined the binding/scripts/test/V8/* results. No functional changes.
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/V8/V8Float64Array.cpp:
+ (Float64ArrayV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8Float64ArrayTemplate):
+ * bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:
+ (TestActiveDOMObjectV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestActiveDOMObjectTemplate):
+ * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:
+ (TestCustomNamedGetterV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestCustomNamedGetterTemplate):
+ * bindings/scripts/test/V8/V8TestEventConstructor.cpp:
+ (TestEventConstructorV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestEventConstructorTemplate):
+ * bindings/scripts/test/V8/V8TestEventTarget.cpp:
+ (TestEventTargetV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestEventTargetTemplate):
+ * bindings/scripts/test/V8/V8TestException.cpp:
+ (TestExceptionV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestExceptionTemplate):
+ * bindings/scripts/test/V8/V8TestInterface.cpp:
+ (TestInterfaceV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestInterfaceTemplate):
+ * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:
+ (TestMediaQueryListListenerV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestMediaQueryListListenerTemplate):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (TestObjV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestObjTemplate):
+ * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+ (TestSerializedScriptValueInterfaceV8Internal):
+ (WebCore):
+ (WebCore::ConfigureV8TestSerializedScriptValueInterfaceTemplate):
+
2012-09-13 Ryuan Choi <[email protected]>
[EFL] Improve string manipulation in EflKeyboardUtilities.cpp
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-09-13 23:01:34 UTC (rev 128520)
@@ -2685,7 +2685,7 @@
my $has_attributes = 0;
if (@$attributes) {
$has_attributes = 1;
- push(@implContent, "static const V8DOMConfiguration::BatchedAttribute ${interfaceName}Attrs[] = {\n");
+ push(@implContent, "static const V8DOMConfiguration::BatchedAttribute V8${interfaceName}Attrs[] = {\n");
GenerateBatchedAttributeData($dataNode, $attributes);
push(@implContent, "};\n\n");
}
@@ -2700,7 +2700,7 @@
next if !IsStandardFunction($dataNode, $function);
if (!$has_callbacks) {
$has_callbacks = 1;
- push(@implContent, "static const V8DOMConfiguration::BatchedCallback ${interfaceName}Callbacks[] = {\n");
+ push(@implContent, "static const V8DOMConfiguration::BatchedCallback V8${interfaceName}Callbacks[] = {\n");
}
my $name = $function->signature->name;
my $callback = GetFunctionTemplateCallbackName($function, $interfaceName);
@@ -2719,7 +2719,7 @@
my @constantsEnabledAtRuntime;
if (@{$dataNode->constants}) {
$has_constants = 1;
- push(@implContent, "static const V8DOMConfiguration::BatchedConstant ${interfaceName}Consts[] = {\n");
+ push(@implContent, "static const V8DOMConfiguration::BatchedConstant V8${interfaceName}Consts[] = {\n");
}
foreach my $constant (@{$dataNode->constants}) {
my $name = $constant->name;
@@ -2810,7 +2810,7 @@
# Set up our attributes if we have them
if ($has_attributes) {
push(@implContent, <<END);
- ${interfaceName}Attrs, WTF_ARRAY_LENGTH(${interfaceName}Attrs),
+ V8${interfaceName}Attrs, WTF_ARRAY_LENGTH(V8${interfaceName}Attrs),
END
} else {
push(@implContent, <<END);
@@ -2820,7 +2820,7 @@
if ($has_callbacks) {
push(@implContent, <<END);
- ${interfaceName}Callbacks, WTF_ARRAY_LENGTH(${interfaceName}Callbacks));
+ V8${interfaceName}Callbacks, WTF_ARRAY_LENGTH(V8${interfaceName}Callbacks));
END
} else {
push(@implContent, <<END);
@@ -2902,7 +2902,7 @@
if ($has_constants) {
push(@implContent, <<END);
- V8DOMConfiguration::batchConfigureConstants(desc, proto, ${interfaceName}Consts, WTF_ARRAY_LENGTH(${interfaceName}Consts));
+ V8DOMConfiguration::batchConfigureConstants(desc, proto, V8${interfaceName}Consts, WTF_ARRAY_LENGTH(V8${interfaceName}Consts));
END
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -76,7 +76,7 @@
return wrapper;
}
-static const V8DOMConfiguration::BatchedCallback Float64ArrayCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8Float64ArrayCallbacks[] = {
{"set", Float64ArrayV8Internal::setCallback},
};
@@ -93,7 +93,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "Float64Array", V8ArrayBufferView::GetTemplate(), V8Float64Array::internalFieldCount,
0, 0,
- Float64ArrayCallbacks, WTF_ARRAY_LENGTH(Float64ArrayCallbacks));
+ V8Float64ArrayCallbacks, WTF_ARRAY_LENGTH(V8Float64ArrayCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
desc->SetCallHandler(V8Float64Array::constructorCallback);
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -108,7 +108,7 @@
} // namespace TestActiveDOMObjectV8Internal
-static const V8DOMConfiguration::BatchedAttribute TestActiveDOMObjectAttrs[] = {
+static const V8DOMConfiguration::BatchedAttribute V8TestActiveDOMObjectAttrs[] = {
// Attribute 'excitingAttr' (Type: 'readonly attribute' ExtAttr: '')
{"excitingAttr", TestActiveDOMObjectV8Internal::excitingAttrAttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
};
@@ -119,7 +119,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestActiveDOMObject", v8::Persistent<v8::FunctionTemplate>(), V8TestActiveDOMObject::internalFieldCount,
- TestActiveDOMObjectAttrs, WTF_ARRAY_LENGTH(TestActiveDOMObjectAttrs),
+ V8TestActiveDOMObjectAttrs, WTF_ARRAY_LENGTH(V8TestActiveDOMObjectAttrs),
0, 0);
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -51,7 +51,7 @@
} // namespace TestCustomNamedGetterV8Internal
-static const V8DOMConfiguration::BatchedCallback TestCustomNamedGetterCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8TestCustomNamedGetterCallbacks[] = {
{"anotherFunction", TestCustomNamedGetterV8Internal::anotherFunctionCallback},
};
@@ -62,7 +62,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestCustomNamedGetter", v8::Persistent<v8::FunctionTemplate>(), V8TestCustomNamedGetter::internalFieldCount,
0, 0,
- TestCustomNamedGetterCallbacks, WTF_ARRAY_LENGTH(TestCustomNamedGetterCallbacks));
+ V8TestCustomNamedGetterCallbacks, WTF_ARRAY_LENGTH(V8TestCustomNamedGetterCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -54,7 +54,7 @@
} // namespace TestEventConstructorV8Internal
-static const V8DOMConfiguration::BatchedAttribute TestEventConstructorAttrs[] = {
+static const V8DOMConfiguration::BatchedAttribute V8TestEventConstructorAttrs[] = {
// Attribute 'attr1' (Type: 'readonly attribute' ExtAttr: '')
{"attr1", TestEventConstructorV8Internal::attr1AttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
// Attribute 'attr2' (Type: 'readonly attribute' ExtAttr: 'InitializedByEventConstructor')
@@ -102,7 +102,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestEventConstructor", v8::Persistent<v8::FunctionTemplate>(), V8TestEventConstructor::internalFieldCount,
- TestEventConstructorAttrs, WTF_ARRAY_LENGTH(TestEventConstructorAttrs),
+ V8TestEventConstructorAttrs, WTF_ARRAY_LENGTH(V8TestEventConstructorAttrs),
0, 0);
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
desc->SetCallHandler(V8TestEventConstructor::constructorCallback);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -102,7 +102,7 @@
} // namespace TestEventTargetV8Internal
-static const V8DOMConfiguration::BatchedCallback TestEventTargetCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8TestEventTargetCallbacks[] = {
{"item", TestEventTargetV8Internal::itemCallback},
{"addEventListener", TestEventTargetV8Internal::addEventListenerCallback},
{"removeEventListener", TestEventTargetV8Internal::removeEventListenerCallback},
@@ -115,7 +115,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestEventTarget", v8::Persistent<v8::FunctionTemplate>(), V8TestEventTarget::internalFieldCount,
0, 0,
- TestEventTargetCallbacks, WTF_ARRAY_LENGTH(TestEventTargetCallbacks));
+ V8TestEventTargetCallbacks, WTF_ARRAY_LENGTH(V8TestEventTargetCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -46,7 +46,7 @@
} // namespace TestExceptionV8Internal
-static const V8DOMConfiguration::BatchedAttribute TestExceptionAttrs[] = {
+static const V8DOMConfiguration::BatchedAttribute V8TestExceptionAttrs[] = {
// Attribute 'name' (Type: 'readonly attribute' ExtAttr: '')
{"name", TestExceptionV8Internal::nameAttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
};
@@ -57,7 +57,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestException", v8::Persistent<v8::FunctionTemplate>(), V8TestException::internalFieldCount,
- TestExceptionAttrs, WTF_ARRAY_LENGTH(TestExceptionAttrs),
+ V8TestExceptionAttrs, WTF_ARRAY_LENGTH(V8TestExceptionAttrs),
0, 0);
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -186,7 +186,7 @@
} // namespace TestInterfaceV8Internal
-static const V8DOMConfiguration::BatchedAttribute TestInterfaceAttrs[] = {
+static const V8DOMConfiguration::BatchedAttribute V8TestInterfaceAttrs[] = {
#if ENABLE(Condition11) || ENABLE(Condition12)
// Attribute 'supplementalStaticReadOnlyAttr' (Type: 'readonly attribute' ExtAttr: 'Conditional ImplementedBy')
{"supplementalStaticReadOnlyAttr", TestInterfaceV8Internal::supplementalStaticReadOnlyAttrAttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
@@ -213,7 +213,7 @@
#endif // ENABLE(Condition11) || ENABLE(Condition12)
};
-static const V8DOMConfiguration::BatchedCallback TestInterfaceCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8TestInterfaceCallbacks[] = {
#if ENABLE(Condition11) || ENABLE(Condition12)
{"supplementalMethod1", TestInterfaceV8Internal::supplementalMethod1Callback},
#endif
@@ -222,7 +222,7 @@
#endif
};
-static const V8DOMConfiguration::BatchedConstant TestInterfaceConsts[] = {
+static const V8DOMConfiguration::BatchedConstant V8TestInterfaceConsts[] = {
#if ENABLE(Condition11) || ENABLE(Condition12)
{"SUPPLEMENTALCONSTANT1", static_cast<signed int>(1)},
#endif
@@ -275,8 +275,8 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestInterface", v8::Persistent<v8::FunctionTemplate>(), V8TestInterface::internalFieldCount,
- TestInterfaceAttrs, WTF_ARRAY_LENGTH(TestInterfaceAttrs),
- TestInterfaceCallbacks, WTF_ARRAY_LENGTH(TestInterfaceCallbacks));
+ V8TestInterfaceAttrs, WTF_ARRAY_LENGTH(V8TestInterfaceAttrs),
+ V8TestInterfaceCallbacks, WTF_ARRAY_LENGTH(V8TestInterfaceCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
desc->SetCallHandler(V8TestInterface::constructorCallback);
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
@@ -295,7 +295,7 @@
#if ENABLE(Condition11) || ENABLE(Condition12)
desc->Set(v8::String::NewSymbol("supplementalMethod4"), v8::FunctionTemplate::New(TestInterfaceV8Internal::supplementalMethod4Callback, v8Undefined(), v8::Local<v8::Signature>()));
#endif // ENABLE(Condition11) || ENABLE(Condition12)
- V8DOMConfiguration::batchConfigureConstants(desc, proto, TestInterfaceConsts, WTF_ARRAY_LENGTH(TestInterfaceConsts));
+ V8DOMConfiguration::batchConfigureConstants(desc, proto, V8TestInterfaceConsts, WTF_ARRAY_LENGTH(V8TestInterfaceConsts));
// Custom toString template
desc->Set(v8::String::NewSymbol("toString"), V8PerIsolateData::current()->toStringTemplate());
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -52,7 +52,7 @@
} // namespace TestMediaQueryListListenerV8Internal
-static const V8DOMConfiguration::BatchedCallback TestMediaQueryListListenerCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8TestMediaQueryListListenerCallbacks[] = {
{"method", TestMediaQueryListListenerV8Internal::methodCallback},
};
@@ -63,7 +63,7 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestMediaQueryListListener", v8::Persistent<v8::FunctionTemplate>(), V8TestMediaQueryListListener::internalFieldCount,
0, 0,
- TestMediaQueryListListenerCallbacks, WTF_ARRAY_LENGTH(TestMediaQueryListListenerCallbacks));
+ V8TestMediaQueryListListenerCallbacks, WTF_ARRAY_LENGTH(V8TestMediaQueryListListenerCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -1903,7 +1903,7 @@
} // namespace TestObjV8Internal
-static const V8DOMConfiguration::BatchedAttribute TestObjAttrs[] = {
+static const V8DOMConfiguration::BatchedAttribute V8TestObjAttrs[] = {
// Attribute 'readOnlyLongAttr' (Type: 'readonly attribute' ExtAttr: '')
{"readOnlyLongAttr", TestObjV8Internal::readOnlyLongAttrAttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
// Attribute 'readOnlyStringAttr' (Type: 'readonly attribute' ExtAttr: '')
@@ -2034,7 +2034,7 @@
{"replaceableAttribute", TestObjV8Internal::replaceableAttributeAttrGetter, TestObjV8Internal::TestObjReplaceableAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
};
-static const V8DOMConfiguration::BatchedCallback TestObjCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8TestObjCallbacks[] = {
{"voidMethod", TestObjV8Internal::voidMethodCallback},
{"Method", TestObjV8Internal::MethodCallback},
{"objMethod", TestObjV8Internal::objMethodCallback},
@@ -2084,7 +2084,7 @@
{"strictFunction", TestObjV8Internal::strictFunctionCallback},
};
-static const V8DOMConfiguration::BatchedConstant TestObjConsts[] = {
+static const V8DOMConfiguration::BatchedConstant V8TestObjConsts[] = {
#if ENABLE(Condition1)
{"CONDITIONAL_CONST", static_cast<signed int>(0)},
#endif
@@ -2148,8 +2148,8 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestObject", v8::Persistent<v8::FunctionTemplate>(), V8TestObj::internalFieldCount,
- TestObjAttrs, WTF_ARRAY_LENGTH(TestObjAttrs),
- TestObjCallbacks, WTF_ARRAY_LENGTH(TestObjCallbacks));
+ V8TestObjAttrs, WTF_ARRAY_LENGTH(V8TestObjAttrs),
+ V8TestObjCallbacks, WTF_ARRAY_LENGTH(V8TestObjCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
desc->SetCallHandler(V8TestObj::constructorCallback);
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
@@ -2233,7 +2233,7 @@
v8::Handle<v8::FunctionTemplate> convert5Argv[convert5Argc] = { V8e::GetRawTemplate() };
v8::Handle<v8::Signature> convert5Signature = v8::Signature::New(desc, convert5Argc, convert5Argv);
proto->Set(v8::String::NewSymbol("convert5"), v8::FunctionTemplate::New(TestObjV8Internal::convert5Callback, v8Undefined(), convert5Signature));
- V8DOMConfiguration::batchConfigureConstants(desc, proto, TestObjConsts, WTF_ARRAY_LENGTH(TestObjConsts));
+ V8DOMConfiguration::batchConfigureConstants(desc, proto, V8TestObjConsts, WTF_ARRAY_LENGTH(V8TestObjConsts));
// Custom toString template
desc->Set(v8::String::NewSymbol("toString"), V8PerIsolateData::current()->toStringTemplate());
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (128519 => 128520)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-09-13 22:58:42 UTC (rev 128519)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-09-13 23:01:34 UTC (rev 128520)
@@ -189,7 +189,7 @@
} // namespace TestSerializedScriptValueInterfaceV8Internal
-static const V8DOMConfiguration::BatchedAttribute TestSerializedScriptValueInterfaceAttrs[] = {
+static const V8DOMConfiguration::BatchedAttribute V8TestSerializedScriptValueInterfaceAttrs[] = {
// Attribute 'value' (Type: 'attribute' ExtAttr: '')
{"value", TestSerializedScriptValueInterfaceV8Internal::valueAttrGetter, TestSerializedScriptValueInterfaceV8Internal::valueAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
// Attribute 'readonlyValue' (Type: 'readonly attribute' ExtAttr: '')
@@ -202,7 +202,7 @@
{"cachedReadonlyValue", TestSerializedScriptValueInterfaceV8Internal::cachedReadonlyValueAttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
};
-static const V8DOMConfiguration::BatchedCallback TestSerializedScriptValueInterfaceCallbacks[] = {
+static const V8DOMConfiguration::BatchedCallback V8TestSerializedScriptValueInterfaceCallbacks[] = {
{"acceptTransferList", TestSerializedScriptValueInterfaceV8Internal::acceptTransferListCallback},
{"multiTransferList", TestSerializedScriptValueInterfaceV8Internal::multiTransferListCallback},
};
@@ -244,8 +244,8 @@
v8::Local<v8::Signature> defaultSignature;
defaultSignature = V8DOMConfiguration::configureTemplate(desc, "TestSerializedScriptValueInterface", v8::Persistent<v8::FunctionTemplate>(), V8TestSerializedScriptValueInterface::internalFieldCount,
- TestSerializedScriptValueInterfaceAttrs, WTF_ARRAY_LENGTH(TestSerializedScriptValueInterfaceAttrs),
- TestSerializedScriptValueInterfaceCallbacks, WTF_ARRAY_LENGTH(TestSerializedScriptValueInterfaceCallbacks));
+ V8TestSerializedScriptValueInterfaceAttrs, WTF_ARRAY_LENGTH(V8TestSerializedScriptValueInterfaceAttrs),
+ V8TestSerializedScriptValueInterfaceCallbacks, WTF_ARRAY_LENGTH(V8TestSerializedScriptValueInterfaceCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
desc->SetCallHandler(V8TestSerializedScriptValueInterface::constructorCallback);
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
