Changeset 170524 in webkit
- Timestamp:
- Jun 27, 2014 12:27:28 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r170523 r170524 1 2014-06-26 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Expose getter and setter functions for attributes named type 4 https://bugs.webkit.org/show_bug.cgi?id=134300 5 6 Reviewed by Martin Robinson. 7 8 We skip those because the getter conflicts with the get_type() 9 function of all GObjects. We should use a different name for them. As 10 a general rule we use the last word of the class name, something like: 11 12 webkit_dom_blob_get_type() -> webkit_dom_blob_get_blob_type() 13 webkit_dom_event_get_type() -> webkit_dom_event_get_event_type() 14 15 It's consistent with other existing DOM methods like 16 webkit_dom_xpath_result_get_result_type() or webkit_dom_css_value_get_css_value_type(). 17 This patch also adds some exceptions for particular cases. 18 19 * bindings/gobject/webkitdom.symbols: Add new public symbols. 20 * bindings/scripts/CodeGeneratorGObject.pm: 21 (GetFunctionSigName): Helper function to return the function name 22 that takes into account all exceptions when generating getters and 23 setters of attributes named type. Otherwise the name is returned unmodified. 24 (GenerateFunction): Use GetFunctionSigName(). 25 (GenerateFunctions): Do not skip functions for type attributes. 26 1 27 2014-06-27 Sungmann Cho <sungmann.cho@navercorp.com> 2 28 -
trunk/Source/WebCore/bindings/gobject/webkitdom.symbols
r170475 r170524 240 240 WebKitDOMText* webkit_dom_text_replace_whole_text(WebKitDOMText*, const gchar*, GError**) 241 241 GType webkit_dom_html_anchor_element_get_type(void) 242 gchar* webkit_dom_html_anchor_element_get_type_attr(WebKitDOMHTMLAnchorElement*) 243 void webkit_dom_html_anchor_element_set_type_attr(WebKitDOMHTMLAnchorElement*, const gchar*) 242 244 gchar* webkit_dom_html_anchor_element_get_name(WebKitDOMHTMLAnchorElement*) 243 245 void webkit_dom_html_anchor_element_set_name(WebKitDOMHTMLAnchorElement*, const gchar*) … … 345 347 void webkit_dom_html_body_element_set_v_link(WebKitDOMHTMLBodyElement*, const gchar*) 346 348 GType webkit_dom_html_button_element_get_type(void) 349 gchar* webkit_dom_html_button_element_get_button_type(WebKitDOMHTMLButtonElement*) 350 void webkit_dom_html_button_element_set_button_type(WebKitDOMHTMLButtonElement*, const gchar*) 347 351 gboolean webkit_dom_html_button_element_get_autofocus(WebKitDOMHTMLButtonElement*) 348 352 gboolean webkit_dom_html_button_element_get_disabled(WebKitDOMHTMLButtonElement*) … … 423 427 void webkit_dom_html_element_set_title(WebKitDOMHTMLElement*, const gchar*) 424 428 GType webkit_dom_html_embed_element_get_type(void) 429 gchar* webkit_dom_html_embed_element_get_type_attr(WebKitDOMHTMLEmbedElement*) 430 void webkit_dom_html_embed_element_set_type_attr(WebKitDOMHTMLEmbedElement*, const gchar*) 425 431 gchar* webkit_dom_html_embed_element_get_align(WebKitDOMHTMLEmbedElement*) 426 432 glong webkit_dom_html_embed_element_get_height(WebKitDOMHTMLEmbedElement*) … … 561 567 void webkit_dom_html_image_element_set_width(WebKitDOMHTMLImageElement*, glong) 562 568 GType webkit_dom_html_input_element_get_type(void) 569 gchar* webkit_dom_html_input_element_get_input_type(WebKitDOMHTMLInputElement*) 570 void webkit_dom_html_input_element_set_input_type(WebKitDOMHTMLInputElement*, const gchar*) 563 571 gchar* webkit_dom_html_input_element_get_accept(WebKitDOMHTMLInputElement*) 564 572 gchar* webkit_dom_html_input_element_get_align(WebKitDOMHTMLInputElement*) … … 605 613 gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*) 606 614 GType webkit_dom_html_li_element_get_type(void) 615 gchar* webkit_dom_html_li_element_get_type_attr(WebKitDOMHTMLLIElement*) 616 void webkit_dom_html_li_element_set_type_attr(WebKitDOMHTMLLIElement*, const gchar*) 607 617 glong webkit_dom_html_li_element_get_value(WebKitDOMHTMLLIElement*) 608 618 void webkit_dom_html_li_element_set_value(WebKitDOMHTMLLIElement*, glong) … … 616 626 void webkit_dom_html_legend_element_set_align(WebKitDOMHTMLLegendElement*, const gchar*) 617 627 GType webkit_dom_html_link_element_get_type(void) 628 gchar* webkit_dom_html_link_element_get_type_attr(WebKitDOMHTMLLinkElement*) 629 void webkit_dom_html_link_element_set_type_attr(WebKitDOMHTMLLinkElement*, const gchar*) 618 630 gchar* webkit_dom_html_link_element_get_charset(WebKitDOMHTMLLinkElement*) 619 631 gboolean webkit_dom_html_link_element_get_disabled(WebKitDOMHTMLLinkElement*) … … 658 670 void webkit_dom_html_mod_element_set_date_time(WebKitDOMHTMLModElement*, const gchar*) 659 671 GType webkit_dom_html_o_list_element_get_type(void) 672 gchar* webkit_dom_html_o_list_element_get_type_attr(WebKitDOMHTMLOListElement*) 673 void webkit_dom_html_o_list_element_set_type_attr(WebKitDOMHTMLOListElement*, const gchar*) 660 674 gboolean webkit_dom_html_o_list_element_get_compact(WebKitDOMHTMLOListElement*) 661 675 glong webkit_dom_html_o_list_element_get_start(WebKitDOMHTMLOListElement*) … … 663 677 void webkit_dom_html_o_list_element_set_start(WebKitDOMHTMLOListElement*, glong) 664 678 GType webkit_dom_html_object_element_get_type(void) 679 gchar* webkit_dom_html_object_element_get_type_attr(WebKitDOMHTMLObjectElement*) 680 void webkit_dom_html_object_element_set_type_attr(WebKitDOMHTMLObjectElement*, const gchar*) 665 681 gchar* webkit_dom_html_object_element_get_align(WebKitDOMHTMLObjectElement*) 666 682 gchar* webkit_dom_html_object_element_get_archive(WebKitDOMHTMLObjectElement*) … … 723 739 void webkit_dom_html_paragraph_element_set_align(WebKitDOMHTMLParagraphElement*, const gchar*) 724 740 GType webkit_dom_html_param_element_get_type(void) 741 gchar* webkit_dom_html_param_element_get_type_attr(WebKitDOMHTMLParamElement*) 742 void webkit_dom_html_param_element_set_type_attr(WebKitDOMHTMLParamElement*, const gchar*) 725 743 gchar* webkit_dom_html_param_element_get_name(WebKitDOMHTMLParamElement*) 726 744 gchar* webkit_dom_html_param_element_get_value_type(WebKitDOMHTMLParamElement*) … … 738 756 void webkit_dom_html_quote_element_set_cite(WebKitDOMHTMLQuoteElement*, const gchar*) 739 757 GType webkit_dom_html_script_element_get_type(void) 758 gchar* webkit_dom_html_script_element_get_type_attr(WebKitDOMHTMLScriptElement*) 759 void webkit_dom_html_script_element_set_type_attr(WebKitDOMHTMLScriptElement*, const gchar*) 740 760 gchar* webkit_dom_html_script_element_get_charset(WebKitDOMHTMLScriptElement*) 741 761 gboolean webkit_dom_html_script_element_get_defer(WebKitDOMHTMLScriptElement*) … … 750 770 void webkit_dom_html_script_element_set_text(WebKitDOMHTMLScriptElement*, const gchar*) 751 771 GType webkit_dom_html_select_element_get_type(void) 772 gchar* webkit_dom_html_select_element_get_select_type(WebKitDOMHTMLSelectElement*) 752 773 void webkit_dom_html_select_element_add(WebKitDOMHTMLSelectElement*, WebKitDOMHTMLElement*, WebKitDOMHTMLElement*, GError**) 753 774 gboolean webkit_dom_html_select_element_get_autofocus(WebKitDOMHTMLSelectElement*) … … 774 795 void webkit_dom_html_select_element_set_value(WebKitDOMHTMLSelectElement*, const gchar*) 775 796 GType webkit_dom_html_style_element_get_type(void) 797 gchar* webkit_dom_html_style_element_get_type_attr(WebKitDOMHTMLStyleElement*) 798 void webkit_dom_html_style_element_set_type_attr(WebKitDOMHTMLStyleElement*, const gchar*) 776 799 gboolean webkit_dom_html_style_element_get_disabled(WebKitDOMHTMLStyleElement*) 777 800 gchar* webkit_dom_html_style_element_get_media(WebKitDOMHTMLStyleElement*) … … 887 910 void webkit_dom_html_table_section_element_set_v_align(WebKitDOMHTMLTableSectionElement*, const gchar*) 888 911 GType webkit_dom_html_text_area_element_get_type(void) 912 gchar* webkit_dom_html_text_area_element_get_area_type(WebKitDOMHTMLTextAreaElement*) 889 913 gboolean webkit_dom_html_text_area_element_get_autofocus(WebKitDOMHTMLTextAreaElement*) 890 914 glong webkit_dom_html_text_area_element_get_cols(WebKitDOMHTMLTextAreaElement*) … … 916 940 void webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement*, const gchar*) 917 941 GType webkit_dom_html_u_list_element_get_type(void) 942 gchar* webkit_dom_html_u_list_element_get_type_attr(WebKitDOMHTMLUListElement*) 943 void webkit_dom_html_u_list_element_set_type_attr(WebKitDOMHTMLUListElement*, const gchar*) 918 944 gboolean webkit_dom_html_u_list_element_get_compact(WebKitDOMHTMLUListElement*) 919 945 void webkit_dom_html_u_list_element_set_compact(WebKitDOMHTMLUListElement*, gboolean) … … 922 948 WebKitDOMStyleSheet* webkit_dom_style_sheet_list_item(WebKitDOMStyleSheetList*, gulong) 923 949 GType webkit_dom_css_rule_get_type(void) 950 WEBKIT_DOM_CSS_RULE_UNKNOWN_RULE 951 WEBKIT_DOM_CSS_RULE_STYLE_RULE 952 WEBKIT_DOM_CSS_RULE_CHARSET_RULE 953 WEBKIT_DOM_CSS_RULE_IMPORT_RULE 954 WEBKIT_DOM_CSS_RULE_MEDIA_RULE 955 WEBKIT_DOM_CSS_RULE_FONT_FACE_RULE 956 WEBKIT_DOM_CSS_RULE_PAGE_RULE 957 gushort webkit_dom_css_rule_get_rule_type(WebKitDOMCSSRule*) 924 958 gchar* webkit_dom_css_rule_get_css_text(WebKitDOMCSSRule*) 925 959 WebKitDOMCSSRule* webkit_dom_css_rule_get_parent_rule(WebKitDOMCSSRule*) … … 942 976 void webkit_dom_css_style_declaration_set_property(WebKitDOMCSSStyleDeclaration*, const gchar*, const gchar*, const gchar*, GError**) 943 977 GType webkit_dom_style_sheet_get_type(void) 978 gchar* webkit_dom_style_sheet_get_content_type(WebKitDOMStyleSheet*) 944 979 gboolean webkit_dom_style_sheet_get_disabled(WebKitDOMStyleSheet*) 945 980 gchar* webkit_dom_style_sheet_get_href(WebKitDOMStyleSheet*) … … 970 1005 WEBKIT_DOM_EVENT_AT_TARGET 971 1006 WEBKIT_DOM_EVENT_BUBBLING_PHASE 1007 WEBKIT_DOM_EVENT_MOUSEDOWN 1008 WEBKIT_DOM_EVENT_MOUSEUP 1009 WEBKIT_DOM_EVENT_MOUSEOVER 1010 WEBKIT_DOM_EVENT_MOUSEOUT 1011 WEBKIT_DOM_EVENT_MOUSEMOVE 1012 WEBKIT_DOM_EVENT_MOUSEDRAG 1013 WEBKIT_DOM_EVENT_CLICK 1014 WEBKIT_DOM_EVENT_DBLCLICK 1015 WEBKIT_DOM_EVENT_KEYDOWN 1016 WEBKIT_DOM_EVENT_KEYUP 1017 WEBKIT_DOM_EVENT_KEYPRESS 1018 WEBKIT_DOM_EVENT_DRAGDROP 1019 WEBKIT_DOM_EVENT_FOCUS 1020 WEBKIT_DOM_EVENT_BLUR 1021 WEBKIT_DOM_EVENT_SELECT 1022 WEBKIT_DOM_EVENT_CHANGE 1023 gchar* webkit_dom_event_get_event_type(WebKitDOMEvent*) 972 1024 gboolean webkit_dom_event_get_bubbles(WebKitDOMEvent*) 973 1025 gboolean webkit_dom_event_get_cancelable(WebKitDOMEvent*) -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
r170475 r170524 969 969 } 970 970 971 sub GetFunctionSignatureName { 972 my ($interfaceName, $function) = @_; 973 974 my $signatureName = decamelize($function->signature->name); 975 976 return $signatureName if $signatureName ne "type"; 977 978 # For HTML type attribute use type_attr. 979 # Example: webkit_dom_html_link_element_get_type_attr() 980 my $contentAttributeName = $codeGenerator->ContentAttributeName(\%implIncludes, $interfaceName, $function); 981 if ($contentAttributeName) { 982 return "type_attr" if $contentAttributeName eq "WebCore::HTMLNames::typeAttr"; 983 } 984 985 # For methods returning a MIME type use content_type. 986 # Examples: webkit_dom_style_sheet_get_content_type(), webkit_dom_dom_mime_type_get_content_type() 987 if ($interfaceName eq "StyleSheet" || $interfaceName eq "DOMMimeType") { 988 return "content_type"; 989 } 990 991 # For HTMLFieldSet use field_set_type. 992 # Example: webkit_dom_html_field_set_element_get_field_set_type() 993 if ($interfaceName eq "HTMLFieldSet") { 994 return "field_set_type"; 995 } 996 997 # For any other cases use the last word of the interface name. 998 # Examples: webkit_dom_blob_get_blob_type(), webkit_dom_event_get_event_type() 999 my @nameTokens = split('_', decamelize($interfaceName)); 1000 my $name = $nameTokens[-1]; 1001 1002 # If the last word is element and there are more words, use the previous one. 1003 # Example: webkit_dom_html_button_element_get_button_type() 1004 if (scalar(@nameTokens) > 1 && $name eq "element") { 1005 $name = $nameTokens[-2]; 1006 } 1007 1008 return "${name}_type"; 1009 } 1010 971 1011 sub GenerateFunction { 972 1012 my ($object, $interfaceName, $function, $prefix, $parentNode) = @_; … … 979 1019 980 1020 my $functionSigType = $prefix eq "set_" ? "void" : $function->signature->type; 981 my $functionName = "webkit_dom_" . $decamelize . "_" . $prefix . decamelize($function->signature->name); 1021 my $functionSigName = GetFunctionSignatureName($interfaceName, $function); 1022 my $functionName = "webkit_dom_" . $decamelize . "_" . $prefix . $functionSigName; 982 1023 my $returnType = GetGlibTypeName($functionSigType); 983 1024 my $returnValueIsGDOMType = IsGDOMClassType($functionSigType); … … 1334 1375 } 1335 1376 1336 if ($attribute->signature->name eq "type") {1337 # This will conflict with the get_type() function we define to return a GType1338 # according to GObject conventions. Skip this for now.1339 next TOP;1340 }1341 1342 1377 my $attrNameUpper = $codeGenerator->WK_ucfirst($attribute->signature->name); 1343 1378 my $getname = "get${attrNameUpper}";
Note: See TracChangeset
for help on using the changeset viewer.