Diff
Modified: trunk/Source/WebCore/ChangeLog (142736 => 142737)
--- trunk/Source/WebCore/ChangeLog 2013-02-13 11:59:49 UTC (rev 142736)
+++ trunk/Source/WebCore/ChangeLog 2013-02-13 12:57:21 UTC (rev 142737)
@@ -1,3 +1,22 @@
+2013-02-13 Kentaro Hara <[email protected]>
+
+ Unreviewed, rolling out r142730.
+ http://trac.webkit.org/changeset/142730
+ https://bugs.webkit.org/show_bug.cgi?id=109666
+
+ chromium browser tests are failing
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateNormalAttrGetter):
+ (GenerateNormalAttrSetter):
+ (GenerateSingleBatchedAttribute):
+ (GenerateImplementation):
+ * bindings/scripts/test/V8/V8TestInterface.cpp:
+ (TestInterfaceV8Internal):
+ (WebCore):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore):
+
2013-02-13 Tamas Czene <[email protected]>
OpenCL implementation of Flood SVG filters.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (142736 => 142737)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2013-02-13 11:59:49 UTC (rev 142736)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2013-02-13 12:57:21 UTC (rev 142737)
@@ -898,16 +898,6 @@
END
push(@implContentDecls, GenerateFeatureObservation($attrExt->{"V8MeasureAs"}));
- if (HasCustomGetter($attrExt)) {
- push(@implContentDecls, <<END);
- return ${v8InterfaceName}::${attrName}AccessorGetter(name, info);
-}
-
-END
- push(@implContentDecls, "#endif // ${conditionalString}\n\n") if $conditionalString;
- return;
- }
-
if ($svgNativeType) {
my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($interfaceName);
if ($svgWrappedNativeType =~ /List/) {
@@ -1184,16 +1174,6 @@
push(@implContentDecls, "static void ${attrName}AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n{\n");
push(@implContentDecls, GenerateFeatureObservation($attribute->signature->extendedAttributes->{"V8MeasureAs"}));
- if (HasCustomSetter($attrExt)) {
- push(@implContentDecls, <<END);
- ${v8InterfaceName}::${attrName}AccessorSetter(name, value, info);
-}
-
-END
- push(@implContentDecls, "#endif // ${conditionalString}\n\n") if $conditionalString;
- return;
- }
-
# If the "StrictTypeChecking" extended attribute is present, and the attribute's type is an
# interface type, then if the incoming value does not implement that interface, a TypeError is
# thrown rather than silently passing NULL to the C++ code.
@@ -2327,6 +2307,14 @@
if ($attrExt->{"Replaceable"}) {
$setter = "${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter";
}
+
+ if (HasCustomSetter($attrExt)) {
+ $setter = "V8${customAccessor}AccessorSetter";
+ }
+
+ if (HasCustomGetter($attrExt)) {
+ $getter = "V8${customAccessor}AccessorGetter";
+ }
}
# Read only attributes
@@ -2724,11 +2712,13 @@
AddToImplIncludes("SerializedScriptValue.h");
}
- GenerateNormalAttrGetter($attribute, $interface);
+ if (!HasCustomGetter($attrExt)) {
+ GenerateNormalAttrGetter($attribute, $interface);
+ }
if ($attrExt->{"Replaceable"}) {
$hasReplaceable = 1;
- } elsif (!IsReadonly($attribute)) {
+ } elsif (!HasCustomSetter($attrExt) && !IsReadonly($attribute)) {
GenerateNormalAttrSetter($attribute, $interface);
}
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (142736 => 142737)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2013-02-13 11:59:49 UTC (rev 142736)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2013-02-13 12:57:21 UTC (rev 142737)
@@ -131,24 +131,6 @@
#if ENABLE(Condition11) || ENABLE(Condition12)
-static v8::Handle<v8::Value> supplementalStr3AttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
- return V8TestInterface::supplementalStr3AccessorGetter(name, info);
-}
-
-#endif // ENABLE(Condition11) || ENABLE(Condition12)
-
-#if ENABLE(Condition11) || ENABLE(Condition12)
-
-static void supplementalStr3AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
-{
- V8TestInterface::supplementalStr3AccessorSetter(name, value, info);
-}
-
-#endif // ENABLE(Condition11) || ENABLE(Condition12)
-
-#if ENABLE(Condition11) || ENABLE(Condition12)
-
static v8::Handle<v8::Value> supplementalNodeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
TestInterface* imp = V8TestInterface::toNative(info.Holder());
@@ -234,7 +216,7 @@
#endif // ENABLE(Condition11) || ENABLE(Condition12)
#if ENABLE(Condition11) || ENABLE(Condition12)
// Attribute 'supplementalStr3' (Type: 'attribute' ExtAttr: 'CustomSetter CustomGetter Conditional ImplementedBy')
- {"supplementalStr3", TestInterfaceV8Internal::supplementalStr3AttrGetter, TestInterfaceV8Internal::supplementalStr3AttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
+ {"supplementalStr3", V8TestInterface::supplementalStr3AccessorGetter, V8TestInterface::supplementalStr3AccessorSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
#endif // ENABLE(Condition11) || ENABLE(Condition12)
#if ENABLE(Condition11) || ENABLE(Condition12)
// Attribute 'supplementalNode' (Type: 'attribute' ExtAttr: 'Conditional ImplementedBy')
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (142736 => 142737)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2013-02-13 11:59:49 UTC (rev 142736)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2013-02-13 12:57:21 UTC (rev 142737)
@@ -500,16 +500,6 @@
return;
}
-static v8::Handle<v8::Value> customAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
- return V8TestObj::customAttrAccessorGetter(name, info);
-}
-
-static void customAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
-{
- V8TestObj::customAttrAccessorSetter(name, value, info);
-}
-
static v8::Handle<v8::Value> withScriptStateAttributeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
TestObj* imp = V8TestObj::toNative(info.Holder());
@@ -1927,7 +1917,7 @@
// Attribute 'stringAttrWithSetterException' (Type: 'attribute' ExtAttr: '')
{"stringAttrWithSetterException", TestObjV8Internal::stringAttrWithSetterExceptionAttrGetter, TestObjV8Internal::stringAttrWithSetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
// Attribute 'customAttr' (Type: 'attribute' ExtAttr: 'Custom')
- {"customAttr", TestObjV8Internal::customAttrAttrGetter, TestObjV8Internal::customAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
+ {"customAttr", V8TestObj::customAttrAccessorGetter, V8TestObj::customAttrAccessorSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
// Attribute 'withScriptStateAttribute' (Type: 'attribute' ExtAttr: 'CallWith')
{"withScriptStateAttribute", TestObjV8Internal::withScriptStateAttributeAttrGetter, TestObjV8Internal::withScriptStateAttributeAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
// Attribute 'withScriptExecutionContextAttribute' (Type: 'attribute' ExtAttr: 'CallWith')
