Diff
Modified: trunk/Source/WebCore/ChangeLog (145595 => 145596)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 22:21:28 UTC (rev 145596)
@@ -1,3 +1,54 @@
+2013-03-12 Abhishek Arya <infe...@chromium.org>
+
+ 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.
+
+ * 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):
+
2013-03-12 Geoffrey Garen <gga...@apple.com>
Moved RunLoopTimer and SchedulePair to WTF
Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (145595 => 145596)
--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -191,7 +191,7 @@
unsigned size = matchRequest.ruleSet->m_regionSelectorsAndRuleSets.size();
for (unsigned i = 0; i < size; ++i) {
const CSSSelector* regionSelector = matchRequest.ruleSet->m_regionSelectorsAndRuleSets.at(i).selector;
- if (checkRegionSelector(regionSelector, static_cast<Element*>(m_regionForStyling->node()))) {
+ if (checkRegionSelector(regionSelector, toElement(m_regionForStyling->node()))) {
RuleSet* regionRules = matchRequest.ruleSet->m_regionSelectorsAndRuleSets.at(i).ruleSet.get();
ASSERT(regionRules);
collectMatchingRules(MatchRequest(regionRules, matchRequest.includeEmptyRules, matchRequest.scope), ruleRange);
Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (145595 => 145596)
--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -100,13 +100,13 @@
// FIXME: Later this code should be shared with Chromium somehow. Chances are all platforms want it.
AtomicString urlString;
if (node->hasTagName(HTMLNames::imgTag) || node->hasTagName(HTMLNames::inputTag))
- urlString = static_cast<Element*>(node)->getAttribute(HTMLNames::srcAttr);
+ urlString = toElement(node)->getAttribute(HTMLNames::srcAttr);
#if ENABLE(SVG)
else if (node->hasTagName(SVGNames::imageTag))
- urlString = static_cast<Element*>(node)->getAttribute(XLinkNames::hrefAttr);
+ urlString = toElement(node)->getAttribute(XLinkNames::hrefAttr);
#endif
else if (node->hasTagName(HTMLNames::embedTag) || node->hasTagName(HTMLNames::objectTag)) {
- Element* element = static_cast<Element*>(node);
+ Element* element = toElement(node);
urlString = element->getAttribute(element->imageSourceAttributeName());
}
return urlString.isEmpty() ? KURL() : node->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(urlString));
@@ -134,7 +134,7 @@
if (!url.isEmpty()) {
dataObject->setURL(url, title);
- dataObject->setMarkup(createMarkup(static_cast<Element*>(node), IncludeNode, 0, ResolveAllURLs));
+ dataObject->setMarkup(createMarkup(toElement(node), IncludeNode, 0, ResolveAllURLs));
}
GRefPtr<GdkPixbuf> pixbuf = adoptGRef(image->getGdkPixbuf());
Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (145595 => 145596)
--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -71,7 +71,7 @@
Node* mediaNode = node ? node->shadowHost() : 0;
if (!mediaNode)
mediaNode = node;
- if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
+ if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
return 0;
return static_cast<HTMLMediaElement*>(mediaNode);
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp (145595 => 145596)
--- trunk/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -901,7 +901,7 @@
bool RenderThemeQtMobile::checkMultiple(RenderObject* o) const
{
- HTMLSelectElement* select = o ? static_cast<HTMLSelectElement*>(o->node()) : 0;
+ HTMLSelectElement* select = o ? toHTMLSelectElement(o->node()) : 0;
return select ? select->multiple() : false;
}
Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -218,7 +218,7 @@
// For <area> tags in image maps, walk the tree for the <area>, not the <img> using it.
for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode->parentNode()) {
if (titleNode->isElementNode()) {
- String title = static_cast<Element*>(titleNode)->title();
+ String title = toElement(titleNode)->title();
if (!title.isEmpty()) {
if (RenderObject* renderer = titleNode->renderer())
dir = renderer->style()->direction();
@@ -319,7 +319,7 @@
|| m_innerNonSharedNode->hasTagName(SVGNames::imageTag)
#endif
) {
- Element* element = static_cast<Element*>(m_innerNonSharedNode.get());
+ Element* element = toElement(m_innerNonSharedNode.get());
urlString = element->getAttribute(element->imageSourceAttributeName());
} else
return KURL();
@@ -335,7 +335,7 @@
if (!m_innerNonSharedNode->hasTagName(embedTag) && !m_innerNonSharedNode->hasTagName(objectTag))
return KURL();
- HTMLPlugInImageElement* element = static_cast<HTMLPlugInImageElement*>(m_innerNonSharedNode.get());
+ HTMLPlugInImageElement* element = toHTMLPlugInImageElement(m_innerNonSharedNode.get());
KURL url = ""
if (!url.isValid())
return KURL();
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -2447,7 +2447,7 @@
return;
ASSERT(renderer()->node()->isElementNode());
- Element* element = static_cast<Element*>(renderer()->node());
+ Element* element = toElement(renderer()->node());
RenderBox* renderer = toRenderBox(element->renderer());
Document* document = element->document();
@@ -4333,7 +4333,7 @@
// Now determine if the result is inside an anchor - if the urlElement isn't already set.
Node* node = result.innerNode();
if (node && !result.URLElement())
- result.setURLElement(static_cast<Element*>(node->enclosingLinkEventParentOrSelf()));
+ result.setURLElement(toElement(node->enclosingLinkEventParentOrSelf()));
// Now return whether we were inside this layer (this will always be true for the root
// layer).
Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -341,7 +341,7 @@
{
// Check to ensure a page navigation has not occurred while
// the popup was up.
- Document* doc = static_cast<Element*>(node())->document();
+ Document* doc = toElement(node())->document();
if (!doc || doc != doc->frame()->document())
return;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -1111,7 +1111,7 @@
Node* n = node();
if (!n || !n->isLink() || !n->isElementNode())
return;
- const AtomicString& href = ""
+ const AtomicString& href = ""
if (href.isNull())
return;
context->setURLForRect(n->document()->completeURL(href), pixelSnappedIntRect(rect));
Modified: trunk/Source/WebCore/rendering/RenderPart.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderPart.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderPart.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -86,7 +86,7 @@
if (!node() || !node()->isFrameOwnerElement())
return false;
- HTMLFrameOwnerElement* element = static_cast<HTMLFrameOwnerElement*>(node());
+ HTMLFrameOwnerElement* element = toFrameOwnerElement(node());
if (Document* contentDocument = element->contentDocument()) {
if (RenderView* view = contentDocument->renderView())
return view->usesCompositing();
Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -189,7 +189,7 @@
// FIXME: Region styling doesn't work for pseudo elements.
if (node()) {
- Element* regionElement = static_cast<Element*>(node());
+ Element* regionElement = toElement(node());
customRegionStyle = view()->document()->styleResolver()->checkRegionStyle(regionElement);
}
setHasCustomRegionStyle(customRegionStyle);
Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -168,7 +168,7 @@
if (node() && style()->autoWrap()) {
// See if nowrap was set.
Length w = styleOrColLogicalWidth();
- String nowrap = static_cast<Element*>(node())->getAttribute(nowrapAttr);
+ String nowrap = toElement(node())->getAttribute(nowrapAttr);
if (!nowrap.isNull() && w.isFixed())
// Nowrap is set, but we didn't actually use it because of the
// fixed width set on the cell. Even so, it is a WinIE/Moz trait
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -788,7 +788,7 @@
Node* node = o->node();
if (!node || !node->isElementNode())
return true;
- return static_cast<Element*>(node)->isEnabledFormControl();
+ return toElement(node)->isEnabledFormControl();
}
bool RenderTheme::isFocused(const RenderObject* o) const
@@ -814,7 +814,7 @@
{
Node* node = o->node();
if (!node || !node->active() || !node->isElementNode()
- || !static_cast<Element*>(node)->isSpinButtonElement())
+ || !toElement(node)->isSpinButtonElement())
return false;
SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
return element->upDownState() == SpinButtonElement::Up;
@@ -833,7 +833,7 @@
Node* node = o->node();
if (!node)
return false;
- if (!node->isElementNode() || !static_cast<Element*>(node)->isSpinButtonElement())
+ if (!node->isElementNode() || !toElement(node)->isSpinButtonElement())
return node->hovered();
SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
return element->hovered() && element->upDownState() != SpinButtonElement::Indeterminate;
@@ -842,7 +842,7 @@
bool RenderTheme::isSpinUpButtonPartHovered(const RenderObject* o) const
{
Node* node = o->node();
- if (!node || !node->isElementNode() || !static_cast<Element*>(node)->isSpinButtonElement())
+ if (!node || !node->isElementNode() || !toElement(node)->isSpinButtonElement())
return false;
SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
return element->upDownState() == SpinButtonElement::Up;
@@ -1032,7 +1032,7 @@
paintInfo.context->setFillColor(o->style()->visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
for (unsigned i = 0; Node* node = options->item(i); i++) {
ASSERT(node->hasTagName(optionTag));
- HTMLOptionElement* optionElement = static_cast<HTMLOptionElement*>(node);
+ HTMLOptionElement* optionElement = toHTMLOptionElement(node);
String value = optionElement->value();
if (!input->isValidValue(value))
continue;
Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -482,7 +482,7 @@
Node* mediaNode = node->shadowHost();
if (!mediaNode)
mediaNode = node;
- if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
+ if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
return 0;
return static_cast<HTMLMediaElement*>(mediaNode);
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -168,7 +168,7 @@
if (!node || !node->isHTMLElement() || !node->hasTagName(spanTag))
return false;
- const HTMLElement* elem = static_cast<const HTMLElement*>(node);
+ const HTMLElement* elem = toHTMLElement(node);
if (elem->getAttribute(classAttr) != "Apple-style-span")
return false;
@@ -430,7 +430,7 @@
if (behavior & RenderAsTextShowIDAndClass) {
if (Node* node = o.node()) {
if (node->hasID())
- ts << " id=\"" + static_cast<Element*>(node)->getIdAttribute() + "\"";
+ ts << " id=\"" + toElement(node)->getIdAttribute() + "\"";
if (node->hasClass()) {
ts << " class=\"";
@@ -669,7 +669,7 @@
if (!tagName.isEmpty())
ts << " {" << tagName << "}";
if (renderRegion->generatingNode()->isElementNode() && renderRegion->generatingNode()->hasID()) {
- Element* element = static_cast<Element*>(renderRegion->generatingNode());
+ Element* element = toElement(renderRegion->generatingNode());
ts << " #" << element->idForStyleResolution();
}
if (renderRegion->hasCustomRegionStyle())
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (145595 => 145596)
--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -493,7 +493,7 @@
{
writeStandardPrefix(ts, object, indent);
- Element* element = static_cast<Element*>(object.node());
+ Element* element = toElement(object.node());
const AtomicString& id = element->getIdAttribute();
writeNameAndQuotedValue(ts, "id", id);
Modified: trunk/Source/WebKit/win/ChangeLog (145595 => 145596)
--- trunk/Source/WebKit/win/ChangeLog 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebKit/win/ChangeLog 2013-03-12 22:21:28 UTC (rev 145596)
@@ -1,3 +1,18 @@
+2013-03-12 Abhishek Arya <infe...@chromium.org>
+
+ 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.
+
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLElement::idName):
+ (DOMHTMLElement::innerText):
+ (DOMHTMLElement::setInnerText):
+
2013-03-11 Jochen Eisinger <joc...@chromium.org>
Rename DefinitelyProcessingUserGesture to DefinitelyProcessingNewUserGesture
Modified: trunk/Source/WebKit/win/DOMHTMLClasses.cpp (145595 => 145596)
--- trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2013-03-12 22:17:28 UTC (rev 145595)
+++ trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2013-03-12 22:21:28 UTC (rev 145596)
@@ -396,7 +396,7 @@
return E_POINTER;
ASSERT(m_element && m_element->isHTMLElement());
- String idString = static_cast<HTMLElement*>(m_element)->getAttribute(idAttr);
+ String idString = toHTMLElement(m_element)->getAttribute(idAttr);
*result = BString(idString).release();
return S_OK;
}
@@ -482,7 +482,7 @@
/* [retval][out] */ BSTR* result)
{
ASSERT(m_element && m_element->isHTMLElement());
- WTF::String innerTextString = static_cast<HTMLElement*>(m_element)->innerText();
+ WTF::String innerTextString = toHTMLElement(m_element)->innerText();
*result = BString(innerTextString.characters(), innerTextString.length()).release();
return S_OK;
}
@@ -491,7 +491,7 @@
/* [in] */ BSTR text)
{
ASSERT(m_element && m_element->isHTMLElement());
- HTMLElement* htmlEle = static_cast<HTMLElement*>(m_element);
+ HTMLElement* htmlEle = toHTMLElement(m_element);
WTF::String textString(text, SysStringLen(text));
WebCore::ExceptionCode ec = 0;
htmlEle->setInnerText(textString, ec);
