[GTK] Ignore [Custom] attributes in CodeGeneratorGObject.pm

https://bugs.webkit.org/show_bug.cgi?id=78059

Reviewed by Adam Barth.

CodeGeneratorGObject.pm does not support custom attributes.
We can skip generating code for attributes with [Custom].
The change would make sense, since CodeGeneratorGObject.pm already
skips attributes with [CustomGetter] or [CustomSetter].

Test: bindings/scripts/test/TestObj.idl

* bindings/scripts/CodeGeneratorGObject.pm:
(SkipAttribute):
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ff75d0b..b715637 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2012-02-07  Kentaro Hara  <haraken@chromium.org>
+
+        [GTK] Ignore [Custom] attributes in CodeGeneratorGObject.pm
+        https://bugs.webkit.org/show_bug.cgi?id=78059
+
+        Reviewed by Adam Barth.
+
+        CodeGeneratorGObject.pm does not support custom attributes.
+        We can skip generating code for attributes with [Custom].
+        The change would make sense, since CodeGeneratorGObject.pm already
+        skips attributes with [CustomGetter] or [CustomSetter].
+
+        Test: bindings/scripts/test/TestObj.idl
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (SkipAttribute):
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+
 2012-02-07  Emil A Eklund  <eae@chromium.org>
 
         Add pixelSnappedX/Y/Width/Height methods

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
index 5d26414..6edfd0c 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
@@ -152,9 +152,10 @@ sub GetCoreObject {
 
 sub SkipAttribute {
     my $attribute = shift;
-    
-    if ($attribute->signature->extendedAttributes->{"CustomGetter"} ||
-        $attribute->signature->extendedAttributes->{"CustomSetter"}) {
+
+    if ($attribute->signature->extendedAttributes->{"Custom"}
+        || $attribute->signature->extendedAttributes->{"CustomGetter"}
+        || $attribute->signature->extendedAttributes->{"CustomSetter"}) {
         return 1;
     }
 

diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
index 63a37b6..5f9f95f 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
@@ -1406,7 +1406,6 @@ enum {
     PROP_ATTR_WITH_SETTER_EXCEPTION,
     PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
     PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
-    PROP_CUSTOM_ATTR,
     PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
     PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
     PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,