Changeset 145596 in webkit
- Timestamp:
- Mar 12, 2013 3:21:28 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r145592 r145596 1 2013-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 1 52 2013-03-12 Geoffrey Garen <ggaren@apple.com> 2 53 -
trunk/Source/WebCore/css/ElementRuleCollector.cpp
r145510 r145596 192 192 for (unsigned i = 0; i < size; ++i) { 193 193 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()))) { 195 195 RuleSet* regionRules = matchRequest.ruleSet->m_regionSelectorsAndRuleSets.at(i).ruleSet.get(); 196 196 ASSERT(regionRules); -
trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp
r144568 r145596 101 101 AtomicString urlString; 102 102 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); 104 104 #if ENABLE(SVG) 105 105 else if (node->hasTagName(SVGNames::imageTag)) 106 urlString = static_cast<Element*>(node)->getAttribute(XLinkNames::hrefAttr);106 urlString = toElement(node)->getAttribute(XLinkNames::hrefAttr); 107 107 #endif 108 108 else if (node->hasTagName(HTMLNames::embedTag) || node->hasTagName(HTMLNames::objectTag)) { 109 Element* element = static_cast<Element*>(node);109 Element* element = toElement(node); 110 110 urlString = element->getAttribute(element->imageSourceAttributeName()); 111 111 } … … 135 135 dataObject->setURL(url, title); 136 136 137 dataObject->setMarkup(createMarkup( static_cast<Element*>(node), IncludeNode, 0, ResolveAllURLs));137 dataObject->setMarkup(createMarkup(toElement(node), IncludeNode, 0, ResolveAllURLs)); 138 138 } 139 139 -
trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
r143463 r145596 72 72 if (!mediaNode) 73 73 mediaNode = node; 74 if (!mediaNode || !mediaNode->isElementNode() || ! static_cast<Element*>(mediaNode)->isMediaElement())74 if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement()) 75 75 return 0; 76 76 -
trunk/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp
r126601 r145596 902 902 bool RenderThemeQtMobile::checkMultiple(RenderObject* o) const 903 903 { 904 HTMLSelectElement* select = o ? static_cast<HTMLSelectElement*>(o->node()) : 0;904 HTMLSelectElement* select = o ? toHTMLSelectElement(o->node()) : 0; 905 905 return select ? select->multiple() : false; 906 906 } -
trunk/Source/WebCore/rendering/HitTestResult.cpp
r145448 r145596 219 219 for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode->parentNode()) { 220 220 if (titleNode->isElementNode()) { 221 String title = static_cast<Element*>(titleNode)->title();221 String title = toElement(titleNode)->title(); 222 222 if (!title.isEmpty()) { 223 223 if (RenderObject* renderer = titleNode->renderer()) … … 320 320 #endif 321 321 ) { 322 Element* element = static_cast<Element*>(m_innerNonSharedNode.get());322 Element* element = toElement(m_innerNonSharedNode.get()); 323 323 urlString = element->getAttribute(element->imageSourceAttributeName()); 324 324 } else … … 336 336 return KURL(); 337 337 338 HTMLPlugInImageElement* element = static_cast<HTMLPlugInImageElement*>(m_innerNonSharedNode.get());338 HTMLPlugInImageElement* element = toHTMLPlugInImageElement(m_innerNonSharedNode.get()); 339 339 KURL url = m_innerNonSharedNode->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(element->url())); 340 340 if (!url.isValid()) -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r145562 r145596 2448 2448 2449 2449 ASSERT(renderer()->node()->isElementNode()); 2450 Element* element = static_cast<Element*>(renderer()->node());2450 Element* element = toElement(renderer()->node()); 2451 2451 RenderBox* renderer = toRenderBox(element->renderer()); 2452 2452 … … 4334 4334 Node* node = result.innerNode(); 4335 4335 if (node && !result.URLElement()) 4336 result.setURLElement( static_cast<Element*>(node->enclosingLinkEventParentOrSelf()));4336 result.setURLElement(toElement(node->enclosingLinkEventParentOrSelf())); 4337 4337 4338 4338 // Now return whether we were inside this layer (this will always be true for the root -
trunk/Source/WebCore/rendering/RenderMenuList.cpp
r145406 r145596 342 342 // Check to ensure a page navigation has not occurred while 343 343 // the popup was up. 344 Document* doc = static_cast<Element*>(node())->document();344 Document* doc = toElement(node())->document(); 345 345 if (!doc || doc != doc->frame()->document()) 346 346 return; -
trunk/Source/WebCore/rendering/RenderObject.cpp
r145428 r145596 1112 1112 if (!n || !n->isLink() || !n->isElementNode()) 1113 1113 return; 1114 const AtomicString& href = static_cast<Element*>(n)->getAttribute(hrefAttr);1114 const AtomicString& href = toElement(n)->getAttribute(hrefAttr); 1115 1115 if (href.isNull()) 1116 1116 return; -
trunk/Source/WebCore/rendering/RenderPart.cpp
r145098 r145596 87 87 return false; 88 88 89 HTMLFrameOwnerElement* element = static_cast<HTMLFrameOwnerElement*>(node());89 HTMLFrameOwnerElement* element = toFrameOwnerElement(node()); 90 90 if (Document* contentDocument = element->contentDocument()) { 91 91 if (RenderView* view = contentDocument->renderView()) -
trunk/Source/WebCore/rendering/RenderRegion.cpp
r144773 r145596 190 190 // FIXME: Region styling doesn't work for pseudo elements. 191 191 if (node()) { 192 Element* regionElement = static_cast<Element*>(node());192 Element* regionElement = toElement(node()); 193 193 customRegionStyle = view()->document()->styleResolver()->checkRegionStyle(regionElement); 194 194 } -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r145305 r145596 169 169 // See if nowrap was set. 170 170 Length w = styleOrColLogicalWidth(); 171 String nowrap = static_cast<Element*>(node())->getAttribute(nowrapAttr);171 String nowrap = toElement(node())->getAttribute(nowrapAttr); 172 172 if (!nowrap.isNull() && w.isFixed()) 173 173 // Nowrap is set, but we didn't actually use it because of the -
trunk/Source/WebCore/rendering/RenderTheme.cpp
r145196 r145596 789 789 if (!node || !node->isElementNode()) 790 790 return true; 791 return static_cast<Element*>(node)->isEnabledFormControl();791 return toElement(node)->isEnabledFormControl(); 792 792 } 793 793 … … 815 815 Node* node = o->node(); 816 816 if (!node || !node->active() || !node->isElementNode() 817 || ! static_cast<Element*>(node)->isSpinButtonElement())817 || !toElement(node)->isSpinButtonElement()) 818 818 return false; 819 819 SpinButtonElement* element = static_cast<SpinButtonElement*>(node); … … 834 834 if (!node) 835 835 return false; 836 if (!node->isElementNode() || ! static_cast<Element*>(node)->isSpinButtonElement())836 if (!node->isElementNode() || !toElement(node)->isSpinButtonElement()) 837 837 return node->hovered(); 838 838 SpinButtonElement* element = static_cast<SpinButtonElement*>(node); … … 843 843 { 844 844 Node* node = o->node(); 845 if (!node || !node->isElementNode() || ! static_cast<Element*>(node)->isSpinButtonElement())845 if (!node || !node->isElementNode() || !toElement(node)->isSpinButtonElement()) 846 846 return false; 847 847 SpinButtonElement* element = static_cast<SpinButtonElement*>(node); … … 1033 1033 for (unsigned i = 0; Node* node = options->item(i); i++) { 1034 1034 ASSERT(node->hasTagName(optionTag)); 1035 HTMLOptionElement* optionElement = static_cast<HTMLOptionElement*>(node);1035 HTMLOptionElement* optionElement = toHTMLOptionElement(node); 1036 1036 String value = optionElement->value(); 1037 1037 if (!input->isValidValue(value)) -
trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp
r139353 r145596 483 483 if (!mediaNode) 484 484 mediaNode = node; 485 if (!mediaNode || !mediaNode->isElementNode() || ! static_cast<Element*>(mediaNode)->isMediaElement())485 if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement()) 486 486 return 0; 487 487 -
trunk/Source/WebCore/rendering/RenderTreeAsText.cpp
r141524 r145596 169 169 return false; 170 170 171 const HTMLElement* elem = static_cast<const HTMLElement*>(node);171 const HTMLElement* elem = toHTMLElement(node); 172 172 if (elem->getAttribute(classAttr) != "Apple-style-span") 173 173 return false; … … 431 431 if (Node* node = o.node()) { 432 432 if (node->hasID()) 433 ts << " id=\"" + static_cast<Element*>(node)->getIdAttribute() + "\"";433 ts << " id=\"" + toElement(node)->getIdAttribute() + "\""; 434 434 435 435 if (node->hasClass()) { … … 670 670 ts << " {" << tagName << "}"; 671 671 if (renderRegion->generatingNode()->isElementNode() && renderRegion->generatingNode()->hasID()) { 672 Element* element = static_cast<Element*>(renderRegion->generatingNode());672 Element* element = toElement(renderRegion->generatingNode()); 673 673 ts << " #" << element->idForStyleResolution(); 674 674 } -
trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
r145377 r145596 494 494 writeStandardPrefix(ts, object, indent); 495 495 496 Element* element = static_cast<Element*>(object.node());496 Element* element = toElement(object.node()); 497 497 const AtomicString& id = element->getIdAttribute(); 498 498 writeNameAndQuotedValue(ts, "id", id); -
trunk/Source/WebKit/win/ChangeLog
r145453 r145596 1 2013-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 1 16 2013-03-11 Jochen Eisinger <jochen@chromium.org> 2 17 -
trunk/Source/WebKit/win/DOMHTMLClasses.cpp
r122115 r145596 397 397 398 398 ASSERT(m_element && m_element->isHTMLElement()); 399 String idString = static_cast<HTMLElement*>(m_element)->getAttribute(idAttr);399 String idString = toHTMLElement(m_element)->getAttribute(idAttr); 400 400 *result = BString(idString).release(); 401 401 return S_OK; … … 483 483 { 484 484 ASSERT(m_element && m_element->isHTMLElement()); 485 WTF::String innerTextString = static_cast<HTMLElement*>(m_element)->innerText();485 WTF::String innerTextString = toHTMLElement(m_element)->innerText(); 486 486 *result = BString(innerTextString.characters(), innerTextString.length()).release(); 487 487 return S_OK; … … 492 492 { 493 493 ASSERT(m_element && m_element->isHTMLElement()); 494 HTMLElement* htmlEle = static_cast<HTMLElement*>(m_element);494 HTMLElement* htmlEle = toHTMLElement(m_element); 495 495 WTF::String textString(text, SysStringLen(text)); 496 496 WebCore::ExceptionCode ec = 0;
Note: See TracChangeset
for help on using the changeset viewer.