2009-01-22 David Hyatt <hyatt@apple.com>
Move the border and padding methods from RenderObject to RenderBox.
Reviewed by Oliver Hunt
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* editing/DeleteButtonController.cpp:
(WebCore::DeleteButtonController::createDeletionUI):
* page/EventHandler.cpp:
(WebCore::EventHandler::hitTestResultAtPoint):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::placeBoxesVertically):
* rendering/InlineFlowBox.h:
(WebCore::InlineFlowBox::borderLeft):
(WebCore::InlineFlowBox::borderRight):
(WebCore::InlineFlowBox::paddingLeft):
(WebCore::InlineFlowBox::paddingRight):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::clearFloats):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paddingTop):
(WebCore::RenderBox::paddingBottom):
(WebCore::RenderBox::paddingLeft):
(WebCore::RenderBox::paddingRight):
(WebCore::RenderBox::calcHeight):
(WebCore::RenderBox::containingBlockWidthForPositioned):
(WebCore::RenderBox::containingBlockHeightForPositioned):
(WebCore::RenderBox::calcAbsoluteHorizontal):
(WebCore::RenderBox::calcAbsoluteHorizontalValues):
(WebCore::RenderBox::calcAbsoluteVertical):
(WebCore::RenderBox::calcAbsoluteVerticalValues):
(WebCore::RenderBox::calcAbsoluteHorizontalReplaced):
(WebCore::RenderBox::calcAbsoluteVerticalReplaced):
* rendering/RenderBox.h:
(WebCore::RenderBox::borderTop):
(WebCore::RenderBox::borderBottom):
(WebCore::RenderBox::borderLeft):
(WebCore::RenderBox::borderRight):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::repaintAfterLayoutIfNeeded):
* rendering/RenderObject.h:
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::textBlockWidth):
(WebCore::RenderTextControl::calcHeight):
(WebCore::RenderTextControl::calcPrefWidths):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::preferredContentWidth):
* rendering/RenderTreeAsText.cpp:
(WebCore::operator<<):
* rendering/RenderView.cpp:
(WebCore::RenderView::repaintViewRectangle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@40153 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index 2927623..7bc5713 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -400,11 +400,11 @@
int result = static_cast<int>(ceilf(charWidth * factor));
- if (RenderObject* resultsRenderer = m_resultsButton ? m_resultsButton->renderer() : 0)
+ if (RenderBox* resultsRenderer = m_resultsButton ? m_resultsButton->renderBox() : 0)
result += resultsRenderer->borderLeft() + resultsRenderer->borderRight() +
resultsRenderer->paddingLeft() + resultsRenderer->paddingRight();
- if (RenderObject* cancelRenderer = m_cancelButton ? m_cancelButton->renderer() : 0)
+ if (RenderBox* cancelRenderer = m_cancelButton ? m_cancelButton->renderBox() : 0)
result += cancelRenderer->borderLeft() + cancelRenderer->borderRight() +
cancelRenderer->paddingLeft() + cancelRenderer->paddingRight();
