Changeset 141551 in webkit

Timestamp:

Feb 1, 2013 12:44:24 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CPP,GObject,ObjC] Add 'static' skip to CodeGenerator{CPP,GObject,ObjC}.pm
​https://bugs.webkit.org/show_bug.cgi?id=108578

Patch by Nils Barth <​nbarth@google.com> on 2013-02-01
Reviewed by Kentaro Hara.

Since CPP/GObject/ObjC code generators (CodeGenerator{CPP,GObject,ObjC}.pm)
do not support static attributes, add test to skip these.
This lets us remove #if macro from static in test files and not need
these in future.

Test: bindings/scripts/test/TestObj.idl (run-bindings-test)
Test: bindings/scripts/test/TestSupplemental.idl (run-bindings-test)

• bindings/scripts/CodeGeneratorCPP.pm:

(SkipAttribute):

• bindings/scripts/CodeGeneratorGObject.pm:

(SkipAttribute):

• bindings/scripts/CodeGeneratorObjC.pm:

(SkipAttribute):

• bindings/scripts/test/TestObj.idl:
• bindings/scripts/test/TestSupplemental.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorCPP.pm (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (1 diff)
• bindings/scripts/CodeGeneratorObjC.pm (modified) (1 diff)
• bindings/scripts/test/TestObj.idl (modified) (1 diff)
• bindings/scripts/test/TestSupplemental.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  Nils Barth  <nbarth@google.com>
+
+        [CPP,GObject,ObjC] Add 'static' skip to CodeGenerator{CPP,GObject,ObjC}.pm
+        https://bugs.webkit.org/show_bug.cgi?id=108578
+
+        Reviewed by Kentaro Hara.
+
+        Since CPP/GObject/ObjC code generators (CodeGenerator{CPP,GObject,ObjC}.pm)
+        do not support static attributes, add test to skip these.
+        This lets us remove #if macro from static in test files and not need
+        these in future.
+
+        Test: bindings/scripts/test/TestObj.idl (run-bindings-test)
+        Test: bindings/scripts/test/TestSupplemental.idl (run-bindings-test)
+
+        * bindings/scripts/CodeGeneratorCPP.pm:
+        (SkipAttribute):
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (SkipAttribute):
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        (SkipAttribute):
+        * bindings/scripts/test/TestObj.idl:
+        * bindings/scripts/test/TestSupplemental.idl:
+
 2013-02-01  Kentaro Hara  <haraken@chromium.org>
 

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

@@ -206 +206 @@
 
     return 1 if $type =~ /Constructor$/;
-
+    return 1 if $attribute->isStatic;
     return 1 if $codeGenerator->IsTypedArrayType($type);
 

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

@@ -180 +180 @@
     }
 
+    return 1 if $attribute->isStatic;
     return 1 if $codeGenerator->IsTypedArrayType($propType);
 

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

@@ -453 +453 @@
     return 1 if $codeGenerator->IsTypedArrayType($type);
     return 1 if $codeGenerator->IsEnumType($type);
+    return 1 if $attribute->isStatic;
 
     # This is for DynamicsCompressorNode.idl

trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

@@ -41 +41 @@
     readonly attribute DOMString       readOnlyStringAttr;
     readonly attribute TestObj         readOnlyTestObjAttr;
-#if defined(TESTING_JS) || defined(TESTING_V8)
     static readonly attribute long     staticReadOnlyLongAttr;
     static attribute DOMString         staticStringAttr;
     static readonly attribute TestSubObjConstructor TestSubObj;
-#endif
     attribute TestEnumType             enumAttr;
     attribute short                    shortAttr;

trunk/Source/WebCore/bindings/scripts/test/TestSupplemental.idl

@@ -33 +33 @@
     Supplemental=TestInterface
 ] interface TestSupplemental {
-#if defined(TESTING_JS) || defined(TESTING_V8)
     static readonly attribute long supplementalStaticReadOnlyAttr;
     static attribute DOMString supplementalStaticAttr;
-#endif
     readonly attribute DOMString supplementalStr1;
     attribute DOMString supplementalStr2;