Changeset 136491 in webkit


Ignore:
Timestamp:
Dec 4, 2012 1:42:07 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Simplify GObject DOM bindings code for handling properties
​https://bugs.webkit.org/show_bug.cgi?id=101072

Reviewed by Xan Lopez.

Do not override GObjectClass::set_property if the wrapped object
doesn't have writable properties, and don't override
GObjectClass::get_property if the wrapped object doesn't have
properties at all. It reduces some GObject boilerplate in
generated code for some objects.

  • bindings/scripts/CodeGeneratorGObject.pm:

(GenerateProperties):

  • bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:

(webkit_dom_float64array_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:

(webkit_dom_test_active_dom_object_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:

(webkit_dom_test_callback_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:

(webkit_dom_test_custom_named_getter_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:

(webkit_dom_test_event_constructor_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:

(webkit_dom_test_event_target_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestException.cpp:

(webkit_dom_test_exception_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:

(webkit_dom_test_interface_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:

(webkit_dom_test_media_query_list_listener_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:

(webkit_dom_test_named_constructor_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:

(webkit_dom_test_node_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:

(webkit_dom_test_obj_class_init):

  • bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:

(webkit_dom_test_serialized_script_value_interface_class_init):

Location:
trunk/Source/WebCore
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r136490 r136491  
     12012-12-03  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Simplify GObject DOM bindings code for handling properties
     4        https://bugs.webkit.org/show_bug.cgi?id=101072
     5
     6        Reviewed by Xan Lopez.
     7
     8        Do not override GObjectClass::set_property if the wrapped object
     9        doesn't have writable properties, and don't override
     10        GObjectClass::get_property if the wrapped object doesn't have
     11        properties at all. It reduces some GObject boilerplate in
     12        generated code for some objects.
     13
     14        * bindings/scripts/CodeGeneratorGObject.pm:
     15        (GenerateProperties):
     16        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
     17        (webkit_dom_float64array_class_init):
     18        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
     19        (webkit_dom_test_active_dom_object_class_init):
     20        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
     21        (webkit_dom_test_callback_class_init):
     22        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:
     23        (webkit_dom_test_custom_named_getter_class_init):
     24        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
     25        (webkit_dom_test_event_constructor_class_init):
     26        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
     27        (webkit_dom_test_event_target_class_init):
     28        * bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
     29        (webkit_dom_test_exception_class_init):
     30        * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
     31        (webkit_dom_test_interface_class_init):
     32        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
     33        (webkit_dom_test_media_query_list_listener_class_init):
     34        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:
     35        (webkit_dom_test_named_constructor_class_init):
     36        * bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:
     37        (webkit_dom_test_node_class_init):
     38        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
     39        (webkit_dom_test_obj_class_init):
     40        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
     41        (webkit_dom_test_serialized_script_value_interface_class_init):
     42
    1432012-12-04  Kentaro Hara  <haraken@chromium.org>
    244

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

    r135426 r136491  
    552552    # Properties
    553553    my $implContent = "";
     554    my @readableProperties = GetReadableProperties($interface->attributes);
     555    my @writeableProperties = GetWriteableProperties(\@readableProperties);
     556    my $numProperties = scalar @readableProperties;
    554557
    555558    # Properties
    556     $implContent = << "EOF";
     559    my $privFunction = GetCoreObject($interfaceName, "coreSelf", "self");
     560    if ($numProperties > 0) {
     561        $implContent = << "EOF";
    557562enum {
    558563    PROP_0,
    559564EOF
    560     push(@cBodyProperties, $implContent);
    561 
    562     my @readableProperties = GetReadableProperties($interface->attributes);
    563 
    564     my $privFunction = GetCoreObject($interfaceName, "coreSelf", "self");
    565 
    566     my $txtGetProp = << "EOF";
     565        push(@cBodyProperties, $implContent);
     566
     567        my $txtGetProp = << "EOF";
    567568static void ${lowerCaseIfaceName}_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    568569{
    569570    WebCore::JSMainThreadNullState state;
    570571EOF
    571     push(@txtGetProps, $txtGetProp);
    572     if (scalar @readableProperties > 0) {
     572        push(@txtGetProps, $txtGetProp);
    573573        $txtGetProp = << "EOF";
    574574$conditionGuardStart
    … …  
    578578EOF
    579579        push(@txtGetProps, $txtGetProp);
    580     }
    581 
    582     $txtGetProp = << "EOF";
     580
     581        $txtGetProp = << "EOF";
    583582    switch (propertyId) {
    584583EOF
    585     push(@txtGetProps, $txtGetProp);
    586 
    587     my @writeableProperties = GetWriteableProperties(\@readableProperties);
    588 
    589     my $txtSetProps = << "EOF";
     584        push(@txtGetProps, $txtGetProp);
     585
     586        if (scalar @writeableProperties > 0) {
     587            my $txtSetProps = << "EOF";
    590588static void ${lowerCaseIfaceName}_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    591589{
    592590    WebCore::JSMainThreadNullState state;
    593591EOF
    594     push(@txtSetProps, $txtSetProps);
    595 
    596     if (scalar @writeableProperties > 0) {
    597         $txtSetProps = << "EOF";
     592            push(@txtSetProps, $txtSetProps);
     593
     594            $txtSetProps = << "EOF";
    598595$conditionGuardStart
    599596    ${className}* self = WEBKIT_DOM_${clsCaps}(object);
    … …  
    601598$conditionGuardEnd
    602599EOF
    603         push(@txtSetProps, $txtSetProps);
    604     }
    605 
    606     $txtSetProps = << "EOF";
     600            push(@txtSetProps, $txtSetProps);
     601
     602            $txtSetProps = << "EOF";
    607603    switch (propertyId) {
    608604EOF
    609     push(@txtSetProps, $txtSetProps);
    610 
    611     foreach my $attribute (@readableProperties) {
    612         if ($attribute->signature->type ne "EventListener" &&
    613             $attribute->signature->type ne "MediaQueryListListener") {
    614             GenerateProperty($attribute, $interfaceName, \@writeableProperties, $interface);
    615         }
    616     }
    617 
    618     push(@cBodyProperties, "};\n\n");
    619 
    620     $txtGetProp = << "EOF";
     605            push(@txtSetProps, $txtSetProps);
     606        }
     607
     608        foreach my $attribute (@readableProperties) {
     609            if ($attribute->signature->type ne "EventListener" &&
     610                $attribute->signature->type ne "MediaQueryListListener") {
     611                GenerateProperty($attribute, $interfaceName, \@writeableProperties, $interface);
     612            }
     613        }
     614
     615        push(@cBodyProperties, "};\n\n");
     616
     617        $txtGetProp = << "EOF";
    621618    default:
    622619        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    … …  
    625622}
    626623EOF
    627     push(@txtGetProps, $txtGetProp);
    628 
    629     $txtSetProps = << "EOF";
     624        push(@txtGetProps, $txtGetProp);
     625
     626        if (scalar @writeableProperties > 0) {
     627            $txtSetProps = << "EOF";
    630628    default:
    631629        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    … …  
    634632}
    635633EOF
    636     push(@txtSetProps, $txtSetProps);
     634            push(@txtSetProps, $txtSetProps);
     635        }
     636    }
    637637
    638638    # Do not insert extra spaces when interpolating array variables
    … …  
    658658}
    659659
    660 @txtSetProps
    661 
    662 @txtGetProps
    663 
     660EOF
     661    push(@cBodyProperties, $implContent);
     662
     663    if ($numProperties > 0) {
     664        if (scalar @writeableProperties > 0) {
     665            push(@cBodyProperties, @txtSetProps);
     666            push(@cBodyProperties, "\n");
     667        }
     668        push(@cBodyProperties, @txtGetProps);
     669        push(@cBodyProperties, "\n");
     670    }
     671
     672    if (scalar @txtInstallEventListeners > 0) {
     673        $implContent = << "EOF";
    664674static void ${lowerCaseIfaceName}_constructed(GObject* object)
    665675{
    666 EOF
    667     push(@cBodyProperties, $implContent);
     676    G_OBJECT_CLASS(${lowerCaseIfaceName}_parent_class)->constructed(object);
     677EOF
     678        push(@cBodyProperties, $implContent);
     679        push(@cBodyProperties, "\n");
     680        push(@cBodyProperties, @txtInstallEventListeners);
     681
     682        $implContent = << "EOF";
     683}
     684
     685EOF
     686        push(@cBodyProperties, $implContent);
     687    }
    668688
    669689    $implContent = << "EOF";
    670 @txtInstallEventListeners
    671     if (G_OBJECT_CLASS(${lowerCaseIfaceName}_parent_class)->constructed)
    672         G_OBJECT_CLASS(${lowerCaseIfaceName}_parent_class)->constructed(object);
    673 }
    674 
    675690static void ${lowerCaseIfaceName}_class_init(${className}Class* requestClass)
    676691{
    677692    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    678693    gobjectClass->finalize = ${lowerCaseIfaceName}_finalize;
    679     gobjectClass->set_property = ${lowerCaseIfaceName}_set_property;
    680     gobjectClass->get_property = ${lowerCaseIfaceName}_get_property;
    681     gobjectClass->constructed = ${lowerCaseIfaceName}_constructed;
    682 
    683 @txtInstallProps
    684 @txtInstallSignals
     694EOF
     695    push(@cBodyProperties, $implContent);
     696
     697    if (scalar @txtInstallEventListeners > 0) {
     698        push(@cBodyProperties, "    gobjectClass->constructed = ${lowerCaseIfaceName}_constructed;\n");
     699    }
     700
     701    if ($numProperties > 0) {
     702        if (scalar @writeableProperties > 0) {
     703            push(@cBodyProperties, "    gobjectClass->set_property = ${lowerCaseIfaceName}_set_property;\n");
     704        }
     705        push(@cBodyProperties, "    gobjectClass->get_property = ${lowerCaseIfaceName}_get_property;\n");
     706        push(@cBodyProperties, "\n");
     707        push(@cBodyProperties, @txtInstallProps);
     708    }
     709
     710    if (scalar @txtInstallSignals > 0) {
     711        push(@cBodyProperties, "\n");
     712        push(@cBodyProperties, @txtInstallSignals);
     713    }
     714    $implContent = << "EOF";
    685715}
    686716

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp

    r133893 r136491  
    7171G_DEFINE_TYPE(WebKitDOMFloat64Array, webkit_dom_float64array, WEBKIT_TYPE_DOM_ARRAY_BUFFER_VIEW)
    7272
    73 enum {
    74     PROP_0,
    75 };
    76 
    7773static void webkit_dom_float64array_finalize(GObject* object)
    7874{
    … …  
    9389}
    9490
    95 static void webkit_dom_float64array_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    96 {
    97     WebCore::JSMainThreadNullState state;
    98     switch (propertyId) {
    99     default:
    100         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    101         break;
    102     }
    103 }
    104 
    105 
    106 static void webkit_dom_float64array_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    107 {
    108     WebCore::JSMainThreadNullState state;
    109     switch (propertyId) {
    110     default:
    111         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    112         break;
    113     }
    114 }
    115 
    116 
    117 static void webkit_dom_float64array_constructed(GObject* object)
    118 {
    119 
    120     if (G_OBJECT_CLASS(webkit_dom_float64array_parent_class)->constructed)
    121         G_OBJECT_CLASS(webkit_dom_float64array_parent_class)->constructed(object);
    122 }
    123 
    12491static void webkit_dom_float64array_class_init(WebKitDOMFloat64ArrayClass* requestClass)
    12592{
    12693    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    12794    gobjectClass->finalize = webkit_dom_float64array_finalize;
    128     gobjectClass->set_property = webkit_dom_float64array_set_property;
    129     gobjectClass->get_property = webkit_dom_float64array_get_property;
    130     gobjectClass->constructed = webkit_dom_float64array_constructed;
    131 
    132 
    133 
    13495}
    13596

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp

    r133893 r136491  
    9393}
    9494
    95 static void webkit_dom_test_active_dom_object_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    96 {
    97     WebCore::JSMainThreadNullState state;
    98     switch (propertyId) {
    99     default:
    100         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    101         break;
    102     }
    103 }
    104 
    105 
    10695static void webkit_dom_test_active_dom_object_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    10796{
    … …  
    122111}
    123112
    124 
    125 static void webkit_dom_test_active_dom_object_constructed(GObject* object)
    126 {
    127 
    128     if (G_OBJECT_CLASS(webkit_dom_test_active_dom_object_parent_class)->constructed)
    129         G_OBJECT_CLASS(webkit_dom_test_active_dom_object_parent_class)->constructed(object);
    130 }
    131 
    132113static void webkit_dom_test_active_dom_object_class_init(WebKitDOMTestActiveDOMObjectClass* requestClass)
    133114{
    134115    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    135116    gobjectClass->finalize = webkit_dom_test_active_dom_object_finalize;
    136     gobjectClass->set_property = webkit_dom_test_active_dom_object_set_property;
    137117    gobjectClass->get_property = webkit_dom_test_active_dom_object_get_property;
    138     gobjectClass->constructed = webkit_dom_test_active_dom_object_constructed;
    139118
    140119    g_object_class_install_property(gobjectClass,
    … …  
    1471260, /* default */
    148127                                                           WEBKIT_PARAM_READABLE));
    149 
    150 
    151128}
    152129

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp

    r133893 r136491  
    7979G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_TYPE_DOM_OBJECT)
    8080
    81 enum {
    82     PROP_0,
    83 };
    84 
    8581static void webkit_dom_test_callback_finalize(GObject* object)
    8682{
    … …  
    10197}
    10298
    103 static void webkit_dom_test_callback_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    104 {
    105     WebCore::JSMainThreadNullState state;
    106     switch (propertyId) {
    107     default:
    108         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    109         break;
    110     }
    111 }
    112 
    113 
    114 static void webkit_dom_test_callback_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    115 {
    116     WebCore::JSMainThreadNullState state;
    117     switch (propertyId) {
    118     default:
    119         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    120         break;
    121     }
    122 }
    123 
    124 
    125 static void webkit_dom_test_callback_constructed(GObject* object)
    126 {
    127 
    128     if (G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->constructed)
    129         G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->constructed(object);
    130 }
    131 
    13299static void webkit_dom_test_callback_class_init(WebKitDOMTestCallbackClass* requestClass)
    133100{
    134101    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    135102    gobjectClass->finalize = webkit_dom_test_callback_finalize;
    136     gobjectClass->set_property = webkit_dom_test_callback_set_property;
    137     gobjectClass->get_property = webkit_dom_test_callback_get_property;
    138     gobjectClass->constructed = webkit_dom_test_callback_constructed;
    139 
    140 
    141 
    142103}
    143104

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp

    r133893 r136491  
    6969G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_TYPE_DOM_OBJECT)
    7070
    71 enum {
    72     PROP_0,
    73 };
    74 
    7571static void webkit_dom_test_custom_named_getter_finalize(GObject* object)
    7672{
    … …  
    9187}
    9288
    93 static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    94 {
    95     WebCore::JSMainThreadNullState state;
    96     switch (propertyId) {
    97     default:
    98         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    99         break;
    100     }
    101 }
    102 
    103 
    104 static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    105 {
    106     WebCore::JSMainThreadNullState state;
    107     switch (propertyId) {
    108     default:
    109         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    110         break;
    111     }
    112 }
    113 
    114 
    115 static void webkit_dom_test_custom_named_getter_constructed(GObject* object)
    116 {
    117 
    118     if (G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->constructed)
    119         G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->constructed(object);
    120 }
    121 
    12289static void webkit_dom_test_custom_named_getter_class_init(WebKitDOMTestCustomNamedGetterClass* requestClass)
    12390{
    12491    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    12592    gobjectClass->finalize = webkit_dom_test_custom_named_getter_finalize;
    126     gobjectClass->set_property = webkit_dom_test_custom_named_getter_set_property;
    127     gobjectClass->get_property = webkit_dom_test_custom_named_getter_get_property;
    128     gobjectClass->constructed = webkit_dom_test_custom_named_getter_constructed;
    129 
    130 
    131 
    13293}
    13394

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp

    r133893 r136491  
    9393}
    9494
    95 static void webkit_dom_test_event_constructor_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    96 {
    97     WebCore::JSMainThreadNullState state;
    98     switch (propertyId) {
    99     default:
    100         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    101         break;
    102     }
    103 }
    104 
    105 
    10695static void webkit_dom_test_event_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    10796{
    … …  
    126115}
    127116
    128 
    129 static void webkit_dom_test_event_constructor_constructed(GObject* object)
    130 {
    131 
    132     if (G_OBJECT_CLASS(webkit_dom_test_event_constructor_parent_class)->constructed)
    133         G_OBJECT_CLASS(webkit_dom_test_event_constructor_parent_class)->constructed(object);
    134 }
    135 
    136117static void webkit_dom_test_event_constructor_class_init(WebKitDOMTestEventConstructorClass* requestClass)
    137118{
    138119    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    139120    gobjectClass->finalize = webkit_dom_test_event_constructor_finalize;
    140     gobjectClass->set_property = webkit_dom_test_event_constructor_set_property;
    141121    gobjectClass->get_property = webkit_dom_test_event_constructor_get_property;
    142     gobjectClass->constructed = webkit_dom_test_event_constructor_constructed;
    143122
    144123    g_object_class_install_property(gobjectClass,
    … …  
    156135                                                           "", /* default */
    157136                                                           WEBKIT_PARAM_READABLE));
    158 
    159 
    160137}
    161138

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp

    r133893 r136491  
    105105G_DEFINE_TYPE_WITH_CODE(WebKitDOMTestEventTarget, webkit_dom_test_event_target, WEBKIT_TYPE_DOM_OBJECT, G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_DOM_EVENT_TARGET, webkit_dom_event_target_init))
    106106
    107 enum {
    108     PROP_0,
    109 };
    110 
    111107static void webkit_dom_test_event_target_finalize(GObject* object)
    112108{
    … …  
    127123}
    128124
    129 static void webkit_dom_test_event_target_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    130 {
    131     WebCore::JSMainThreadNullState state;
    132     switch (propertyId) {
    133     default:
    134         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    135         break;
    136     }
    137 }
    138 
    139 
    140 static void webkit_dom_test_event_target_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    141 {
    142     WebCore::JSMainThreadNullState state;
    143     switch (propertyId) {
    144     default:
    145         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    146         break;
    147     }
    148 }
    149 
    150 
    151 static void webkit_dom_test_event_target_constructed(GObject* object)
    152 {
    153 
    154     if (G_OBJECT_CLASS(webkit_dom_test_event_target_parent_class)->constructed)
    155         G_OBJECT_CLASS(webkit_dom_test_event_target_parent_class)->constructed(object);
    156 }
    157 
    158125static void webkit_dom_test_event_target_class_init(WebKitDOMTestEventTargetClass* requestClass)
    159126{
    160127    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    161128    gobjectClass->finalize = webkit_dom_test_event_target_finalize;
    162     gobjectClass->set_property = webkit_dom_test_event_target_set_property;
    163     gobjectClass->get_property = webkit_dom_test_event_target_get_property;
    164     gobjectClass->constructed = webkit_dom_test_event_target_constructed;
    165 
    166 
    167 
    168129}
    169130

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp

    r133893 r136491  
    9292}
    9393
    94 static void webkit_dom_test_exception_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    95 {
    96     WebCore::JSMainThreadNullState state;
    97     switch (propertyId) {
    98     default:
    99         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    100         break;
    101     }
    102 }
    103 
    104 
    10594static void webkit_dom_test_exception_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    10695{
    … …  
    121110}
    122111
    123 
    124 static void webkit_dom_test_exception_constructed(GObject* object)
    125 {
    126 
    127     if (G_OBJECT_CLASS(webkit_dom_test_exception_parent_class)->constructed)
    128         G_OBJECT_CLASS(webkit_dom_test_exception_parent_class)->constructed(object);
    129 }
    130 
    131112static void webkit_dom_test_exception_class_init(WebKitDOMTestExceptionClass* requestClass)
    132113{
    133114    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    134115    gobjectClass->finalize = webkit_dom_test_exception_finalize;
    135     gobjectClass->set_property = webkit_dom_test_exception_set_property;
    136116    gobjectClass->get_property = webkit_dom_test_exception_get_property;
    137     gobjectClass->constructed = webkit_dom_test_exception_constructed;
    138117
    139118    g_object_class_install_property(gobjectClass,
    … …  
    144123                                                           "", /* default */
    145124                                                           WEBKIT_PARAM_READABLE));
    146 
    147 
    148125}
    149126

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp

    r133893 r136491  
    129129}
    130130
    131 
    132131static void webkit_dom_test_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    133132{
    … …  
    187186}
    188187
    189 
    190 static void webkit_dom_test_interface_constructed(GObject* object)
    191 {
    192 
    193     if (G_OBJECT_CLASS(webkit_dom_test_interface_parent_class)->constructed)
    194         G_OBJECT_CLASS(webkit_dom_test_interface_parent_class)->constructed(object);
    195 }
    196 
    197188static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* requestClass)
    198189{
    … …  
    201192    gobjectClass->set_property = webkit_dom_test_interface_set_property;
    202193    gobjectClass->get_property = webkit_dom_test_interface_get_property;
    203     gobjectClass->constructed = webkit_dom_test_interface_constructed;
    204194
    205195    g_object_class_install_property(gobjectClass,
    … …  
    224214                                                           WEBKIT_TYPE_DOM_NODE, /* gobject type */
    225215                                                           WEBKIT_PARAM_READWRITE));
    226 
    227 
    228216}
    229217

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp

    r133893 r136491  
    6969G_DEFINE_TYPE(WebKitDOMTestMediaQueryListListener, webkit_dom_test_media_query_list_listener, WEBKIT_TYPE_DOM_OBJECT)
    7070
    71 enum {
    72     PROP_0,
    73 };
    74 
    7571static void webkit_dom_test_media_query_list_listener_finalize(GObject* object)
    7672{
    … …  
    9187}
    9288
    93 static void webkit_dom_test_media_query_list_listener_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    94 {
    95     WebCore::JSMainThreadNullState state;
    96     switch (propertyId) {
    97     default:
    98         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    99         break;
    100     }
    101 }
    102 
    103 
    104 static void webkit_dom_test_media_query_list_listener_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    105 {
    106     WebCore::JSMainThreadNullState state;
    107     switch (propertyId) {
    108     default:
    109         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    110         break;
    111     }
    112 }
    113 
    114 
    115 static void webkit_dom_test_media_query_list_listener_constructed(GObject* object)
    116 {
    117 
    118     if (G_OBJECT_CLASS(webkit_dom_test_media_query_list_listener_parent_class)->constructed)
    119         G_OBJECT_CLASS(webkit_dom_test_media_query_list_listener_parent_class)->constructed(object);
    120 }
    121 
    12289static void webkit_dom_test_media_query_list_listener_class_init(WebKitDOMTestMediaQueryListListenerClass* requestClass)
    12390{
    12491    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    12592    gobjectClass->finalize = webkit_dom_test_media_query_list_listener_finalize;
    126     gobjectClass->set_property = webkit_dom_test_media_query_list_listener_set_property;
    127     gobjectClass->get_property = webkit_dom_test_media_query_list_listener_get_property;
    128     gobjectClass->constructed = webkit_dom_test_media_query_list_listener_constructed;
    129 
    130 
    131 
    13293}
    13394

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp

    r133893 r136491  
    6969G_DEFINE_TYPE(WebKitDOMTestNamedConstructor, webkit_dom_test_named_constructor, WEBKIT_TYPE_DOM_OBJECT)
    7070
    71 enum {
    72     PROP_0,
    73 };
    74 
    7571static void webkit_dom_test_named_constructor_finalize(GObject* object)
    7672{
    … …  
    9187}
    9288
    93 static void webkit_dom_test_named_constructor_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    94 {
    95     WebCore::JSMainThreadNullState state;
    96     switch (propertyId) {
    97     default:
    98         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    99         break;
    100     }
    101 }
    102 
    103 
    104 static void webkit_dom_test_named_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    105 {
    106     WebCore::JSMainThreadNullState state;
    107     switch (propertyId) {
    108     default:
    109         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    110         break;
    111     }
    112 }
    113 
    114 
    115 static void webkit_dom_test_named_constructor_constructed(GObject* object)
    116 {
    117 
    118     if (G_OBJECT_CLASS(webkit_dom_test_named_constructor_parent_class)->constructed)
    119         G_OBJECT_CLASS(webkit_dom_test_named_constructor_parent_class)->constructed(object);
    120 }
    121 
    12289static void webkit_dom_test_named_constructor_class_init(WebKitDOMTestNamedConstructorClass* requestClass)
    12390{
    12491    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    12592    gobjectClass->finalize = webkit_dom_test_named_constructor_finalize;
    126     gobjectClass->set_property = webkit_dom_test_named_constructor_set_property;
    127     gobjectClass->get_property = webkit_dom_test_named_constructor_get_property;
    128     gobjectClass->constructed = webkit_dom_test_named_constructor_constructed;
    129 
    130 
    131 
    13293}
    13394

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp

    r133893 r136491  
    104104G_DEFINE_TYPE_WITH_CODE(WebKitDOMTestNode, webkit_dom_test_node, WEBKIT_TYPE_DOM_NODE, G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_DOM_EVENT_TARGET, webkit_dom_event_target_init))
    105105
    106 enum {
    107     PROP_0,
    108 };
    109 
    110106static void webkit_dom_test_node_finalize(GObject* object)
    111107{
    … …  
    126122}
    127123
    128 static void webkit_dom_test_node_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    129 {
    130     WebCore::JSMainThreadNullState state;
    131     switch (propertyId) {
    132     default:
    133         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    134         break;
    135     }
    136 }
    137 
    138 
    139 static void webkit_dom_test_node_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    140 {
    141     WebCore::JSMainThreadNullState state;
    142     switch (propertyId) {
    143     default:
    144         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    145         break;
    146     }
    147 }
    148 
    149 
    150 static void webkit_dom_test_node_constructed(GObject* object)
    151 {
    152 
    153     if (G_OBJECT_CLASS(webkit_dom_test_node_parent_class)->constructed)
    154         G_OBJECT_CLASS(webkit_dom_test_node_parent_class)->constructed(object);
    155 }
    156 
    157124static void webkit_dom_test_node_class_init(WebKitDOMTestNodeClass* requestClass)
    158125{
    159126    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    160127    gobjectClass->finalize = webkit_dom_test_node_finalize;
    161     gobjectClass->set_property = webkit_dom_test_node_set_property;
    162     gobjectClass->get_property = webkit_dom_test_node_get_property;
    163     gobjectClass->constructed = webkit_dom_test_node_constructed;
    164 
    165 
    166 
    167128}
    168129

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp

    r133893 r136491  
    284284}
    285285
    286 
    287286static void webkit_dom_test_obj_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    288287{
    … …  
    520519}
    521520
    522 
    523 static void webkit_dom_test_obj_constructed(GObject* object)
    524 {
    525 
    526     if (G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->constructed)
    527         G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->constructed(object);
    528 }
    529 
    530521static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
    531522{
    … …  
    534525    gobjectClass->set_property = webkit_dom_test_obj_set_property;
    535526    gobjectClass->get_property = webkit_dom_test_obj_get_property;
    536     gobjectClass->constructed = webkit_dom_test_obj_constructed;
    537527
    538528    g_object_class_install_property(gobjectClass,
    … …  
    8988880, /* default */
    899889                                                           WEBKIT_PARAM_READABLE));
    900 
    901 
    902890}
    903891

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp

    r134221 r136491  
    6969G_DEFINE_TYPE(WebKitDOMTestOverloadedConstructors, webkit_dom_test_overloaded_constructors, WEBKIT_TYPE_DOM_OBJECT)
    7070
    71 enum {
    72     PROP_0,
    73 };
    74 
    7571static void webkit_dom_test_overloaded_constructors_finalize(GObject* object)
    7672{
    … …  
    9187}
    9288
    93 static void webkit_dom_test_overloaded_constructors_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    94 {
    95     WebCore::JSMainThreadNullState state;
    96     switch (propertyId) {
    97     default:
    98         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    99         break;
    100     }
    101 }
    102 
    103 
    104 static void webkit_dom_test_overloaded_constructors_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    105 {
    106     WebCore::JSMainThreadNullState state;
    107     switch (propertyId) {
    108     default:
    109         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    110         break;
    111     }
    112 }
    113 
    114 
    115 static void webkit_dom_test_overloaded_constructors_constructed(GObject* object)
    116 {
    117 
    118     if (G_OBJECT_CLASS(webkit_dom_test_overloaded_constructors_parent_class)->constructed)
    119         G_OBJECT_CLASS(webkit_dom_test_overloaded_constructors_parent_class)->constructed(object);
    120 }
    121 
    12289static void webkit_dom_test_overloaded_constructors_class_init(WebKitDOMTestOverloadedConstructorsClass* requestClass)
    12390{
    12491    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    12592    gobjectClass->finalize = webkit_dom_test_overloaded_constructors_finalize;
    126     gobjectClass->set_property = webkit_dom_test_overloaded_constructors_set_property;
    127     gobjectClass->get_property = webkit_dom_test_overloaded_constructors_get_property;
    128     gobjectClass->constructed = webkit_dom_test_overloaded_constructors_constructed;
    129 
    130 
    131 
    13293}
    13394

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp

    r133893 r136491  
    103103}
    104104
    105 static void webkit_dom_test_serialized_script_value_interface_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
    106 {
    107     WebCore::JSMainThreadNullState state;
    108     switch (propertyId) {
    109     default:
    110         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
    111         break;
    112     }
    113 }
    114 
    115 
    116105static void webkit_dom_test_serialized_script_value_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
    117106{
    … …  
    178167}
    179168
    180 
    181 static void webkit_dom_test_serialized_script_value_interface_constructed(GObject* object)
    182 {
    183 
    184     if (G_OBJECT_CLASS(webkit_dom_test_serialized_script_value_interface_parent_class)->constructed)
    185         G_OBJECT_CLASS(webkit_dom_test_serialized_script_value_interface_parent_class)->constructed(object);
    186 }
    187 
    188169static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitDOMTestSerializedScriptValueInterfaceClass* requestClass)
    189170{
    190171    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
    191172    gobjectClass->finalize = webkit_dom_test_serialized_script_value_interface_finalize;
    192     gobjectClass->set_property = webkit_dom_test_serialized_script_value_interface_set_property;
    193173    gobjectClass->get_property = webkit_dom_test_serialized_script_value_interface_get_property;
    194     gobjectClass->constructed = webkit_dom_test_serialized_script_value_interface_constructed;
    195174
    196175    g_object_class_install_property(gobjectClass,
    … …  
    229208                                                           WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE, /* gobject type */
    230209                                                           WEBKIT_PARAM_READABLE));
    231 
    232 
    233210}
    234211
Note: See TracChangeset for help on using the changeset viewer.