Changeset 152211 in webkit


Ignore:
Timestamp:
Jun 29, 2013 8:49:55 AM (11 years ago)
Author:
kangil.han@samsung.com
Message:

Adopt is/toHTMLOptGroupElement for code cleanup
​https://bugs.webkit.org/show_bug.cgi?id=118213

Reviewed by Andreas Kling.

To enhance readability, this patch adopts is/toHTMLOptGroupElement.
This also helps out to reduce duplicated use of static_cast.

Source/WebCore:

  • accessibility/AccessibilityListBoxOption.cpp:

(WebCore::AccessibilityListBoxOption::isEnabled):
(WebCore::AccessibilityListBoxOption::stringValue):
(WebCore::AccessibilityListBoxOption::listBoxOptionParentNode):

  • css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::canShareStyleWithElement):

  • html/HTMLOptGroupElement.h:

(WebCore::isHTMLOptGroupElement):
(WebCore::toHTMLOptGroupElement):

  • html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::textIndentedToRespectGroupLabel):
(WebCore::HTMLOptionElement::isDisabledFormControl):

  • html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::childShouldCreateRenderer):
(WebCore::HTMLSelectElement::recalcListItems):

  • html/parser/HTMLConstructionSite.cpp:

(WebCore::hasImpliedEndTag):

  • html/parser/HTMLElementStack.cpp:

(WebCore::HTMLNames::isSelectScopeMarker):

  • html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::processStartTag):
(WebCore::HTMLTreeBuilder::processEndTag):

  • rendering/RenderListBox.cpp:

(WebCore::RenderListBox::updateFromElement):
(WebCore::RenderListBox::paintItemForeground):

  • rendering/RenderMenuList.cpp:

(WebCore::RenderMenuList::itemText):
(WebCore::RenderMenuList::itemIsEnabled):
(WebCore::RenderMenuList::itemIsLabel):

