Changeset 65333 in webkit
- Timestamp:
- Aug 13, 2010 10:39:34 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r65331 r65333 1 2010-08-13 Kinuko Yasuda <kinuko@chromium.org> 2 3 Reviewed by David Levin. 4 5 Update run-bindings-tests expectations 6 https://bugs.webkit.org/show_bug.cgi?id=43944 7 8 The results have become out of sync after changeset 64552 and 65269. 9 10 Test: WebKitTools/Scripts/run-bindings-tests 11 12 * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp: 13 (webkit_dom_test_callback_callback_with_class1param): 14 (webkit_dom_test_callback_callback_with_class2param): 15 (webkit_dom_test_callback_callback_with_non_bool_return_type): 16 * bindings/scripts/test/GObject/WebKitDOMTestCallback.h: 17 * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp: 18 (webkit_dom_test_obj_void_method_with_args): 19 (webkit_dom_test_obj_int_method_with_args): 20 (webkit_dom_test_obj_obj_method): 21 (webkit_dom_test_obj_obj_method_with_args): 22 (webkit_dom_test_obj_method_that_requires_all_args): 23 (webkit_dom_test_obj_method_that_requires_all_args_and_throws): 24 (webkit_dom_test_obj_serialized_value): 25 (webkit_dom_test_obj_idb_key): 26 (webkit_dom_test_obj_with_dynamic_frame_and_user_gesture): 27 (webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad): 28 (webkit_dom_test_obj_with_script_state_obj): 29 (webkit_dom_test_obj_with_script_state_obj_exception): 30 (webkit_dom_test_obj_get_read_only_string_attr): 31 (webkit_dom_test_obj_get_read_only_test_obj_attr): 32 (webkit_dom_test_obj_get_string_attr): 33 (webkit_dom_test_obj_set_string_attr): 34 (webkit_dom_test_obj_get_test_obj_attr): 35 (webkit_dom_test_obj_set_test_obj_attr): 36 (webkit_dom_test_obj_get_xml_obj_attr): 37 (webkit_dom_test_obj_set_xml_obj_attr): 38 (webkit_dom_test_obj_get_reflected_string_attr): 39 (webkit_dom_test_obj_set_reflected_string_attr): 40 (webkit_dom_test_obj_get_reflected_url_attr): 41 (webkit_dom_test_obj_set_reflected_url_attr): 42 (webkit_dom_test_obj_get_reflected_non_empty_url_attr): 43 (webkit_dom_test_obj_set_reflected_non_empty_url_attr): 44 (webkit_dom_test_obj_get_reflected_custom_url_attr): 45 (webkit_dom_test_obj_set_reflected_custom_url_attr): 46 (webkit_dom_test_obj_get_reflected_custom_non_empty_url_attr): 47 (webkit_dom_test_obj_set_reflected_custom_non_empty_url_attr): 48 (webkit_dom_test_obj_get_string_attr_with_getter_exception): 49 (webkit_dom_test_obj_set_string_attr_with_getter_exception): 50 (webkit_dom_test_obj_get_string_attr_with_setter_exception): 51 (webkit_dom_test_obj_set_string_attr_with_setter_exception): 52 (webkit_dom_test_obj_get_script_string_attr): 53 (webkit_dom_test_obj_get_hash): 54 (webkit_dom_test_obj_class_init): 55 * bindings/scripts/test/GObject/WebKitDOMTestObj.h: 56 * bindings/scripts/test/JS/JSTestObj.cpp: 57 (WebCore::jsTestObjPrototypeFunctionOverloadedMethod): 58 1 59 2010-08-13 Ariya Hidayat <ariya@sencha.com> 2 60 -
trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
r65021 r65333 57 57 58 58 gboolean 59 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* 59 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param) 60 60 { 61 61 WebCore::JSMainThreadNullState state; … … 70 70 71 71 gboolean 72 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, gchar*str_arg)72 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg) 73 73 { 74 74 WebCore::JSMainThreadNullState state; … … 85 85 86 86 glong 87 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* 87 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param) 88 88 { 89 89 WebCore::JSMainThreadNullState state; -
trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
r61133 r65333 48 48 49 49 WEBKIT_API gboolean 50 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* 50 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param); 51 51 52 52 WEBKIT_API gboolean 53 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, gchar*str_arg);53 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg); 54 54 55 55 WEBKIT_API glong 56 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* 56 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param); 57 57 58 58 G_END_DECLS -
trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
r65021 r65333 63 63 64 64 void 65 webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar* str_arg, WebKitDOMTestObj*obj_arg)65 webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg) 66 66 { 67 67 WebCore::JSMainThreadNullState state; … … 87 87 88 88 glong 89 webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar* str_arg, WebKitDOMTestObj*obj_arg)89 webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg) 90 90 { 91 91 WebCore::JSMainThreadNullState state; … … 101 101 } 102 102 103 WebKitDOMTestObj* 103 WebKitDOMTestObj* 104 104 webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self) 105 105 { … … 108 108 WebCore::TestObj * item = WebKit::core(self); 109 109 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethod()); 110 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));111 return res; 112 } 113 114 WebKitDOMTestObj* 115 webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar* str_arg, WebKitDOMTestObj*obj_arg)110 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 111 return res; 112 } 113 114 WebKitDOMTestObj* 115 webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg) 116 116 { 117 117 WebCore::JSMainThreadNullState state; … … 124 124 g_return_val_if_fail(converted_obj_arg, 0); 125 125 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg)); 126 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));127 return res; 128 } 129 130 WebKitDOMTestObj* 131 webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, gchar* str_arg, WebKitDOMTestObj*obj_arg)126 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 127 return res; 128 } 129 130 WebKitDOMTestObj* 131 webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg) 132 132 { 133 133 WebCore::JSMainThreadNullState state; … … 140 140 g_return_val_if_fail(converted_obj_arg, 0); 141 141 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgs(converted_str_arg, converted_obj_arg)); 142 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));143 return res; 144 } 145 146 WebKitDOMTestObj* 147 webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, gchar* str_arg, WebKitDOMTestObj*obj_arg, GError **error)142 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 143 return res; 144 } 145 146 WebKitDOMTestObj* 147 webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error) 148 148 { 149 149 WebCore::JSMainThreadNullState state; … … 162 162 g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name); 163 163 } 164 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));165 return res; 166 } 167 168 void 169 webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* 164 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 165 return res; 166 } 167 168 void 169 webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serialized_arg) 170 170 { 171 171 WebCore::JSMainThreadNullState state; … … 179 179 180 180 void 181 webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* 181 webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* key) 182 182 { 183 183 WebCore::JSMainThreadNullState state; … … 239 239 240 240 void 241 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg )242 { 243 WebCore::JSMainThreadNullState state; 244 g_return_if_fail(self); 245 WebCore::TestObj * item = WebKit::core(self); 246 item->withDynamicFrameAndUserGesture(int_arg );247 } 248 249 void 250 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg )251 { 252 WebCore::JSMainThreadNullState state; 253 g_return_if_fail(self); 254 WebCore::TestObj * item = WebKit::core(self); 255 item->withDynamicFrameAndUserGestureASAD(int_arg, optional_arg );241 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg, gboolean isUserGesture) 242 { 243 WebCore::JSMainThreadNullState state; 244 g_return_if_fail(self); 245 WebCore::TestObj * item = WebKit::core(self); 246 item->withDynamicFrameAndUserGesture(int_arg, false); 247 } 248 249 void 250 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg, gboolean isUserGesture) 251 { 252 WebCore::JSMainThreadNullState state; 253 g_return_if_fail(self); 254 WebCore::TestObj * item = WebKit::core(self); 255 item->withDynamicFrameAndUserGestureASAD(int_arg, optional_arg, false); 256 256 } 257 257 … … 265 265 } 266 266 267 WebKitDOMTestObj* 267 WebKitDOMTestObj* 268 268 webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self) 269 269 { … … 272 272 WebCore::TestObj * item = WebKit::core(self); 273 273 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObj()); 274 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));274 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 275 275 return res; 276 276 } … … 291 291 } 292 292 293 WebKitDOMTestObj* 293 WebKitDOMTestObj* 294 294 webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error) 295 295 { … … 304 304 g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name); 305 305 } 306 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));306 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 307 307 return res; 308 308 } … … 354 354 } 355 355 356 gchar* 356 gchar* 357 357 webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self) 358 358 { … … 360 360 g_return_val_if_fail(self, 0); 361 361 WebCore::TestObj * item = WebKit::core(self); 362 gchar* 363 return res; 364 } 365 366 WebKitDOMTestObj* 362 gchar* res = convertToUTF8String(item->readOnlyStringAttr()); 363 return res; 364 } 365 366 WebKitDOMTestObj* 367 367 webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self) 368 368 { … … 371 371 WebCore::TestObj * item = WebKit::core(self); 372 372 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->readOnlyTestObjAttr()); 373 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));373 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 374 374 return res; 375 375 } … … 432 432 } 433 433 434 gchar* 434 gchar* 435 435 webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self) 436 436 { … … 438 438 g_return_val_if_fail(self, 0); 439 439 WebCore::TestObj * item = WebKit::core(self); 440 gchar* 441 return res; 442 } 443 444 void 445 webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, gchar*value)440 gchar* res = convertToUTF8String(item->stringAttr()); 441 return res; 442 } 443 444 void 445 webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, const gchar* value) 446 446 { 447 447 WebCore::JSMainThreadNullState state; … … 453 453 } 454 454 455 WebKitDOMTestObj* 455 WebKitDOMTestObj* 456 456 webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self) 457 457 { … … 460 460 WebCore::TestObj * item = WebKit::core(self); 461 461 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->testObjAttr()); 462 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));463 return res; 464 } 465 466 void 467 webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* 462 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 463 return res; 464 } 465 466 void 467 webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* value) 468 468 { 469 469 WebCore::JSMainThreadNullState state; … … 476 476 } 477 477 478 WebKitDOMTestObj* 478 WebKitDOMTestObj* 479 479 webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self) 480 480 { … … 483 483 WebCore::TestObj * item = WebKit::core(self); 484 484 PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->xmlObjAttr()); 485 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));486 return res; 487 } 488 489 void 490 webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* 485 WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get())); 486 return res; 487 } 488 489 void 490 webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* value) 491 491 { 492 492 WebCore::JSMainThreadNullState state; … … 518 518 } 519 519 520 gchar* 520 gchar* 521 521 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self) 522 522 { … … 524 524 g_return_val_if_fail(self, 0); 525 525 WebCore::TestObj * item = WebKit::core(self); 526 gchar* 527 return res; 528 } 529 530 void 531 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*value)526 gchar* res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr)); 527 return res; 528 } 529 530 void 531 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gchar* value) 532 532 { 533 533 WebCore::JSMainThreadNullState state; … … 577 577 } 578 578 579 gchar* 579 gchar* 580 580 webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self) 581 581 { … … 583 583 g_return_val_if_fail(self, 0); 584 584 WebCore::TestObj * item = WebKit::core(self); 585 gchar* 586 return res; 587 } 588 589 void 590 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*value)585 gchar* res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr)); 586 return res; 587 } 588 589 void 590 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, const gchar* value) 591 591 { 592 592 WebCore::JSMainThreadNullState state; … … 598 598 } 599 599 600 gchar* 600 gchar* 601 601 webkit_dom_test_obj_get_reflected_non_empty_url_attr(WebKitDOMTestObj* self) 602 602 { … … 604 604 g_return_val_if_fail(self, 0); 605 605 WebCore::TestObj * item = WebKit::core(self); 606 gchar* 607 return res; 608 } 609 610 void 611 webkit_dom_test_obj_set_reflected_non_empty_url_attr(WebKitDOMTestObj* self, gchar*value)606 gchar* res = convertToUTF8String(item->getNonEmptyURLAttribute(WebCore::HTMLNames::reflectednonemptyurlattrAttr)); 607 return res; 608 } 609 610 void 611 webkit_dom_test_obj_set_reflected_non_empty_url_attr(WebKitDOMTestObj* self, const gchar* value) 612 612 { 613 613 WebCore::JSMainThreadNullState state; … … 619 619 } 620 620 621 gchar* 621 gchar* 622 622 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self) 623 623 { … … 625 625 g_return_val_if_fail(self, 0); 626 626 WebCore::TestObj * item = WebKit::core(self); 627 gchar* 628 return res; 629 } 630 631 void 632 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*value)627 gchar* res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr)); 628 return res; 629 } 630 631 void 632 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gchar* value) 633 633 { 634 634 WebCore::JSMainThreadNullState state; … … 678 678 } 679 679 680 gchar* 680 gchar* 681 681 webkit_dom_test_obj_get_reflected_custom_url_attr(WebKitDOMTestObj* self) 682 682 { … … 684 684 g_return_val_if_fail(self, 0); 685 685 WebCore::TestObj * item = WebKit::core(self); 686 gchar* 687 return res; 688 } 689 690 void 691 webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, gchar*value)686 gchar* res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr)); 687 return res; 688 } 689 690 void 691 webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const gchar* value) 692 692 { 693 693 WebCore::JSMainThreadNullState state; … … 699 699 } 700 700 701 gchar* 701 gchar* 702 702 webkit_dom_test_obj_get_reflected_custom_non_empty_url_attr(WebKitDOMTestObj* self) 703 703 { … … 705 705 g_return_val_if_fail(self, 0); 706 706 WebCore::TestObj * item = WebKit::core(self); 707 gchar* 708 return res; 709 } 710 711 void 712 webkit_dom_test_obj_set_reflected_custom_non_empty_url_attr(WebKitDOMTestObj* self, gchar*value)707 gchar* res = convertToUTF8String(item->getNonEmptyURLAttribute(WebCore::HTMLNames::customContentNonEmptyURLAttrAttr)); 708 return res; 709 } 710 711 void 712 webkit_dom_test_obj_set_reflected_custom_non_empty_url_attr(WebKitDOMTestObj* self, const gchar* value) 713 713 { 714 714 WebCore::JSMainThreadNullState state; … … 776 776 } 777 777 778 gchar* 778 gchar* 779 779 webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error) 780 780 { … … 783 783 WebCore::TestObj * item = WebKit::core(self); 784 784 WebCore::ExceptionCode ec = 0; 785 gchar* 786 return res; 787 } 788 789 void 790 webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, gchar*value, GError **error)785 gchar* res = convertToUTF8String(item->stringAttrWithGetterException(ec)); 786 return res; 787 } 788 789 void 790 webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error) 791 791 { 792 792 WebCore::JSMainThreadNullState state; … … 804 804 } 805 805 806 gchar* 806 gchar* 807 807 webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self) 808 808 { … … 810 810 g_return_val_if_fail(self, 0); 811 811 WebCore::TestObj * item = WebKit::core(self); 812 gchar* 813 return res; 814 } 815 816 void 817 webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, gchar*value, GError **error)812 gchar* res = convertToUTF8String(item->stringAttrWithSetterException()); 813 return res; 814 } 815 816 void 817 webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error) 818 818 { 819 819 WebCore::JSMainThreadNullState state; … … 831 831 } 832 832 833 gchar* 833 gchar* 834 834 webkit_dom_test_obj_get_script_string_attr(WebKitDOMTestObj* self) 835 835 { … … 837 837 g_return_val_if_fail(self, 0); 838 838 WebCore::TestObj * item = WebKit::core(self); 839 gchar* 839 gchar* res = convertToUTF8String(item->scriptStringAttr()); 840 840 return res; 841 841 } … … 939 939 } 940 940 941 gchar* 941 gchar* 942 942 webkit_dom_test_obj_get_hash(WebKitDOMTestObj* self) 943 943 { … … 945 945 g_return_val_if_fail(self, 0); 946 946 WebCore::TestObj * item = WebKit::core(self); 947 gchar* 947 gchar* res = convertToUTF8String(item->hash()); 948 948 return res; 949 949 } … … 1364 1364 g_param_spec_string("read-only-string-attr", /* name */ 1365 1365 "test_obj_read-only-string-attr", /* short description */ 1366 "read-only gchar* 1366 "read-only gchar* TestObj.read-only-string-attr", /* longer - could do with some extra doc stuff here */ 1367 1367 "", /* default */ 1368 1368 WEBKIT_PARAM_READABLE)); … … 1371 1371 g_param_spec_object("read-only-test-obj-attr", /* name */ 1372 1372 "test_obj_read-only-test-obj-attr", /* short description */ 1373 "read-only WebKitDOMTestObj* 1373 "read-only WebKitDOMTestObj* TestObj.read-only-test-obj-attr", /* longer - could do with some extra doc stuff here */ 1374 1374 WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */ 1375 1375 WEBKIT_PARAM_READABLE)); … … 1405 1405 g_param_spec_string("string-attr", /* name */ 1406 1406 "test_obj_string-attr", /* short description */ 1407 "read-write gchar* 1407 "read-write gchar* TestObj.string-attr", /* longer - could do with some extra doc stuff here */ 1408 1408 "", /* default */ 1409 1409 WEBKIT_PARAM_READWRITE)); … … 1412 1412 g_param_spec_object("test-obj-attr", /* name */ 1413 1413 "test_obj_test-obj-attr", /* short description */ 1414 "read-write WebKitDOMTestObj* 1414 "read-write WebKitDOMTestObj* TestObj.test-obj-attr", /* longer - could do with some extra doc stuff here */ 1415 1415 WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */ 1416 1416 WEBKIT_PARAM_READWRITE)); … … 1419 1419 g_param_spec_object("xml-obj-attr", /* name */ 1420 1420 "test_obj_xml-obj-attr", /* short description */ 1421 "read-write WebKitDOMTestObj* 1421 "read-write WebKitDOMTestObj* TestObj.xml-obj-attr", /* longer - could do with some extra doc stuff here */ 1422 1422 WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */ 1423 1423 WEBKIT_PARAM_READWRITE)); … … 1433 1433 g_param_spec_string("reflected-string-attr", /* name */ 1434 1434 "test_obj_reflected-string-attr", /* short description */ 1435 "read-write gchar* 1435 "read-write gchar* TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */ 1436 1436 "", /* default */ 1437 1437 WEBKIT_PARAM_READWRITE)); … … 1456 1456 g_param_spec_string("reflected-url-attr", /* name */ 1457 1457 "test_obj_reflected-url-attr", /* short description */ 1458 "read-write gchar* 1458 "read-write gchar* TestObj.reflected-url-attr", /* longer - could do with some extra doc stuff here */ 1459 1459 "", /* default */ 1460 1460 WEBKIT_PARAM_READWRITE)); … … 1463 1463 g_param_spec_string("reflected-non-empty-url-attr", /* name */ 1464 1464 "test_obj_reflected-non-empty-url-attr", /* short description */ 1465 "read-write gchar* 1465 "read-write gchar* TestObj.reflected-non-empty-url-attr", /* longer - could do with some extra doc stuff here */ 1466 1466 "", /* default */ 1467 1467 WEBKIT_PARAM_READWRITE)); … … 1470 1470 g_param_spec_string("reflected-string-attr", /* name */ 1471 1471 "test_obj_reflected-string-attr", /* short description */ 1472 "read-write gchar* 1472 "read-write gchar* TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */ 1473 1473 "", /* default */ 1474 1474 WEBKIT_PARAM_READWRITE)); … … 1493 1493 g_param_spec_string("reflected-custom-url-attr", /* name */ 1494 1494 "test_obj_reflected-custom-url-attr", /* short description */ 1495 "read-write gchar* 1495 "read-write gchar* TestObj.reflected-custom-url-attr", /* longer - could do with some extra doc stuff here */ 1496 1496 "", /* default */ 1497 1497 WEBKIT_PARAM_READWRITE)); … … 1500 1500 g_param_spec_string("reflected-custom-non-empty-url-attr", /* name */ 1501 1501 "test_obj_reflected-custom-non-empty-url-attr", /* short description */ 1502 "read-write gchar* 1502 "read-write gchar* TestObj.reflected-custom-non-empty-url-attr", /* longer - could do with some extra doc stuff here */ 1503 1503 "", /* default */ 1504 1504 WEBKIT_PARAM_READWRITE)); … … 1525 1525 g_param_spec_string("string-attr-with-getter-exception", /* name */ 1526 1526 "test_obj_string-attr-with-getter-exception", /* short description */ 1527 "read-write gchar* 1527 "read-write gchar* TestObj.string-attr-with-getter-exception", /* longer - could do with some extra doc stuff here */ 1528 1528 "", /* default */ 1529 1529 WEBKIT_PARAM_READWRITE)); … … 1532 1532 g_param_spec_string("string-attr-with-setter-exception", /* name */ 1533 1533 "test_obj_string-attr-with-setter-exception", /* short description */ 1534 "read-write gchar* 1534 "read-write gchar* TestObj.string-attr-with-setter-exception", /* longer - could do with some extra doc stuff here */ 1535 1535 "", /* default */ 1536 1536 WEBKIT_PARAM_READWRITE)); … … 1539 1539 g_param_spec_string("script-string-attr", /* name */ 1540 1540 "test_obj_script-string-attr", /* short description */ 1541 "read-only gchar* 1541 "read-only gchar* TestObj.script-string-attr", /* longer - could do with some extra doc stuff here */ 1542 1542 "", /* default */ 1543 1543 WEBKIT_PARAM_READABLE)); … … 1597 1597 g_param_spec_string("hash", /* name */ 1598 1598 "test_obj_hash", /* short description */ 1599 "read-only gchar* 1599 "read-only gchar* TestObj.hash", /* longer - could do with some extra doc stuff here */ 1600 1600 "", /* default */ 1601 1601 WEBKIT_PARAM_READABLE)); -
trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
r64415 r65333 51 51 52 52 WEBKIT_API void 53 webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar* str_arg, WebKitDOMTestObj*obj_arg);53 webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg); 54 54 55 55 WEBKIT_API glong … … 57 57 58 58 WEBKIT_API glong 59 webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar* str_arg, WebKitDOMTestObj*obj_arg);60 61 WEBKIT_API WebKitDOMTestObj* 59 webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg); 60 61 WEBKIT_API WebKitDOMTestObj* 62 62 webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self); 63 63 64 WEBKIT_API WebKitDOMTestObj* 65 webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar* str_arg, WebKitDOMTestObj*obj_arg);66 67 WEBKIT_API WebKitDOMTestObj* 68 webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, gchar* str_arg, WebKitDOMTestObj*obj_arg);69 70 WEBKIT_API WebKitDOMTestObj* 71 webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, gchar* str_arg, WebKitDOMTestObj*obj_arg, GError **error);72 73 WEBKIT_API void 74 webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* 75 76 WEBKIT_API void 77 webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* 64 WEBKIT_API WebKitDOMTestObj* 65 webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg); 66 67 WEBKIT_API WebKitDOMTestObj* 68 webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg); 69 70 WEBKIT_API WebKitDOMTestObj* 71 webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error); 72 73 WEBKIT_API void 74 webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serialized_arg); 75 76 WEBKIT_API void 77 webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* key); 78 78 79 79 WEBKIT_API void … … 96 96 97 97 WEBKIT_API void 98 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg );99 100 WEBKIT_API void 101 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg );98 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg, gboolean isUserGesture); 99 100 WEBKIT_API void 101 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg, gboolean isUserGesture); 102 102 103 103 WEBKIT_API void 104 104 webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self); 105 105 106 WEBKIT_API WebKitDOMTestObj* 106 WEBKIT_API WebKitDOMTestObj* 107 107 webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self); 108 108 … … 110 110 webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error); 111 111 112 WEBKIT_API WebKitDOMTestObj* 112 WEBKIT_API WebKitDOMTestObj* 113 113 webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error); 114 114 … … 128 128 webkit_dom_test_obj_get_read_only_int_attr(WebKitDOMTestObj* self); 129 129 130 WEBKIT_API gchar* 130 WEBKIT_API gchar* 131 131 webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self); 132 132 133 WEBKIT_API WebKitDOMTestObj* 133 WEBKIT_API WebKitDOMTestObj* 134 134 webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self); 135 135 … … 152 152 webkit_dom_test_obj_set_unsigned_long_long_attr(WebKitDOMTestObj* self, guint64 value); 153 153 154 WEBKIT_API gchar* 154 WEBKIT_API gchar* 155 155 webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self); 156 156 157 157 WEBKIT_API void 158 webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, gchar*value);159 160 WEBKIT_API WebKitDOMTestObj* 158 webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, const gchar* value); 159 160 WEBKIT_API WebKitDOMTestObj* 161 161 webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self); 162 162 163 163 WEBKIT_API void 164 webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* 165 166 WEBKIT_API WebKitDOMTestObj* 164 webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* value); 165 166 WEBKIT_API WebKitDOMTestObj* 167 167 webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self); 168 168 169 169 WEBKIT_API void 170 webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* 170 webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* value); 171 171 172 172 WEBKIT_API gboolean … … 176 176 webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, gboolean value); 177 177 178 WEBKIT_API gchar* 178 WEBKIT_API gchar* 179 179 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self); 180 180 181 181 WEBKIT_API void 182 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*value);182 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gchar* value); 183 183 184 184 WEBKIT_API glong … … 194 194 webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean value); 195 195 196 WEBKIT_API gchar* 196 WEBKIT_API gchar* 197 197 webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self); 198 198 199 199 WEBKIT_API void 200 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*value);201 202 WEBKIT_API gchar* 200 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, const gchar* value); 201 202 WEBKIT_API gchar* 203 203 webkit_dom_test_obj_get_reflected_non_empty_url_attr(WebKitDOMTestObj* self); 204 204 205 205 WEBKIT_API void 206 webkit_dom_test_obj_set_reflected_non_empty_url_attr(WebKitDOMTestObj* self, gchar*value);207 208 WEBKIT_API gchar* 206 webkit_dom_test_obj_set_reflected_non_empty_url_attr(WebKitDOMTestObj* self, const gchar* value); 207 208 WEBKIT_API gchar* 209 209 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self); 210 210 211 211 WEBKIT_API void 212 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*value);212 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gchar* value); 213 213 214 214 WEBKIT_API glong … … 224 224 webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gboolean value); 225 225 226 WEBKIT_API gchar* 226 WEBKIT_API gchar* 227 227 webkit_dom_test_obj_get_reflected_custom_url_attr(WebKitDOMTestObj* self); 228 228 229 229 WEBKIT_API void 230 webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, gchar*value);231 232 WEBKIT_API gchar* 230 webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const gchar* value); 231 232 WEBKIT_API gchar* 233 233 webkit_dom_test_obj_get_reflected_custom_non_empty_url_attr(WebKitDOMTestObj* self); 234 234 235 235 WEBKIT_API void 236 webkit_dom_test_obj_set_reflected_custom_non_empty_url_attr(WebKitDOMTestObj* self, gchar*value);236 webkit_dom_test_obj_set_reflected_custom_non_empty_url_attr(WebKitDOMTestObj* self, const gchar* value); 237 237 238 238 WEBKIT_API glong … … 248 248 webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error); 249 249 250 WEBKIT_API gchar* 250 WEBKIT_API gchar* 251 251 webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error); 252 252 253 253 WEBKIT_API void 254 webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, gchar*value, GError **error);255 256 WEBKIT_API gchar* 254 webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error); 255 256 WEBKIT_API gchar* 257 257 webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self); 258 258 259 259 WEBKIT_API void 260 webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, gchar*value, GError **error);261 262 WEBKIT_API gchar* 260 webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error); 261 262 WEBKIT_API gchar* 263 263 webkit_dom_test_obj_get_script_string_attr(WebKitDOMTestObj* self); 264 264 … … 302 302 webkit_dom_test_obj_set_id(WebKitDOMTestObj* self, glong value); 303 303 304 WEBKIT_API gchar* 304 WEBKIT_API gchar* 305 305 webkit_dom_test_obj_get_hash(WebKitDOMTestObj* self); 306 306 -
trunk/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
r65082 r65333 1418 1418 EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(ExecState* exec) 1419 1419 { 1420 if ((exec->argumentCount() == 2 && (exec->argument(0).isNull() || exec->argument(0).isObject() && asObject(exec->argument(0))->inherits(&JSTestObj::s_info)) && (exec->argument(1).isNull() || exec->argument(1).isUndefined() || exec->argument(1).isString() || exec->argument(1).isObject())))1420 if ((exec->argumentCount() == 2 && (exec->argument(0).isNull() || (exec->argument(0).isObject() && asObject(exec->argument(0))->inherits(&JSTestObj::s_info))) && (exec->argument(1).isNull() || exec->argument(1).isUndefined() || exec->argument(1).isString() || exec->argument(1).isObject()))) 1421 1421 return jsTestObjPrototypeFunctionOverloadedMethod1(exec); 1422 if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || exec->argument(0).isObject() && asObject(exec->argument(0))->inherits(&JSTestObj::s_info))) || (exec->argumentCount() == 2 && (exec->argument(0).isNull() || exec->argument(0).isObject() && asObject(exec->argument(0))->inherits(&JSTestObj::s_info))))1422 if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || (exec->argument(0).isObject() && asObject(exec->argument(0))->inherits(&JSTestObj::s_info)))) || (exec->argumentCount() == 2 && (exec->argument(0).isNull() || (exec->argument(0).isObject() && asObject(exec->argument(0))->inherits(&JSTestObj::s_info))))) 1423 1423 return jsTestObjPrototypeFunctionOverloadedMethod2(exec); 1424 1424 if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || exec->argument(0).isUndefined() || exec->argument(0).isString() || exec->argument(0).isObject())))
Note: See TracChangeset
for help on using the changeset viewer.