Changeset 142737 in webkit

Timestamp:

Feb 13, 2013 4:57:21 AM (11 years ago)

Author:

haraken@chromium.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (4 diffs)
• bindings/scripts/test/V8/V8TestInterface.cpp (modified) (2 diffs)
• bindings/scripts/test/V8/V8TestObj.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-13  Kentaro Hara  <haraken@chromium.org>
+
+        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  <tczene@inf.u-szeged.hu>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -899 +899 @@
     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);
@@ -1184 +1174 @@
     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
@@ -2328 +2308 @@
             $setter = "${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter";
         }
+
+        if (HasCustomSetter($attrExt)) {
+            $setter = "V8${customAccessor}AccessorSetter";
+        }
+
+        if (HasCustomGetter($attrExt)) {
+            $getter = "V8${customAccessor}AccessorGetter";
+        }
     }
 
@@ -2725 +2713 @@
         }
 
-        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);
         }

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp

@@ -126 +126 @@
     TestSupplemental::setSupplementalStr2(imp, v);
     return;
-}
-
-#endif // ENABLE(Condition11) || ENABLE(Condition12)
-
-#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);
 }
 
@@ -235 +217 @@
 #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)

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

@@ -499 +499 @@
         setDOMException(ec, info.GetIsolate());
     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);
 }
 
@@ -1928 +1918 @@
     {"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 */},