Source/WebKit/blackberry:

  • WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::openSelectPopup):

Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r152210 r152211  
     12013-06-29  Kangil Han  <kangil.han@samsung.com>
     2
     3        Adopt is/toHTMLOptGroupElement for code cleanup
     4        https://bugs.webkit.org/show_bug.cgi?id=118213
     5
     6        Reviewed by Andreas Kling.
     7
     8        To enhance readability, this patch adopts is/toHTMLOptGroupElement.
     9        This also helps out to reduce duplicated use of static_cast.
     10
     11        * accessibility/AccessibilityListBoxOption.cpp:
     12        (WebCore::AccessibilityListBoxOption::isEnabled):
     13        (WebCore::AccessibilityListBoxOption::stringValue):
     14        (WebCore::AccessibilityListBoxOption::listBoxOptionParentNode):
     15        * css/SelectorChecker.cpp:
     16        (WebCore::SelectorChecker::checkOne):
     17        * css/StyleResolver.cpp:
     18        (WebCore::StyleResolver::canShareStyleWithElement):
     19        * html/HTMLOptGroupElement.h:
     20        (WebCore::isHTMLOptGroupElement):
     21        (WebCore::toHTMLOptGroupElement):
     22        * html/HTMLOptionElement.cpp:
     23        (WebCore::HTMLOptionElement::textIndentedToRespectGroupLabel):
     24        (WebCore::HTMLOptionElement::isDisabledFormControl):
     25        * html/HTMLSelectElement.cpp:
     26        (WebCore::HTMLSelectElement::childShouldCreateRenderer):
     27        (WebCore::HTMLSelectElement::recalcListItems):
     28        * html/parser/HTMLConstructionSite.cpp:
     29        (WebCore::hasImpliedEndTag):
     30        * html/parser/HTMLElementStack.cpp:
     31        (WebCore::HTMLNames::isSelectScopeMarker):
     32        * html/parser/HTMLTreeBuilder.cpp:
     33        (WebCore::HTMLTreeBuilder::processStartTag):
     34        (WebCore::HTMLTreeBuilder::processEndTag):
     35        * rendering/RenderListBox.cpp:
     36        (WebCore::RenderListBox::updateFromElement):
     37        (WebCore::RenderListBox::paintItemForeground):
     38        * rendering/RenderMenuList.cpp:
     39        (WebCore::RenderMenuList::itemText):
     40        (WebCore::RenderMenuList::itemIsEnabled):
     41        (WebCore::RenderMenuList::itemIsLabel):
     42
    1432013-06-29  ChangSeok Oh  <changseok.oh@collabora.com>
    244

  • trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp

    r152208 r152211  
    6767        return false;
    6868   
    69     if (m_optionElement->hasTagName(optgroupTag))
     69    if (isHTMLOptGroupElement(m_optionElement))
    7070        return false;
    7171
    … …  
    162162        return toHTMLOptionElement(m_optionElement)->text();
    163163   
    164     if (m_optionElement->hasTagName(optgroupTag))
    165         return static_cast<HTMLOptGroupElement*>(m_optionElement)->groupLabelText();
     164    if (isHTMLOptGroupElement(m_optionElement))
     165        return toHTMLOptGroupElement(m_optionElement)->groupLabelText();
    166166   
    167167    return String();
    … …  
    208208        return toHTMLOptionElement(m_optionElement)->ownerSelectElement();
    209209
    210     if (m_optionElement->hasTagName(optgroupTag))
    211         return static_cast<HTMLOptGroupElement*>(m_optionElement)->ownerSelectElement();
     210    if (isHTMLOptGroupElement(m_optionElement))
     211        return toHTMLOptGroupElement(m_optionElement)->ownerSelectElement();
    212212
    213213    return 0;

  • trunk/Source/WebCore/css/SelectorChecker.cpp

    r152208 r152211  
    4040#include "HTMLInputElement.h"
    4141#include "HTMLNames.h"
     42#include "HTMLOptGroupElement.h"
    4243#include "HTMLOptionElement.h"
    4344#include "HTMLProgressElement.h"
    … …  
    657658            break;
    658659        case CSSSelector::PseudoEnabled:
    659             if (element->isFormControlElement() || isHTMLOptionElement(element) || element->hasTagName(optgroupTag))
     660            if (element->isFormControlElement() || isHTMLOptionElement(element) || isHTMLOptGroupElement(element))
    660661                return !element->isDisabledFormControl();
    661662            break;
    … …  
    666667            return element->isDefaultButtonForForm();
    667668        case CSSSelector::PseudoDisabled:
    668             if (element->isFormControlElement() || isHTMLOptionElement(element) || element->hasTagName(optgroupTag))
     669            if (element->isFormControlElement() || isHTMLOptionElement(element) || isHTMLOptGroupElement(element))
    669670                return element->isDisabledFormControl();
    670671            break;

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r152208 r152211  
    6969#include "HTMLInputElement.h"
    7070#include "HTMLNames.h"
     71#include "HTMLOptGroupElement.h"
    7172#include "HTMLOptionElement.h"
    7273#include "HTMLProgressElement.h"
    … …  
    660661    // Before doing so, we need to resolve issues in HTMLSelectElement::recalcListItems
    661662    // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cgi?id=88405
    662     if (isHTMLOptionElement(element) || element->hasTagName(optgroupTag))
     663    if (isHTMLOptionElement(element) || isHTMLOptGroupElement(element))
    663664        return false;
    664665

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

    r151717 r152211  
    6464};
    6565
     66inline bool isHTMLOptGroupElement(Node* node)
     67{
     68    return node->hasTagName(HTMLNames::optgroupTag);
     69}
     70
     71inline HTMLOptGroupElement* toHTMLOptGroupElement(Node* node)
     72{
     73    ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLOptGroupElement(node));
     74    return static_cast<HTMLOptGroupElement*>(node);
     75}
     76
    6677} //namespace
    6778

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

    r152208 r152211  
    3333#include "HTMLDataListElement.h"
    3434#include "HTMLNames.h"
     35#include "HTMLOptGroupElement.h"
    3536#include "HTMLParserIdioms.h"
    3637#include "HTMLSelectElement.h"
    … …  
    336337{
    337338    ContainerNode* parent = parentNode();
    338     if (parent && parent->hasTagName(optgroupTag))
     339    if (parent && isHTMLOptGroupElement(parent))
    339340        return "    " + text();
    340341    return text();
    … …  
    350351
    351352    HTMLElement* parentElement = static_cast<HTMLElement*>(parentNode());
    352     return parentElement->hasTagName(optgroupTag) && parentElement->isDisabledFormControl();
     353    return isHTMLOptGroupElement(parentElement) && parentElement->isDisabledFormControl();
    353354}
    354355

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

    r152208 r152211  
    351351        return false;
    352352    if (!usesMenuList())
    353         return isHTMLOptionElement(childContext.node()) || childContext.node()->hasTagName(HTMLNames::optgroupTag) || validationMessageShadowTreeContains(childContext.node());
     353        return isHTMLOptionElement(childContext.node()) || isHTMLOptGroupElement(childContext.node()) || validationMessageShadowTreeContains(childContext.node());
    354354    return validationMessageShadowTreeContains(childContext.node());
    355355}
    … …  
    752752        // flatten the tree automatically, so we follow suit.
    753753        // (http://www.w3.org/TR/html401/interact/forms.html#h-17.6)
    754         if (current->hasTagName(optgroupTag)) {
     754        if (isHTMLOptGroupElement(current)) {
    755755            m_listItems.append(current);
    756756            if (Element* nextElement = ElementTraversal::firstWithin(current)) {

  • trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

    r152208 r152211  
    4040#include "HTMLHtmlElement.h"
    4141#include "HTMLNames.h"
     42#include "HTMLOptGroupElement.h"
    4243#include "HTMLOptionElement.h"
    4344#include "HTMLParserIdioms.h"
    … …  
    6667        || item->hasTagName(liTag)
    6768        || isHTMLOptionElement(item->node())
    68         || item->hasTagName(optgroupTag)
     69        || isHTMLOptGroupElement(item->node())
    6970        || item->hasTagName(pTag)
    7071        || item->hasTagName(rpTag)

  • trunk/Source/WebCore/html/parser/HTMLElementStack.cpp

    r152208 r152211  
    3131#include "Element.h"
    3232#include "HTMLNames.h"
     33#include "HTMLOptGroupElement.h"
    3334#include "HTMLOptionElement.h"
    3435#include "MathMLNames.h"
    … …  
    124125inline bool isSelectScopeMarker(HTMLStackItem* item)
    125126{
    126     return !item->hasTagName(optgroupTag) && !isHTMLOptionElement(item->node());
     127    return !isHTMLOptGroupElement(item->node()) && !isHTMLOptionElement(item->node());
    127128}
    128129

  • trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

    r152208 r152211  
    3434#include "HTMLFormElement.h"
    3535#include "HTMLNames.h"
     36#include "HTMLOptGroupElement.h"
    3637#include "HTMLOptionElement.h"
    3738#include "HTMLParserIdioms.h"
    … …  
    13881389                processEndTag(&endOption);
    13891390            }
    1390             if (m_tree.currentStackItem()->hasTagName(optgroupTag)) {
     1391            if (isHTMLOptGroupElement(m_tree.currentStackItem()->node())) {
    13911392                AtomicHTMLToken endOptgroup(HTMLToken::EndTag, optgroupTag.localName());
    13921393                processEndTag(&endOptgroup);
    … …  
    22522253        ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode);
    22532254        if (token->name() == optgroupTag) {
    2254             if (isHTMLOptionElement(m_tree.currentStackItem()->node()) && m_tree.oneBelowTop() && m_tree.oneBelowTop()->hasTagName(optgroupTag))
     2255            if (isHTMLOptionElement(m_tree.currentStackItem()->node()) && m_tree.oneBelowTop() && isHTMLOptGroupElement(m_tree.oneBelowTop()->node()))
    22552256                processFakeEndTag(optionTag);
    2256             if (m_tree.currentStackItem()->hasTagName(optgroupTag)) {
     2257            if (isHTMLOptGroupElement(m_tree.currentStackItem()->node())) {
    22572258                m_tree.openElements()->pop();
    22582259                return;

  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r152208 r152211  
    127127            if (isHTMLOptionElement(element))
    128128                text = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel();
    129             else if (element->hasTagName(optgroupTag)) {
    130                 text = static_cast<const HTMLOptGroupElement*>(element)->groupLabelText();
     129            else if (isHTMLOptGroupElement(element)) {
     130                text = toHTMLOptGroupElement(element)->groupLabelText();
    131131                FontDescription d = itemFont.fontDescription();
    132132                d.setWeight(d.bolderWeight());
    … …  
    407407    if (isOptionElement)
    408408        itemText = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel();
    409     else if (element->hasTagName(optgroupTag))
    410         itemText = static_cast<const HTMLOptGroupElement*>(element)->groupLabelText();
     409    else if (isHTMLOptGroupElement(element))
     410        itemText = toHTMLOptGroupElement(element)->groupLabelText();
    411411    applyTextTransform(style(), itemText, ' ');
    412412
    … …  
    428428    r.move(itemOffsetForAlignment(textRun, itemStyle, itemFont, r));
    429429
    430     if (element->hasTagName(optgroupTag)) {
     430    if (isHTMLOptGroupElement(element)) {
    431431        FontDescription d = itemFont.fontDescription();
    432432        d.setWeight(d.bolderWeight());

  • trunk/Source/WebCore/rendering/RenderMenuList.cpp

    r152208 r152211  
    406406    String itemString;
    407407    Element* element = listItems[listIndex];
    408     if (element->hasTagName(optgroupTag))
    409         itemString = static_cast<const HTMLOptGroupElement*>(element)->groupLabelText();
     408    if (isHTMLOptGroupElement(element))
     409        itemString = toHTMLOptGroupElement(element)->groupLabelText();
    410410    else if (isHTMLOptionElement(element))
    411411        itemString = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel();
    … …  
    453453    bool groupEnabled = true;
    454454    if (Element* parentElement = element->parentElement()) {
    455         if (parentElement->hasTagName(optgroupTag))
     455        if (isHTMLOptGroupElement(parentElement))
    456456            groupEnabled = !parentElement->isDisabledFormControl();
    457457    }
    … …  
    597597{
    598598    const Vector<HTMLElement*>& listItems = selectElement()->listItems();
    599     return listIndex < listItems.size() && listItems[listIndex]->hasTagName(optgroupTag);
     599    return listIndex < listItems.size() && isHTMLOptGroupElement(listItems[listIndex]);
    600600}
    601601

  • trunk/Source/WebKit/blackberry/ChangeLog

    r152208 r152211  
     12013-06-29  Kangil Han  <kangil.han@samsung.com>
     2
     3        Adopt is/toHTMLOptGroupElement for code cleanup
     4        https://bugs.webkit.org/show_bug.cgi?id=118213
     5
     6        Reviewed by Andreas Kling.
     7
     8        To enhance readability, this patch adopts is/toHTMLOptGroupElement.
     9        This also helps out to reduce duplicated use of static_cast.
     10
     11        * WebKitSupport/InputHandler.cpp:
     12        (BlackBerry::WebKit::InputHandler::openSelectPopup):
     13
    1142013-06-29  Kangil Han  <kangil.han@samsung.com>
    215

  • trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

    r152208 r152211  
    20622062                enableds[i] = option->isDisabledFormControl() ? 0 : 1;
    20632063                selecteds[i] = option->selected();
    2064                 itemTypes[i] = option->parentNode() && option->parentNode()->hasTagName(HTMLNames::optgroupTag) ? TypeOptionInGroup : TypeOption;
    2065             } else if (listItems[i]->hasTagName(HTMLNames::optgroupTag)) {
    2066                 HTMLOptGroupElement* optGroup = static_cast<HTMLOptGroupElement*>(listItems[i]);
     2064                itemTypes[i] = option->parentNode() && isHTMLOptGroupElement(option->parentNode()) ? TypeOptionInGroup : TypeOption;
     2065            } else if (isHTMLOptGroupElement(listItems[i])) {
     2066                HTMLOptGroupElement* optGroup = toHTMLOptGroupElement(listItems[i]);
    20672067                labels[i] = optGroup->groupLabelText();
    20682068                enableds[i] = optGroup->isDisabledFormControl() ? 0 : 1;
Note: See TracChangeset for help on using the changeset viewer.