Changeset 145596 in webkit


Ignore:
Timestamp:
Mar 12, 2013 3:21:28 PM (11 years ago)
Author:
inferno@chromium.org
Message:

Replace static_casts with to* helper functions.
https://bugs.webkit.org/show_bug.cgi?id=112164

Reviewed by Philip Rogers.

to* helper functions are preferred over static_cast calls since they
help to catch bad casts easily on the testing infrastructure.

Source/WebCore:

  • css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::collectMatchingRulesForRegion):

  • platform/gtk/PasteboardGtk.cpp:

(WebCore::getURLForImageNode):
(WebCore::Pasteboard::writeImage):

  • platform/gtk/RenderThemeGtk.cpp:

(WebCore::getMediaElementFromRenderObject):

  • platform/qt/RenderThemeQtMobile.cpp:

(WebCore::RenderThemeQtMobile::checkMultiple):

  • rendering/HitTestResult.cpp:

(WebCore::HitTestResult::title):
(WebCore::HitTestResult::absoluteImageURL):
(WebCore::HitTestResult::absolutePDFURL):

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::resize):
(WebCore::RenderLayer::hitTest):

  • rendering/RenderMenuList.cpp:

(WebCore::RenderMenuList::valueChanged):

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::addPDFURLRect):

  • rendering/RenderPart.cpp:

(WebCore::RenderPart::requiresAcceleratedCompositing):

  • rendering/RenderRegion.cpp:

(WebCore::RenderRegion::checkRegionStyle):

  • rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::computePreferredLogicalWidths):

  • rendering/RenderTheme.cpp:

(WebCore::RenderTheme::isEnabled):
(WebCore::RenderTheme::isSpinUpButtonPartPressed):
(WebCore::RenderTheme::isHovered):
(WebCore::RenderTheme::isSpinUpButtonPartHovered):
(WebCore::RenderTheme::paintSliderTicks):

  • rendering/RenderThemeWinCE.cpp:

(WebCore::mediaElementParent):

  • rendering/RenderTreeAsText.cpp:

(WebCore::isEmptyOrUnstyledAppleStyleSpan):
(WebCore::RenderTreeAsText::writeRenderObject):
(WebCore::writeRenderRegionList):

  • rendering/svg/SVGRenderTreeAsText.cpp:

(WebCore::writeSVGResourceContainer):

Source/WebKit/win:

  • DOMHTMLClasses.cpp:

(DOMHTMLElement::idName):
(DOMHTMLElement::innerText):
(DOMHTMLElement::setInnerText):

