Changeset 152211 in webkit
- Timestamp:
- Jun 29, 2013 8:49:55 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r152210 r152211 1 2013-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 1 43 2013-06-29 ChangSeok Oh <changseok.oh@collabora.com> 2 44 -
trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
r152208 r152211 67 67 return false; 68 68 69 if ( m_optionElement->hasTagName(optgroupTag))69 if (isHTMLOptGroupElement(m_optionElement)) 70 70 return false; 71 71 … … 162 162 return toHTMLOptionElement(m_optionElement)->text(); 163 163 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(); 166 166 167 167 return String(); … … 208 208 return toHTMLOptionElement(m_optionElement)->ownerSelectElement(); 209 209 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(); 212 212 213 213 return 0; -
trunk/Source/WebCore/css/SelectorChecker.cpp
r152208 r152211 40 40 #include "HTMLInputElement.h" 41 41 #include "HTMLNames.h" 42 #include "HTMLOptGroupElement.h" 42 43 #include "HTMLOptionElement.h" 43 44 #include "HTMLProgressElement.h" … … 657 658 break; 658 659 case CSSSelector::PseudoEnabled: 659 if (element->isFormControlElement() || isHTMLOptionElement(element) || element->hasTagName(optgroupTag))660 if (element->isFormControlElement() || isHTMLOptionElement(element) || isHTMLOptGroupElement(element)) 660 661 return !element->isDisabledFormControl(); 661 662 break; … … 666 667 return element->isDefaultButtonForForm(); 667 668 case CSSSelector::PseudoDisabled: 668 if (element->isFormControlElement() || isHTMLOptionElement(element) || element->hasTagName(optgroupTag))669 if (element->isFormControlElement() || isHTMLOptionElement(element) || isHTMLOptGroupElement(element)) 669 670 return element->isDisabledFormControl(); 670 671 break; -
trunk/Source/WebCore/css/StyleResolver.cpp
r152208 r152211 69 69 #include "HTMLInputElement.h" 70 70 #include "HTMLNames.h" 71 #include "HTMLOptGroupElement.h" 71 72 #include "HTMLOptionElement.h" 72 73 #include "HTMLProgressElement.h" … … 660 661 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcListItems 661 662 // 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)) 663 664 return false; 664 665 -
trunk/Source/WebCore/html/HTMLOptGroupElement.h
r151717 r152211 64 64 }; 65 65 66 inline bool isHTMLOptGroupElement(Node* node) 67 { 68 return node->hasTagName(HTMLNames::optgroupTag); 69 } 70 71 inline HTMLOptGroupElement* toHTMLOptGroupElement(Node* node) 72 { 73 ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLOptGroupElement(node)); 74 return static_cast<HTMLOptGroupElement*>(node); 75 } 76 66 77 } //namespace 67 78 -
trunk/Source/WebCore/html/HTMLOptionElement.cpp
r152208 r152211 33 33 #include "HTMLDataListElement.h" 34 34 #include "HTMLNames.h" 35 #include "HTMLOptGroupElement.h" 35 36 #include "HTMLParserIdioms.h" 36 37 #include "HTMLSelectElement.h" … … 336 337 { 337 338 ContainerNode* parent = parentNode(); 338 if (parent && parent->hasTagName(optgroupTag))339 if (parent && isHTMLOptGroupElement(parent)) 339 340 return " " + text(); 340 341 return text(); … … 350 351 351 352 HTMLElement* parentElement = static_cast<HTMLElement*>(parentNode()); 352 return parentElement->hasTagName(optgroupTag) && parentElement->isDisabledFormControl();353 return isHTMLOptGroupElement(parentElement) && parentElement->isDisabledFormControl(); 353 354 } 354 355 -
trunk/Source/WebCore/html/HTMLSelectElement.cpp
r152208 r152211 351 351 return false; 352 352 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()); 354 354 return validationMessageShadowTreeContains(childContext.node()); 355 355 } … … 752 752 // flatten the tree automatically, so we follow suit. 753 753 // (http://www.w3.org/TR/html401/interact/forms.html#h-17.6) 754 if ( current->hasTagName(optgroupTag)) {754 if (isHTMLOptGroupElement(current)) { 755 755 m_listItems.append(current); 756 756 if (Element* nextElement = ElementTraversal::firstWithin(current)) { -
trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp
r152208 r152211 40 40 #include "HTMLHtmlElement.h" 41 41 #include "HTMLNames.h" 42 #include "HTMLOptGroupElement.h" 42 43 #include "HTMLOptionElement.h" 43 44 #include "HTMLParserIdioms.h" … … 66 67 || item->hasTagName(liTag) 67 68 || isHTMLOptionElement(item->node()) 68 || i tem->hasTagName(optgroupTag)69 || isHTMLOptGroupElement(item->node()) 69 70 || item->hasTagName(pTag) 70 71 || item->hasTagName(rpTag) -
trunk/Source/WebCore/html/parser/HTMLElementStack.cpp
r152208 r152211 31 31 #include "Element.h" 32 32 #include "HTMLNames.h" 33 #include "HTMLOptGroupElement.h" 33 34 #include "HTMLOptionElement.h" 34 35 #include "MathMLNames.h" … … 124 125 inline bool isSelectScopeMarker(HTMLStackItem* item) 125 126 { 126 return !i tem->hasTagName(optgroupTag) && !isHTMLOptionElement(item->node());127 return !isHTMLOptGroupElement(item->node()) && !isHTMLOptionElement(item->node()); 127 128 } 128 129 -
trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
r152208 r152211 34 34 #include "HTMLFormElement.h" 35 35 #include "HTMLNames.h" 36 #include "HTMLOptGroupElement.h" 36 37 #include "HTMLOptionElement.h" 37 38 #include "HTMLParserIdioms.h" … … 1388 1389 processEndTag(&endOption); 1389 1390 } 1390 if ( m_tree.currentStackItem()->hasTagName(optgroupTag)) {1391 if (isHTMLOptGroupElement(m_tree.currentStackItem()->node())) { 1391 1392 AtomicHTMLToken endOptgroup(HTMLToken::EndTag, optgroupTag.localName()); 1392 1393 processEndTag(&endOptgroup); … … 2252 2253 ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode); 2253 2254 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())) 2255 2256 processFakeEndTag(optionTag); 2256 if ( m_tree.currentStackItem()->hasTagName(optgroupTag)) {2257 if (isHTMLOptGroupElement(m_tree.currentStackItem()->node())) { 2257 2258 m_tree.openElements()->pop(); 2258 2259 return; -
trunk/Source/WebCore/rendering/RenderListBox.cpp
r152208 r152211 127 127 if (isHTMLOptionElement(element)) 128 128 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(); 131 131 FontDescription d = itemFont.fontDescription(); 132 132 d.setWeight(d.bolderWeight()); … … 407 407 if (isOptionElement) 408 408 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(); 411 411 applyTextTransform(style(), itemText, ' '); 412 412 … … 428 428 r.move(itemOffsetForAlignment(textRun, itemStyle, itemFont, r)); 429 429 430 if ( element->hasTagName(optgroupTag)) {430 if (isHTMLOptGroupElement(element)) { 431 431 FontDescription d = itemFont.fontDescription(); 432 432 d.setWeight(d.bolderWeight()); -
trunk/Source/WebCore/rendering/RenderMenuList.cpp
r152208 r152211 406 406 String itemString; 407 407 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(); 410 410 else if (isHTMLOptionElement(element)) 411 411 itemString = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel(); … … 453 453 bool groupEnabled = true; 454 454 if (Element* parentElement = element->parentElement()) { 455 if ( parentElement->hasTagName(optgroupTag))455 if (isHTMLOptGroupElement(parentElement)) 456 456 groupEnabled = !parentElement->isDisabledFormControl(); 457 457 } … … 597 597 { 598 598 const Vector<HTMLElement*>& listItems = selectElement()->listItems(); 599 return listIndex < listItems.size() && listItems[listIndex]->hasTagName(optgroupTag);599 return listIndex < listItems.size() && isHTMLOptGroupElement(listItems[listIndex]); 600 600 } 601 601 -
trunk/Source/WebKit/blackberry/ChangeLog
r152208 r152211 1 2013-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 1 14 2013-06-29 Kangil Han <kangil.han@samsung.com> 2 15 -
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
r152208 r152211 2062 2062 enableds[i] = option->isDisabledFormControl() ? 0 : 1; 2063 2063 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]); 2067 2067 labels[i] = optGroup->groupLabelText(); 2068 2068 enableds[i] = optGroup->isDisabledFormControl() ? 0 : 1;
Note: See TracChangeset
for help on using the changeset viewer.