Changeset 123439 in webkit

Timestamp:

Jul 24, 2012 1:44:58 AM (12 years ago)

Author:

haraken@chromium.org

Message:

[JSC] REGRESSION(r122912): CodeGeneratorJS.pm generates wrong code
for static attributes in supplemental IDL files
​https://bugs.webkit.org/show_bug.cgi?id=91925

Reviewed by Adam Barth.

r122912 implemented static attributes in CodeGeneratorJS.pm.
However, it generates wrong code for static attributes in supplemental
IDL files. This patch fixes it as shown in JSTestInterface.cpp.
This fix aligns with the fix in CodeGeneratorV8.pm (r123308).

Test: bindings/scripts/test/TestSupplemental.idl

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

• bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr):
(WebCore::jsTestInterfaceConstructorSupplementalStaticAttr):
(WebCore::setJSTestInterfaceConstructorSupplementalStaticAttr):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• bindings/scripts/test/JS/JSTestInterface.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-24  Kentaro Hara  <haraken@chromium.org>
+
+        [JSC] REGRESSION(r122912): CodeGeneratorJS.pm generates wrong code
+        for static attributes in supplemental IDL files
+        https://bugs.webkit.org/show_bug.cgi?id=91925
+
+        Reviewed by Adam Barth.
+
+        r122912 implemented static attributes in CodeGeneratorJS.pm.
+        However, it generates wrong code for static attributes in supplemental
+        IDL files. This patch fixes it as shown in JSTestInterface.cpp.
+        This fix aligns with the fix in CodeGeneratorV8.pm (r123308).
+
+        Test: bindings/scripts/test/TestSupplemental.idl
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        * bindings/scripts/test/JS/JSTestInterface.cpp:
+        (WebCore::jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr):
+        (WebCore::jsTestInterfaceConstructorSupplementalStaticAttr):
+        (WebCore::setJSTestInterfaceConstructorSupplementalStaticAttr):
+
 2012-07-24  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

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

@@ -1843 +1843 @@
                             $implIncludes{"${implementedBy}.h"} = 1;
                             $functionName = "${implementedBy}::${functionName}";
-                            unshift(@arguments, "impl");
+                            unshift(@arguments, "impl") if !$attribute->isStatic;
                         } elsif ($attribute->isStatic) {
                             $functionName = "${implClassName}::${functionName}";
@@ -2072 +2072 @@
                                         my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
                                         $implIncludes{"${implementedBy}.h"} = 1;
-                                        unshift(@arguments, "impl");
+                                        unshift(@arguments, "impl") if !$attribute->isStatic;
                                         $functionName = "${implementedBy}::${functionName}";
                                     } elsif ($attribute->isStatic) {

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

@@ -246 +246 @@
 {
     UNUSED_PARAM(exec);
-    JSValue result = jsNumber(TestSupplemental::supplementalStaticReadOnlyAttr(impl));
+    JSValue result = jsNumber(TestSupplemental::supplementalStaticReadOnlyAttr());
     return result;
 }
@@ -256 +256 @@
 {
     UNUSED_PARAM(exec);
-    JSValue result = jsString(exec, TestSupplemental::supplementalStaticAttr(impl));
+    JSValue result = jsString(exec, TestSupplemental::supplementalStaticAttr());
     return result;
 }
@@ -326 +326 @@
 {
     UNUSED_PARAM(exec);
-    TestSupplemental::setSupplementalStaticAttr(impl, ustringToString(value.isEmpty() ? UString() : value.toString(exec)->value(exec)));
+    TestSupplemental::setSupplementalStaticAttr(ustringToString(value.isEmpty() ? UString() : value.toString(exec)->value(exec)));
 }