Changeset 190038 in webkit


Ignore:
Timestamp:
Sep 20, 2015 8:24:36 PM (9 years ago)
Author:
Chris Dumez
Message:

Unreviewed attempt to fix the GTK build after r190017.

  • bindings/scripts/CodeGeneratorGObject.pm:

(SkipFunction):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r190036 r190038  
     12015-09-20  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed attempt to fix the GTK build after r190017.
     4
     5        * bindings/scripts/CodeGeneratorGObject.pm:
     6        (SkipFunction):
     7
    182015-09-20  Chris Dumez  <cdumez@apple.com>
    29

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

    r189855 r190038  
    286286    my $isCustomFunction = $function->signature->extendedAttributes->{"Custom"} || $function->signature->extendedAttributes->{"CustomBinding"};
    287287    my $callWith = $function->signature->extendedAttributes->{"CallWith"};
    288     my $isUnsupportedCallWith = $codeGenerator->ExtendedAttributeContains($callWith, "ScriptArguments") || $codeGenerator->ExtendedAttributeContains($callWith, "CallStack");
     288    my $isUnsupportedCallWith = $codeGenerator->ExtendedAttributeContains($callWith, "ScriptArguments") || $codeGenerator->ExtendedAttributeContains($callWith, "CallStack") || $codeGenerator->ExtendedAttributeContains($callWith, "FirstWindow") || $codeGenerator->ExtendedAttributeContains($callWith, "ActiveWindow");
    289289
    290290    # Static methods are unsupported
    … …  
    14491449        # attributes now, but we should somehow.
    14501450        my $custom = $attribute->signature->extendedAttributes->{"CustomSetter"};
    1451         if ($attribute->isReadOnly || $attribute->signature->extendedAttributes->{"Replaceable"} || $custom) {
     1451        if ($attribute->isReadOnly || $attribute->signature->extendedAttributes->{"Replaceable"}
     1452            || $attribute->signature->extendedAttributes->{"CallWith"}
     1453            || $attribute->signature->extendedAttributes->{"SetterCallWith"} || $custom) {
    14521454            next TOP;
    14531455        }

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

    r190030 r190038  
    20932093}
    20942094
    2095 void webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glong value)
    2096 {
    2097     WebCore::JSMainThreadNullState state;
    2098     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2099     WebCore::TestObj* item = WebKit::core(self);
    2100     item->setWithScriptStateAttribute(value);
    2101 }
    2102 
    21032095glong webkit_dom_test_obj_get_with_call_with_and_setter_call_with_attribute(WebKitDOMTestObj* self)
    21042096{
    … …  
    21082100    glong result = item->withCallWithAndSetterCallWithAttribute();
    21092101    return result;
    2110 }
    2111 
    2112 void webkit_dom_test_obj_set_with_call_with_and_setter_call_with_attribute(WebKitDOMTestObj* self, glong value)
    2113 {
    2114     WebCore::JSMainThreadNullState state;
    2115     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2116     WebCore::TestObj* item = WebKit::core(self);
    2117     item->setWithCallWithAndSetterCallWithAttribute(value);
    21182102}
    21192103
    … …  
    21252109    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAttribute());
    21262110    return WebKit::kit(gobjectResult.get());
    2127 }
    2128 
    2129 void webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
    2130 {
    2131     WebCore::JSMainThreadNullState state;
    2132     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2133     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
    2134     WebCore::TestObj* item = WebKit::core(self);
    2135     WebCore::TestObj* convertedValue = WebKit::core(value);
    2136     item->setWithScriptExecutionContextAttribute(convertedValue);
    21372111}
    21382112
    … …  
    21522126}
    21532127
    2154 void webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
    2155 {
    2156     WebCore::JSMainThreadNullState state;
    2157     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2158     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
    2159     WebCore::TestObj* item = WebKit::core(self);
    2160     WebCore::TestObj* convertedValue = WebKit::core(value);
    2161     item->setWithScriptStateAttributeRaises(convertedValue);
    2162 }
    2163 
    21642128WebKitDOMTestObj* webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError** error)
    21652129{
    … …  
    21772141}
    21782142
    2179 void webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
    2180 {
    2181     WebCore::JSMainThreadNullState state;
    2182     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2183     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
    2184     WebCore::TestObj* item = WebKit::core(self);
    2185     WebCore::TestObj* convertedValue = WebKit::core(value);
    2186     item->setWithScriptExecutionContextAttributeRaises(convertedValue);
    2187 }
    2188 
    21892143WebKitDOMTestObj* webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute(WebKitDOMTestObj* self)
    21902144{
    … …  
    21942148    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttribute());
    21952149    return WebKit::kit(gobjectResult.get());
    2196 }
    2197 
    2198 void webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
    2199 {
    2200     WebCore::JSMainThreadNullState state;
    2201     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2202     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
    2203     WebCore::TestObj* item = WebKit::core(self);
    2204     WebCore::TestObj* convertedValue = WebKit::core(value);
    2205     item->setWithScriptExecutionContextAndScriptStateAttribute(convertedValue);
    22062150}
    22072151
    … …  
    22212165}
    22222166
    2223 void webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
    2224 {
    2225     WebCore::JSMainThreadNullState state;
    2226     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2227     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
    2228     WebCore::TestObj* item = WebKit::core(self);
    2229     WebCore::TestObj* convertedValue = WebKit::core(value);
    2230     item->setWithScriptExecutionContextAndScriptStateAttributeRaises(convertedValue);
    2231 }
    2232 
    22332167WebKitDOMTestObj* webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spaces_attribute(WebKitDOMTestObj* self)
    22342168{
    … …  
    22382172    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpacesAttribute());
    22392173    return WebKit::kit(gobjectResult.get());
    2240 }
    2241 
    2242 void webkit_dom_test_obj_set_with_script_execution_context_and_script_state_with_spaces_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
    2243 {
    2244     WebCore::JSMainThreadNullState state;
    2245     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    2246     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
    2247     WebCore::TestObj* item = WebKit::core(self);
    2248     WebCore::TestObj* convertedValue = WebKit::core(value);
    2249     item->setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(convertedValue);
    22502174}
    22512175

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

    r190030 r190038  
    12141214
    12151215/**
    1216  * webkit_dom_test_obj_set_with_script_state_attribute:
    1217  * @self: A #WebKitDOMTestObj
    1218  * @value: A #glong
    1219  *
    1220  * Stability: Unstable
    1221 **/
    1222 WEBKIT_API void
    1223 webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glong value);
    1224 
    1225 /**
    12261216 * webkit_dom_test_obj_get_with_call_with_and_setter_call_with_attribute:
    12271217 * @self: A #WebKitDOMTestObj
    … …  
    12331223WEBKIT_API glong
    12341224webkit_dom_test_obj_get_with_call_with_and_setter_call_with_attribute(WebKitDOMTestObj* self);
    1235 
    1236 /**
    1237  * webkit_dom_test_obj_set_with_call_with_and_setter_call_with_attribute:
    1238  * @self: A #WebKitDOMTestObj
    1239  * @value: A #glong
    1240  *
    1241  * Stability: Unstable
    1242 **/
    1243 WEBKIT_API void
    1244 webkit_dom_test_obj_set_with_call_with_and_setter_call_with_attribute(WebKitDOMTestObj* self, glong value);
    12451225
    12461226/**
    … …  
    12561236
    12571237/**
    1258  * webkit_dom_test_obj_set_with_script_execution_context_attribute:
    1259  * @self: A #WebKitDOMTestObj
    1260  * @value: A #WebKitDOMTestObj
    1261  *
    1262  * Stability: Unstable
    1263 **/
    1264 WEBKIT_API void
    1265 webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
    1266 
    1267 /**
    12681238 * webkit_dom_test_obj_get_with_script_state_attribute_raises:
    12691239 * @self: A #WebKitDOMTestObj
    … …  
    12781248
    12791249/**
    1280  * webkit_dom_test_obj_set_with_script_state_attribute_raises:
    1281  * @self: A #WebKitDOMTestObj
    1282  * @value: A #WebKitDOMTestObj
    1283  *
    1284  * Stability: Unstable
    1285 **/
    1286 WEBKIT_API void
    1287 webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
    1288 
    1289 /**
    12901250 * webkit_dom_test_obj_get_with_script_execution_context_attribute_raises:
    12911251 * @self: A #WebKitDOMTestObj
    … …  
    13001260
    13011261/**
    1302  * webkit_dom_test_obj_set_with_script_execution_context_attribute_raises:
    1303  * @self: A #WebKitDOMTestObj
    1304  * @value: A #WebKitDOMTestObj
    1305  *
    1306  * Stability: Unstable
    1307 **/
    1308 WEBKIT_API void
    1309 webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
    1310 
    1311 /**
    13121262 * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute:
    13131263 * @self: A #WebKitDOMTestObj
    … …  
    13211271
    13221272/**
    1323  * webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute:
    1324  * @self: A #WebKitDOMTestObj
    1325  * @value: A #WebKitDOMTestObj
    1326  *
    1327  * Stability: Unstable
    1328 **/
    1329 WEBKIT_API void
    1330 webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
    1331 
    1332 /**
    13331273 * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises:
    13341274 * @self: A #WebKitDOMTestObj
    … …  
    13431283
    13441284/**
    1345  * webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises:
    1346  * @self: A #WebKitDOMTestObj
    1347  * @value: A #WebKitDOMTestObj
    1348  *
    1349  * Stability: Unstable
    1350 **/
    1351 WEBKIT_API void
    1352 webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
    1353 
    1354 /**
    13551285 * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spaces_attribute:
    13561286 * @self: A #WebKitDOMTestObj
    … …  
    13641294
    13651295/**
    1366  * webkit_dom_test_obj_set_with_script_execution_context_and_script_state_with_spaces_attribute:
    1367  * @self: A #WebKitDOMTestObj
    1368  * @value: A #WebKitDOMTestObj
    1369  *
    1370  * Stability: Unstable
    1371 **/
    1372 WEBKIT_API void
    1373 webkit_dom_test_obj_set_with_script_execution_context_and_script_state_with_spaces_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
    1374 
    1375 /**
    13761296 * webkit_dom_test_obj_get_conditional_attr1:
    13771297 * @self: A #WebKitDOMTestObj
Note: See TracChangeset for help on using the changeset viewer.