Location:
trunk/Source
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r145592 r145596  
     12013-03-12  Abhishek Arya  <inferno@chromium.org>
     2
     3        Replace static_casts with to* helper functions.
     4        https://bugs.webkit.org/show_bug.cgi?id=112164
     5
     6        Reviewed by Philip Rogers.
     7
     8        to* helper functions are preferred over static_cast calls since they
     9        help to catch bad casts easily on the testing infrastructure.
     10
     11        * css/ElementRuleCollector.cpp:
     12        (WebCore::ElementRuleCollector::collectMatchingRulesForRegion):
     13        * platform/gtk/PasteboardGtk.cpp:
     14        (WebCore::getURLForImageNode):
     15        (WebCore::Pasteboard::writeImage):
     16        * platform/gtk/RenderThemeGtk.cpp:
     17        (WebCore::getMediaElementFromRenderObject):
     18        * platform/qt/RenderThemeQtMobile.cpp:
     19        (WebCore::RenderThemeQtMobile::checkMultiple):
     20        * rendering/HitTestResult.cpp:
     21        (WebCore::HitTestResult::title):
     22        (WebCore::HitTestResult::absoluteImageURL):
     23        (WebCore::HitTestResult::absolutePDFURL):
     24        * rendering/RenderLayer.cpp:
     25        (WebCore::RenderLayer::resize):
     26        (WebCore::RenderLayer::hitTest):
     27        * rendering/RenderMenuList.cpp:
     28        (WebCore::RenderMenuList::valueChanged):
     29        * rendering/RenderObject.cpp:
     30        (WebCore::RenderObject::addPDFURLRect):
     31        * rendering/RenderPart.cpp:
     32        (WebCore::RenderPart::requiresAcceleratedCompositing):
     33        * rendering/RenderRegion.cpp:
     34        (WebCore::RenderRegion::checkRegionStyle):
     35        * rendering/RenderTableCell.cpp:
     36        (WebCore::RenderTableCell::computePreferredLogicalWidths):
     37        * rendering/RenderTheme.cpp:
     38        (WebCore::RenderTheme::isEnabled):
     39        (WebCore::RenderTheme::isSpinUpButtonPartPressed):
     40        (WebCore::RenderTheme::isHovered):
     41        (WebCore::RenderTheme::isSpinUpButtonPartHovered):
     42        (WebCore::RenderTheme::paintSliderTicks):
     43        * rendering/RenderThemeWinCE.cpp:
     44        (WebCore::mediaElementParent):
     45        * rendering/RenderTreeAsText.cpp:
     46        (WebCore::isEmptyOrUnstyledAppleStyleSpan):
     47        (WebCore::RenderTreeAsText::writeRenderObject):
     48        (WebCore::writeRenderRegionList):
     49        * rendering/svg/SVGRenderTreeAsText.cpp:
     50        (WebCore::writeSVGResourceContainer):
     51
    1522013-03-12  Geoffrey Garen  <ggaren@apple.com>
    253
  • trunk/Source/WebCore/css/ElementRuleCollector.cpp

    r145510 r145596  
    192192    for (unsigned i = 0; i < size; ++i) {
    193193        const CSSSelector* regionSelector = matchRequest.ruleSet->m_regionSelectorsAndRuleSets.at(i).selector;
    194         if (checkRegionSelector(regionSelector, static_cast<Element*>(m_regionForStyling->node()))) {
     194        if (checkRegionSelector(regionSelector, toElement(m_regionForStyling->node()))) {
    195195            RuleSet* regionRules = matchRequest.ruleSet->m_regionSelectorsAndRuleSets.at(i).ruleSet.get();
    196196            ASSERT(regionRules);
  • trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp

    r144568 r145596  
    101101    AtomicString urlString;
    102102    if (node->hasTagName(HTMLNames::imgTag) || node->hasTagName(HTMLNames::inputTag))
    103         urlString = static_cast<Element*>(node)->getAttribute(HTMLNames::srcAttr);
     103        urlString = toElement(node)->getAttribute(HTMLNames::srcAttr);
    104104#if ENABLE(SVG)
    105105    else if (node->hasTagName(SVGNames::imageTag))
    106         urlString = static_cast<Element*>(node)->getAttribute(XLinkNames::hrefAttr);
     106        urlString = toElement(node)->getAttribute(XLinkNames::hrefAttr);
    107107#endif
    108108    else if (node->hasTagName(HTMLNames::embedTag) || node->hasTagName(HTMLNames::objectTag)) {
    109         Element* element = static_cast<Element*>(node);
     109        Element* element = toElement(node);
    110110        urlString = element->getAttribute(element->imageSourceAttributeName());
    111111    }
     
    135135        dataObject->setURL(url, title);
    136136
    137         dataObject->setMarkup(createMarkup(static_cast<Element*>(node), IncludeNode, 0, ResolveAllURLs));
     137        dataObject->setMarkup(createMarkup(toElement(node), IncludeNode, 0, ResolveAllURLs));
    138138    }
    139139
  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp

    r143463 r145596  
    7272    if (!mediaNode)
    7373        mediaNode = node;
    74     if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
     74    if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
    7575        return 0;
    7676
  • trunk/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp

    r126601 r145596  
    902902bool RenderThemeQtMobile::checkMultiple(RenderObject* o) const
    903903{
    904     HTMLSelectElement* select = o ? static_cast<HTMLSelectElement*>(o->node()) : 0;
     904    HTMLSelectElement* select = o ? toHTMLSelectElement(o->node()) : 0;
    905905    return select ? select->multiple() : false;
    906906}
  • trunk/Source/WebCore/rendering/HitTestResult.cpp

    r145448 r145596  
    219219    for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode->parentNode()) {
    220220        if (titleNode->isElementNode()) {
    221             String title = static_cast<Element*>(titleNode)->title();
     221            String title = toElement(titleNode)->title();
    222222            if (!title.isEmpty()) {
    223223                if (RenderObject* renderer = titleNode->renderer())
     
    320320#endif
    321321       ) {
    322         Element* element = static_cast<Element*>(m_innerNonSharedNode.get());
     322        Element* element = toElement(m_innerNonSharedNode.get());
    323323        urlString = element->getAttribute(element->imageSourceAttributeName());
    324324    } else
     
    336336        return KURL();
    337337
    338     HTMLPlugInImageElement* element = static_cast<HTMLPlugInImageElement*>(m_innerNonSharedNode.get());
     338    HTMLPlugInImageElement* element = toHTMLPlugInImageElement(m_innerNonSharedNode.get());
    339339    KURL url = m_innerNonSharedNode->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(element->url()));
    340340    if (!url.isValid())
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r145562 r145596  
    24482448
    24492449    ASSERT(renderer()->node()->isElementNode());
    2450     Element* element = static_cast<Element*>(renderer()->node());
     2450    Element* element = toElement(renderer()->node());
    24512451    RenderBox* renderer = toRenderBox(element->renderer());
    24522452
     
    43344334    Node* node = result.innerNode();
    43354335    if (node && !result.URLElement())
    4336         result.setURLElement(static_cast<Element*>(node->enclosingLinkEventParentOrSelf()));
     4336        result.setURLElement(toElement(node->enclosingLinkEventParentOrSelf()));
    43374337
    43384338    // Now return whether we were inside this layer (this will always be true for the root
  • trunk/Source/WebCore/rendering/RenderMenuList.cpp

    r145406 r145596  
    342342    // Check to ensure a page navigation has not occurred while
    343343    // the popup was up.
    344     Document* doc = static_cast<Element*>(node())->document();
     344    Document* doc = toElement(node())->document();
    345345    if (!doc || doc != doc->frame()->document())
    346346        return;
  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r145428 r145596  
    11121112    if (!n || !n->isLink() || !n->isElementNode())
    11131113        return;
    1114     const AtomicString& href = static_cast<Element*>(n)->getAttribute(hrefAttr);
     1114    const AtomicString& href = toElement(n)->getAttribute(hrefAttr);
    11151115    if (href.isNull())
    11161116        return;
  • trunk/Source/WebCore/rendering/RenderPart.cpp

    r145098 r145596  
    8787        return false;
    8888
    89     HTMLFrameOwnerElement* element = static_cast<HTMLFrameOwnerElement*>(node());
     89    HTMLFrameOwnerElement* element = toFrameOwnerElement(node());
    9090    if (Document* contentDocument = element->contentDocument()) {
    9191        if (RenderView* view = contentDocument->renderView())
  • trunk/Source/WebCore/rendering/RenderRegion.cpp

    r144773 r145596  
    190190    // FIXME: Region styling doesn't work for pseudo elements.
    191191    if (node()) {
    192         Element* regionElement = static_cast<Element*>(node());
     192        Element* regionElement = toElement(node());
    193193        customRegionStyle = view()->document()->styleResolver()->checkRegionStyle(regionElement);
    194194    }
  • trunk/Source/WebCore/rendering/RenderTableCell.cpp

    r145305 r145596  
    169169        // See if nowrap was set.
    170170        Length w = styleOrColLogicalWidth();
    171         String nowrap = static_cast<Element*>(node())->getAttribute(nowrapAttr);
     171        String nowrap = toElement(node())->getAttribute(nowrapAttr);
    172172        if (!nowrap.isNull() && w.isFixed())
    173173            // Nowrap is set, but we didn't actually use it because of the
  • trunk/Source/WebCore/rendering/RenderTheme.cpp

    r145196 r145596  
    789789    if (!node || !node->isElementNode())
    790790        return true;
    791     return static_cast<Element*>(node)->isEnabledFormControl();
     791    return toElement(node)->isEnabledFormControl();
    792792}
    793793
     
    815815    Node* node = o->node();
    816816    if (!node || !node->active() || !node->isElementNode()
    817         || !static_cast<Element*>(node)->isSpinButtonElement())
     817        || !toElement(node)->isSpinButtonElement())
    818818        return false;
    819819    SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
     
    834834    if (!node)
    835835        return false;
    836     if (!node->isElementNode() || !static_cast<Element*>(node)->isSpinButtonElement())
     836    if (!node->isElementNode() || !toElement(node)->isSpinButtonElement())
    837837        return node->hovered();
    838838    SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
     
    843843{
    844844    Node* node = o->node();
    845     if (!node || !node->isElementNode() || !static_cast<Element*>(node)->isSpinButtonElement())
     845    if (!node || !node->isElementNode() || !toElement(node)->isSpinButtonElement())
    846846        return false;
    847847    SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
     
    10331033    for (unsigned i = 0; Node* node = options->item(i); i++) {
    10341034        ASSERT(node->hasTagName(optionTag));
    1035         HTMLOptionElement* optionElement = static_cast<HTMLOptionElement*>(node);
     1035        HTMLOptionElement* optionElement = toHTMLOptionElement(node);
    10361036        String value = optionElement->value();
    10371037        if (!input->isValidValue(value))
  • trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp

    r139353 r145596  
    483483    if (!mediaNode)
    484484        mediaNode = node;
    485     if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
     485    if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
    486486        return 0;
    487487
  • trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

    r141524 r145596  
    169169        return false;
    170170
    171     const HTMLElement* elem = static_cast<const HTMLElement*>(node);
     171    const HTMLElement* elem = toHTMLElement(node);
    172172    if (elem->getAttribute(classAttr) != "Apple-style-span")
    173173        return false;
     
    431431        if (Node* node = o.node()) {
    432432            if (node->hasID())
    433                 ts << " id=\"" + static_cast<Element*>(node)->getIdAttribute() + "\"";
     433                ts << " id=\"" + toElement(node)->getIdAttribute() + "\"";
    434434
    435435            if (node->hasClass()) {
     
    670670                ts << " {" << tagName << "}";
    671671            if (renderRegion->generatingNode()->isElementNode() && renderRegion->generatingNode()->hasID()) {
    672                 Element* element = static_cast<Element*>(renderRegion->generatingNode());
     672                Element* element = toElement(renderRegion->generatingNode());
    673673                ts << " #" << element->idForStyleResolution();
    674674            }
  • trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp

    r145377 r145596  
    494494    writeStandardPrefix(ts, object, indent);
    495495
    496     Element* element = static_cast<Element*>(object.node());
     496    Element* element = toElement(object.node());
    497497    const AtomicString& id = element->getIdAttribute();
    498498    writeNameAndQuotedValue(ts, "id", id);   
  • trunk/Source/WebKit/win/ChangeLog

    r145453 r145596  
     12013-03-12  Abhishek Arya  <inferno@chromium.org>
     2
     3        Replace static_casts with to* helper functions.
     4        https://bugs.webkit.org/show_bug.cgi?id=112164
     5
     6        Reviewed by Philip Rogers.
     7
     8        to* helper functions are preferred over static_cast calls since they
     9        help to catch bad casts easily on the testing infrastructure.
     10
     11        * DOMHTMLClasses.cpp:
     12        (DOMHTMLElement::idName):
     13        (DOMHTMLElement::innerText):
     14        (DOMHTMLElement::setInnerText):
     15
    1162013-03-11  Jochen Eisinger  <jochen@chromium.org>
    217
  • trunk/Source/WebKit/win/DOMHTMLClasses.cpp

    r122115 r145596  
    397397
    398398    ASSERT(m_element && m_element->isHTMLElement());
    399     String idString = static_cast<HTMLElement*>(m_element)->getAttribute(idAttr);
     399    String idString = toHTMLElement(m_element)->getAttribute(idAttr);
    400400    *result = BString(idString).release();
    401401    return S_OK;
     
    483483{
    484484    ASSERT(m_element && m_element->isHTMLElement());
    485     WTF::String innerTextString = static_cast<HTMLElement*>(m_element)->innerText();
     485    WTF::String innerTextString = toHTMLElement(m_element)->innerText();
    486486    *result = BString(innerTextString.characters(), innerTextString.length()).release();
    487487    return S_OK;
     
    492492{
    493493    ASSERT(m_element && m_element->isHTMLElement());
    494     HTMLElement* htmlEle = static_cast<HTMLElement*>(m_element);
     494    HTMLElement* htmlEle = toHTMLElement(m_element);
    495495    WTF::String textString(text, SysStringLen(text));
    496496    WebCore::ExceptionCode ec = 0;
Note: See TracChangeset for help on using the changeset viewer.