Changeset 205104 in webkit


Ignore:
Timestamp:
Aug 28, 2016 9:54:43 AM (8 years ago)
Author:
akling@apple.com
Message:

Clean up some .text attribute setters that don't throw.
<​https://webkit.org/b/161292>

Reviewed by Darin Adler.

Source/WebCore:

Remove [SetterRaisesException] for three .text attributes
and replace them with ASSERT_NO_EXCEPTION.

These setters behave like .textContent, which can't throw as
it's always okay to replace an Element's children with a Text.

  • html/HTMLAnchorElement.cpp:

(WebCore::HTMLAnchorElement::setText):

  • html/HTMLAnchorElement.h:
  • html/HTMLAnchorElement.idl:
  • html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::setText):

  • html/HTMLOptionElement.h:
  • html/HTMLOptionElement.idl:
  • html/HTMLTitleElement.cpp:

(WebCore::HTMLTitleElement::setText):

  • html/HTMLTitleElement.h:
  • html/HTMLTitleElement.idl:

Source/WebKit/mac:

  • DOM/DOMHTMLTitleElement.mm:

(-[DOMHTMLTitleElement setText:]):

Location:
trunk/Source
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r205103 r205104  
     12016-08-28  Andreas Kling  <akling@apple.com>
     2
     3        Clean up some .text attribute setters that don't throw.
     4        <https://webkit.org/b/161292>
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove [SetterRaisesException] for three .text attributes
     9        and replace them with ASSERT_NO_EXCEPTION.
     10
     11        These setters behave like .textContent, which can't throw as
     12        it's always okay to replace an Element's children with a Text.
     13
     14        * html/HTMLAnchorElement.cpp:
     15        (WebCore::HTMLAnchorElement::setText):
     16        * html/HTMLAnchorElement.h:
     17        * html/HTMLAnchorElement.idl:
     18        * html/HTMLOptionElement.cpp:
     19        (WebCore::HTMLOptionElement::setText):
     20        * html/HTMLOptionElement.h:
     21        * html/HTMLOptionElement.idl:
     22        * html/HTMLTitleElement.cpp:
     23        (WebCore::HTMLTitleElement::setText):
     24        * html/HTMLTitleElement.h:
     25        * html/HTMLTitleElement.idl:
     26
    1272016-08-24  Dave Hyatt  <hyatt@apple.com>
    228

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp

    r204894 r205104  
    143143}
    144144
    145 void webkit_dom_document_set_title(WebKitDOMDocument* self, const gchar* title)
    146 {
    147     webkit_dom_document_set_title_with_error(self, title, nullptr);
    148 }
    149 
    150 void webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement* self, const gchar* text)
    151 {
    152     webkit_dom_html_title_element_set_text_with_error(self, text, nullptr);
    153 }
    154 
    155145gchar* webkit_dom_document_get_default_charset(WebKitDOMDocument* self)
    156146{

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h

    r204894 r205104  
    172172webkit_dom_node_clone_node(WebKitDOMNode* self, gboolean deep, GError** error);
    173173
    174 /**
    175  * webkit_dom_document_set_title:
    176  * @self: A #WebKitDOMDocument
    177  * @title: A #gchar
    178  *
    179  * Deprecated: 2.14: Use webkit_dom_document_set_title_with_error() instead.
    180  */
    181 WEBKIT_DEPRECATED_FOR(webkit_dom_document_set_title_with_error) void
    182 webkit_dom_document_set_title(WebKitDOMDocument* self, const gchar* title);
    183 
    184 /**
    185  * webkit_dom_html_title_element_set_text:
    186  * @self: A #WebKitDOMHTMLTitleElement
    187  * @text: A #gchar
    188  *
    189  * Deprecated: 2.14: Use webkit_dom_html_title_element_set_text_with_error() instead.
    190  */
    191 WEBKIT_DEPRECATED_FOR(webkit_dom_html_title_element_set_text_with_error) void
    192 webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement* self, const gchar* text);
    193174
    194175/**

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols

    r204894 r205104  
    2222void webkit_dom_html_base_font_element_set_size(WebKitDOMHTMLBaseFontElement*, glong)
    2323WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode*, gboolean)
    24 void webkit_dom_document_set_title(WebKitDOMDocument*, const gchar*)
    25 void webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement*, const gchar*)
    2624gchar* webkit_dom_document_get_default_charset(WebKitDOMDocument*)
    2725WebKitDOMText* webkit_dom_text_replace_whole_text(WebKitDOMText*, const gchar*, GError**)

  • trunk/Source/WebCore/bindings/gobject/webkitdom.symbols

    r204894 r205104  
    3838gchar* webkit_dom_document_get_title(WebKitDOMDocument*)
    3939void webkit_dom_document_set_title(WebKitDOMDocument*, const gchar*)
    40 void webkit_dom_document_set_title_with_error(WebKitDOMDocument*, const gchar*, GError**)@2.14
    4140gchar* webkit_dom_document_get_charset(WebKitDOMDocument*)
    4241void webkit_dom_document_set_charset(WebKitDOMDocument*, const gchar*)
    … …  
    965964gchar* webkit_dom_html_title_element_get_text(WebKitDOMHTMLTitleElement*)
    966965void webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement*, const gchar*)
    967 void webkit_dom_html_title_element_set_text_with_error(WebKitDOMHTMLTitleElement*, const gchar*, GError**)@2.14
    968966GType webkit_dom_html_u_list_element_get_type(void)
    969967gchar* webkit_dom_html_u_list_element_get_type_attr(WebKitDOMHTMLUListElement*)

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

    r204681 r205104  
    10581058    my $functionName = shift;
    10591059
    1060     return $functionName eq "webkit_dom_document_set_title"
    1061         || $functionName eq "webkit_dom_html_title_element_set_text"
    1062         || $functionName eq "webkit_dom_node_clone_node";
     1060    return $functionName eq "webkit_dom_node_clone_node";
    10631061}
    10641062

  • trunk/Source/WebCore/html/HTMLAnchorElement.cpp

    r204871 r205104  
    333333}
    334334
    335 void HTMLAnchorElement::setText(const String& text, ExceptionCode& ec)
    336 {
    337     setTextContent(text, ec);
     335void HTMLAnchorElement::setText(const String& text)
     336{
     337    setTextContent(text, ASSERT_NO_EXCEPTION);
    338338}
    339339

  • trunk/Source/WebCore/html/HTMLAnchorElement.h

    r204871 r205104  
    7171
    7272    WEBCORE_EXPORT String text();
    73     void setText(const String&, ExceptionCode&);
     73    void setText(const String&);
    7474
    7575    bool isLiveLink() const;

  • trunk/Source/WebCore/html/HTMLAnchorElement.idl

    r204871 r205104  
    3535    [Reflect] attribute DOMString type;
    3636
    37     [SetterRaisesException] attribute DOMString text;
     37    attribute DOMString text;
    3838
    3939    [PutForwards=value] readonly attribute DOMTokenList relList;

  • trunk/Source/WebCore/html/HTMLOptionElement.cpp

    r204186 r205104  
    111111}
    112112
    113 void HTMLOptionElement::setText(const String &text, ExceptionCode& ec)
     113void HTMLOptionElement::setText(const String &text)
    114114{
    115115    Ref<HTMLOptionElement> protectedThis(*this);
    … …  
    128128    else {
    129129        removeChildren();
    130         appendChild(Text::create(document(), text), ec);
     130        appendChild(Text::create(document(), text), ASSERT_NO_EXCEPTION);
    131131    }
    132132   

  • trunk/Source/WebCore/html/HTMLOptionElement.h

    r204717 r205104  
    4040
    4141    WEBCORE_EXPORT String text() const;
    42     void setText(const String&, ExceptionCode&);
     42    void setText(const String&);
    4343
    4444    WEBCORE_EXPORT int index() const;

  • trunk/Source/WebCore/html/HTMLOptionElement.idl

    r204687 r205104  
    3232
    3333#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
    34     [SetterRaisesException] attribute DOMString text;
     34    attribute DOMString text;
    3535#else
    3636    readonly attribute DOMString text;

  • trunk/Source/WebCore/html/HTMLTitleElement.cpp

    r203047 r205104  
    9393}
    9494
    95 void HTMLTitleElement::setText(const String& value, ExceptionCode& ec)
     95void HTMLTitleElement::setText(const String& value)
    9696{
    97     setTextContent(value, ec);
     97    setTextContent(value, ASSERT_NO_EXCEPTION);
    9898}
    9999

  • trunk/Source/WebCore/html/HTMLTitleElement.h

    r204717 r205104  
    3333
    3434    WEBCORE_EXPORT String text() const;
    35     WEBCORE_EXPORT void setText(const String&, ExceptionCode&);
     35    WEBCORE_EXPORT void setText(const String&);
    3636
    3737    const StringWithDirection& textWithDirection() const { return m_title; }

  • trunk/Source/WebCore/html/HTMLTitleElement.idl

    r203047 r205104  
    1919
    2020interface HTMLTitleElement : HTMLElement {
    21     [SetterRaisesException] attribute DOMString text;
     21    attribute DOMString text;
    2222};
    2323

  • trunk/Source/WebKit/mac/ChangeLog

    r205065 r205104  
     12016-08-28  Andreas Kling  <akling@apple.com>
     2
     3        Clean up some .text attribute setters that don't throw.
     4        <https://webkit.org/b/161292>
     5
     6        Reviewed by Darin Adler.
     7
     8        * DOM/DOMHTMLTitleElement.mm:
     9        (-[DOMHTMLTitleElement setText:]):
     10
    1112016-08-26  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Source/WebKit/mac/DOM/DOMHTMLTitleElement.mm

    r204717 r205104  
    4848{
    4949    WebCore::JSMainThreadNullState state;
    50     WebCore::ExceptionCode ec = 0;
    51     IMPL->setText(newText, ec);
    52     raiseOnDOMError(ec);
     50    IMPL->setText(newText);
    5351}
    5452
Note: See TracChangeset for help on using the changeset viewer.