diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5687faedab229e860be5304a19bdbc37fcc4e6ba..930b87307bc38058b5b557f359f86fc8d93a9ada 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,112 @@
+2009-01-23  David Hyatt  <hyatt@apple.com>
+
+        Make toRenderBox a non-member function.  Rename toConstRenderBox to just also be called toRenderBox.
+
+        Reviewed by Oliver Hunt
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::sizingBox):
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::getUpperLeftCorner):
+        (WebCore::ContainerNode::getLowerRightCorner):
+        * dom/Element.cpp:
+        (WebCore::Element::scrollByUnits):
+        * dom/Position.cpp:
+        (WebCore::endsOfNodeAreVisuallyDistinctPositions):
+        (WebCore::Position::hasRenderedNonAnonymousDescendantsWithHeight):
+        (WebCore::Position::isCandidate):
+        * editing/DeleteButtonController.cpp:
+        (WebCore::isDeletableElement):
+        * editing/EditorCommand.cpp:
+        (WebCore::verticalScrollDistance):
+        * editing/TextIterator.cpp:
+        (WebCore::shouldEmitExtraNewlineForNode):
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::isKeyboardFocusable):
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::isFocusable):
+        * html/HTMLFrameElementBase.cpp:
+        (WebCore::HTMLFrameElementBase::width):
+        (WebCore::HTMLFrameElementBase::height):
+        * page/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::doAccessibilityHitTest):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseDraggedEvent):
+        (WebCore::EventHandler::autoscrollTimerFired):
+        (WebCore::EventHandler::updateAutoscrollRenderer):
+        (WebCore::EventHandler::stopAutoscrollTimer):
+        (WebCore::EventHandler::scrollOverflow):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        * page/animation/AnimationBase.cpp:
+        (WebCore::blendFunc):
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::adjustPosition):
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::renderBox):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::clearFloats):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::offsetFromContainer):
+        (WebCore::RenderBox::computeAbsoluteRepaintRect):
+        (WebCore::RenderBox::containingBlockWidthForPositioned):
+        (WebCore::RenderBox::containingBlockHeightForPositioned):
+        (WebCore::RenderBox::calcAbsoluteHorizontal):
+        (WebCore::RenderBox::calcAbsoluteVertical):
+        (WebCore::RenderBox::calcAbsoluteHorizontalReplaced):
+        (WebCore::RenderBox::calcAbsoluteVerticalReplaced):
+        * rendering/RenderBox.h:
+        (WebCore::toRenderBox):
+        (WebCore::RenderBox::previousSiblingBox):
+        (WebCore::RenderBox::nextSiblingBox):
+        (WebCore::RenderBox::parentBox):
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::absoluteClippedOverflowRect):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateLayerPosition):
+        (WebCore::RenderLayer::resize):
+        (WebCore::RenderLayer::boundingBox):
+        * rendering/RenderObject.cpp:
+        (WebCore::addLayers):
+        (WebCore::RenderObject::removeLayers):
+        (WebCore::RenderObject::moveLayers):
+        (WebCore::RenderObject::findNextLayer):
+        (WebCore::RenderObject::enclosingLayer):
+        (WebCore::RenderObject::setNeedsLayout):
+        (WebCore::RenderObject::setNeedsPositionedMovementLayout):
+        (WebCore::RenderObject::repaintAfterLayoutIfNeeded):
+        (WebCore::RenderObject::getAbsoluteRepaintRectWithOutline):
+        (WebCore::RenderObject::computeAbsoluteRepaintRect):
+        (WebCore::RenderObject::localToAbsolute):
+        (WebCore::RenderObject::absoluteToLocal):
+        (WebCore::RenderObject::localToAbsoluteQuad):
+        (WebCore::RenderObject::offsetFromContainer):
+        (WebCore::RenderObject::removeFromObjectLists):
+        (WebCore::RenderObject::destroy):
+        (WebCore::RenderObject::updateHitTestResult):
+        (WebCore::RenderObject::addDashboardRegions):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows):
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::hitTestMediaControlPart):
+        (WebCore::RenderTheme::baselinePosition):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::hitTestMediaControlPart):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::externalRepresentation):
+        * rendering/bidi.cpp:
+        (WebCore::inlineWidth):
+        (WebCore::RenderBlock::computeHorizontalPositionsForLine):
+        (WebCore::requiresLineBox):
+        (WebCore::RenderBlock::findNextLineBreak):
+        * svg/SVGLength.cpp:
+        (WebCore::SVGLength::PercentageOfViewport):
+        * wml/WMLAElement.cpp:
+        (WebCore::WMLAElement::isKeyboardFocusable):
+        * wml/WMLInputElement.cpp:
+        (WebCore::isInputFocusable):
+
 2009-01-23  Chris Fleizach  <cfleizach@apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index 715532562a67830bbdc38018fc1302f297358475..1a9641e0c6bfb77ea7504af555c75c225a21000f 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -398,7 +398,7 @@ static IntRect sizingBox(RenderObject* renderer)
     if (!renderer->isBox())
         return IntRect();
     
-    RenderBox* box = RenderBox::toRenderBox(renderer);
+    RenderBox* box = toRenderBox(renderer);
     return box->style()->boxSizing() == CONTENT_BOX ? box->contentBoxRect() : box->borderBoxRect();
 }
 
@@ -763,22 +763,22 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         case CSSPropertyMarginTop:
             if (renderer && renderer->isBox())
                 // FIXME: Supposed to return the percentage if percentage was specified.
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->marginTop(), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->marginTop(), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->marginTop());
         case CSSPropertyMarginRight:
             if (renderer && renderer->isBox())
                 // FIXME: Supposed to return the percentage if percentage was specified.
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->marginRight(), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->marginRight(), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->marginRight());
         case CSSPropertyMarginBottom:
             if (renderer && renderer->isBox())
                 // FIXME: Supposed to return the percentage if percentage was specified.
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->marginBottom(), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->marginBottom(), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->marginBottom());
         case CSSPropertyMarginLeft:
             if (renderer && renderer->isBox())
                 // FIXME: Supposed to return the percentage if percentage was specified.
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->marginLeft(), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->marginLeft(), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->marginLeft());
         case CSSPropertyWebkitMarqueeDirection:
             return CSSPrimitiveValue::create(style->marqueeDirection());
@@ -863,19 +863,19 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             return CSSPrimitiveValue::create(style->overflowY());
         case CSSPropertyPaddingTop:
             if (renderer && renderer->isBox())
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->paddingTop(false), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingTop(false), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->paddingTop());
         case CSSPropertyPaddingRight:
             if (renderer && renderer->isBox())
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->paddingRight(false), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingRight(false), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->paddingRight());
         case CSSPropertyPaddingBottom:
             if (renderer && renderer->isBox())
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->paddingBottom(false), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingBottom(false), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->paddingBottom());
         case CSSPropertyPaddingLeft:
             if (renderer && renderer->isBox())
-                return CSSPrimitiveValue::create(RenderBox::toRenderBox(renderer)->paddingLeft(false), CSSPrimitiveValue::CSS_PX);
+                return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingLeft(false), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(style->paddingLeft());
         case CSSPropertyPageBreakAfter:
             return CSSPrimitiveValue::create(style->pageBreakAfter());
diff --git a/WebCore/dom/ContainerNode.cpp b/WebCore/dom/ContainerNode.cpp
index bab9670168b8b916646bebf4d171fbe469e2554b..87ac92bf44829ece415ee10804ac9a811c7d2a9a 100644
--- a/WebCore/dom/ContainerNode.cpp
+++ b/WebCore/dom/ContainerNode.cpp
@@ -695,7 +695,7 @@ bool ContainerNode::getUpperLeftCorner(FloatPoint& point) const
                 point.move(static_cast<RenderText *>(o)->linesBoundingBox().x(),
                            static_cast<RenderText *>(o)->firstTextBox()->root()->topOverflow());
             } else if (o->isBox()) {
-                RenderBox* box = RenderBox::toRenderBox(o);
+                RenderBox* box = toRenderBox(o);
                 point.move(box->x(), box->y());
             }
             return true;
@@ -720,7 +720,7 @@ bool ContainerNode::getLowerRightCorner(FloatPoint& point) const
     RenderObject *o = renderer();
     if (!o->isInline() || o->isReplaced())
     {
-        RenderBox* box = RenderBox::toRenderBox(o);
+        RenderBox* box = toRenderBox(o);
         point = o->localToAbsolute();
         point.move(box->width(), box->height());
         return true;
@@ -749,7 +749,7 @@ bool ContainerNode::getLowerRightCorner(FloatPoint& point) const
                 IntRect linesBox = text->linesBoundingBox();
                 point.move(linesBox.x() + linesBox.width(), linesBox.height());
             } else {
-                RenderBox* box = RenderBox::toRenderBox(o);
+                RenderBox* box = toRenderBox(o);
                 point.move(box->x() + box->width(), box->y() + box->height());
             }
             return true;
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index 87305146c7a909313b898b2a37b035264ef3a3e4..b2b5997a2cde7f97a1c7416ba71c452c76a33bf5 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -217,7 +217,7 @@ void Element::scrollByUnits(int units, ScrollGranularity granularity)
                 direction = ScrollUp;
                 units = -units;
             }
-            RenderBox::toRenderBox(rend)->layer()->scroll(direction, granularity, units);
+            toRenderBox(rend)->layer()->scroll(direction, granularity, units);
         }
     }
 }
diff --git a/WebCore/dom/Position.cpp b/WebCore/dom/Position.cpp
index 75208960adff2af066af5eeb336cfb54567e066f..0046dcac3527846e4bcf19813c8841def3f1d54c 100644
--- a/WebCore/dom/Position.cpp
+++ b/WebCore/dom/Position.cpp
@@ -284,7 +284,7 @@ static bool endsOfNodeAreVisuallyDistinctPositions(Node* node)
         return false;
     
     // There is a VisiblePosition inside an empty inline-block container.
-    return node->renderer()->isReplaced() && canHaveChildrenForEditing(node) && RenderBox::toRenderBox(node->renderer())->height() != 0 && !node->firstChild();
+    return node->renderer()->isReplaced() && canHaveChildrenForEditing(node) && toRenderBox(node->renderer())->height() != 0 && !node->firstChild();
 }
 
 static Node* enclosingVisualBoundary(Node* node)
@@ -538,7 +538,7 @@ bool Position::hasRenderedNonAnonymousDescendantsWithHeight(RenderObject* render
     for (RenderObject *o = renderer->firstChild(); o && o != stop; o = o->nextInPreOrder())
         if (o->element()) {
             if ((o->isText() && static_cast<RenderText*>(o)->linesBoundingBox().height()) ||
-                (o->isBox() && RenderBox::toRenderBox(o)->height()))
+                (o->isBox() && toRenderBox(o)->height()))
                 return true;
         }
     return false;
@@ -571,7 +571,7 @@ bool Position::isCandidate() const
         return (offset() == 0 || offset() == maxDeepOffset(node())) && !nodeIsUserSelectNone(node()->parent());
 
     if (!node()->hasTagName(htmlTag) && renderer->isBlockFlow() && !hasRenderedNonAnonymousDescendantsWithHeight(renderer) &&
-       (RenderBox::toRenderBox(renderer)->height() || node()->hasTagName(bodyTag)))
+       (toRenderBox(renderer)->height() || node()->hasTagName(bodyTag)))
         return offset() == 0 && !nodeIsUserSelectNone(node());
     
     return false;
diff --git a/WebCore/editing/DeleteButtonController.cpp b/WebCore/editing/DeleteButtonController.cpp
index 1251e62e08eeaccefb98bc1d96eb3a985fc305a1..875fc71664d580c9ba866977f9594fa6d41ed167 100644
--- a/WebCore/editing/DeleteButtonController.cpp
+++ b/WebCore/editing/DeleteButtonController.cpp
@@ -74,7 +74,7 @@ static bool isDeletableElement(const Node* node)
     if (!renderer || !renderer->isBox())
         return false;
 
-    RenderBox* box = RenderBox::toRenderBox(renderer);
+    RenderBox* box = toRenderBox(renderer);
     if (box->width() < minimumWidth || box->height() < minimumHeight)
         return false;
 
diff --git a/WebCore/editing/EditorCommand.cpp b/WebCore/editing/EditorCommand.cpp
index cfb65975a148a518ae9ca08a2a7e77b5ec324376..54c73b990bed07195a8de38b2a1847aacd8a069a 100644
--- a/WebCore/editing/EditorCommand.cpp
+++ b/WebCore/editing/EditorCommand.cpp
@@ -232,7 +232,7 @@ static int verticalScrollDistance(Frame* frame)
         return 0;
     if (!(style->overflowY() == OSCROLL || style->overflowY() == OAUTO || renderer->isTextArea()))
         return 0;
-    int height = RenderBox::toRenderBox(renderer)->clientHeight();
+    int height = toRenderBox(renderer)->clientHeight();
     return max((height + 1) / 2, height - cAmountToKeepWhenPaging);
 }
 
diff --git a/WebCore/editing/TextIterator.cpp b/WebCore/editing/TextIterator.cpp
index 9df3a46a4115a0c939648fef706d000ec38ba997..9ac697a00047573dec32681be1423cfa2b530088 100644
--- a/WebCore/editing/TextIterator.cpp
+++ b/WebCore/editing/TextIterator.cpp
@@ -549,7 +549,7 @@ static bool shouldEmitExtraNewlineForNode(Node* node)
         || node->hasTagName(pTag)) {
         RenderStyle* style = r->style();
         if (style) {
-            int bottomMargin = RenderBox::toRenderBox(r)->collapsedMarginBottom();
+            int bottomMargin = toRenderBox(r)->collapsedMarginBottom();
             int fontSize = style->fontDescription().computedPixelSize();
             if (bottomMargin * 2 >= fontSize)
                 return true;
diff --git a/WebCore/html/HTMLAnchorElement.cpp b/WebCore/html/HTMLAnchorElement.cpp
index b51ca1f054bd52c4f142b8d7db5ee7baa07a7720..3e09f3c26c3277e5664a86c4aa6a4c5d76a1dbfc 100644
--- a/WebCore/html/HTMLAnchorElement.cpp
+++ b/WebCore/html/HTMLAnchorElement.cpp
@@ -113,7 +113,7 @@ bool HTMLAnchorElement::isKeyboardFocusable(KeyboardEvent* event) const
     // Before calling absoluteRects, check for the common case where the renderer
     // or one of the continuations is non-empty, since this is a faster check and
     // almost always returns true.
-    RenderBox* box = RenderBox::toRenderBox(renderer());
+    RenderBox* box = toRenderBox(renderer());
     if (box->width() > 0 && box->height() > 0)
         return true;
     for (RenderFlow* r = box->virtualContinuation(); r; r = r->continuation())
diff --git a/WebCore/html/HTMLFormControlElement.cpp b/WebCore/html/HTMLFormControlElement.cpp
index e48cfb67cf478dbcba358adeb36b636f47703a90..db353fb1a5b1700c9f5560375dc49429455398c5 100644
--- a/WebCore/html/HTMLFormControlElement.cpp
+++ b/WebCore/html/HTMLFormControlElement.cpp
@@ -199,7 +199,7 @@ bool HTMLFormControlElement::isFocusable() const
 {
     if (disabled() || !renderer() || 
         (renderer()->style() && renderer()->style()->visibility() != VISIBLE) || 
-        !renderer()->isBox() || RenderBox::toRenderBox(renderer())->size().isEmpty())
+        !renderer()->isBox() || toRenderBox(renderer())->size().isEmpty())
         return false;
     return true;
 }
diff --git a/WebCore/html/HTMLFrameElementBase.cpp b/WebCore/html/HTMLFrameElementBase.cpp
index 3334b8571477064db87b0e9d97f1b1a2f1703b93..59e7d46f8d4a6598e7f0b0800045847b83e21953 100644
--- a/WebCore/html/HTMLFrameElementBase.cpp
+++ b/WebCore/html/HTMLFrameElementBase.cpp
@@ -311,7 +311,7 @@ int HTMLFrameElementBase::width() const
         return 0;
     
     document()->updateLayoutIgnorePendingStylesheets();
-    return RenderBox::toRenderBox(renderer())->width();
+    return toRenderBox(renderer())->width();
 }
 
 int HTMLFrameElementBase::height() const
@@ -320,7 +320,7 @@ int HTMLFrameElementBase::height() const
         return 0;
     
     document()->updateLayoutIgnorePendingStylesheets();
-    return RenderBox::toRenderBox(renderer())->height();
+    return toRenderBox(renderer())->height();
 }
 
 } // namespace WebCore
diff --git a/WebCore/page/AccessibilityRenderObject.cpp b/WebCore/page/AccessibilityRenderObject.cpp
index f3d5843381e08cd4eb6215baa2ba4f5e57786d76..f5e9e9f669a8f87b4676c4e4339974082595d80e 100644
--- a/WebCore/page/AccessibilityRenderObject.cpp
+++ b/WebCore/page/AccessibilityRenderObject.cpp
@@ -1872,7 +1872,7 @@ AccessibilityObject* AccessibilityRenderObject::doAccessibilityHitTest(const Int
     if (!m_renderer || !m_renderer->hasLayer())
         return 0;
     
-    RenderLayer* layer = RenderBox::toRenderBox(m_renderer)->layer();
+    RenderLayer* layer = toRenderBox(m_renderer)->layer();
      
     HitTestRequest request(true, true);
     HitTestResult hitTestResult = HitTestResult(point);
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 9f1b75043f748449a09ebb8281cc8957471ba359..af076079e1e343b2d1a6191084669311da516ae5 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -404,7 +404,7 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
         // If the selection is contained in a layer that can scroll, that layer should handle the autoscroll
         // Otherwise, let the bridge handle it so the view can scroll itself.
         RenderObject* renderer = targetNode->renderer();
-        while (renderer && (!renderer->isBox() || !RenderBox::toRenderBox(renderer)->canBeProgramaticallyScrolled(false))) {
+        while (renderer && (!renderer->isBox() || !toRenderBox(renderer)->canBeProgramaticallyScrolled(false))) {
             if (!renderer->parent() && renderer->node() == renderer->document() && renderer->document()->ownerElement())
                 renderer = renderer->document()->ownerElement()->renderer();
             else
@@ -604,7 +604,7 @@ void EventHandler::autoscrollTimerFired(Timer<EventHandler>*)
             stopAutoscrollTimer();
             return;
         }
-        RenderBox::toRenderBox(r)->autoscroll();
+        toRenderBox(r)->autoscroll();
     } else {
         // we verify that the main frame hasn't received the order to stop the panScroll
         if (!m_frame->page()->mainFrame()->eventHandler()->panScrollInProgress()) {
@@ -665,7 +665,7 @@ void EventHandler::updateAutoscrollRenderer()
     if (Node* nodeAtPoint = hitTest.innerNode())
         m_autoscrollRenderer = nodeAtPoint->renderer();
 
-    while (m_autoscrollRenderer && (!m_autoscrollRenderer->isBox() || !RenderBox::toRenderBox(m_autoscrollRenderer)->canBeProgramaticallyScrolled(false)))
+    while (m_autoscrollRenderer && (!m_autoscrollRenderer->isBox() || !toRenderBox(m_autoscrollRenderer)->canBeProgramaticallyScrolled(false)))
         m_autoscrollRenderer = m_autoscrollRenderer->parent();
 }
 
@@ -747,7 +747,7 @@ void EventHandler::stopAutoscrollTimer(bool rendererIsBeingDestroyed)
 
     if (autoscrollRenderer()) {
         if (!rendererIsBeingDestroyed && (m_autoscrollInProgress || m_panScrollInProgress))
-            RenderBox::toRenderBox(autoscrollRenderer())->stopAutoscroll();
+            toRenderBox(autoscrollRenderer())->stopAutoscroll();
 #if ENABLE(PAN_SCROLLING)
         if (m_panScrollInProgress) {
             m_frame->view()->removePanScrollIcon();
@@ -789,7 +789,7 @@ bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity g
     if (node) {
         RenderObject* r = node->renderer();
         if (r && r->isBox() && !r->isListBox())
-            return RenderBox::toRenderBox(r)->scroll(direction, granularity);
+            return toRenderBox(r)->scroll(direction, granularity);
     }
 
     return false;
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 615172b1683639a49db8d8efb677b86402648d42..c67ac588df06c4389f098af642f55f48b5413e7f 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -460,7 +460,7 @@ void FrameView::layout(bool allowSubtree)
                 hMode = ScrollbarAlwaysOff;
             } else if (body->hasTagName(bodyTag)) {
                 if (!m_firstLayout && m_size.height() != layoutHeight()
-                        && RenderBox::toRenderBox(body->renderer())->stretchesToViewHeight())
+                        && toRenderBox(body->renderer())->stretchesToViewHeight())
                     body->renderer()->setChildNeedsLayout(true);
                 // It's sufficient to just check the X overflow,
                 // since it's illegal to have visible in only one direction.
diff --git a/WebCore/page/animation/AnimationBase.cpp b/WebCore/page/animation/AnimationBase.cpp
index 5b1f68f897ed7ecee7fc22cf4241435248928f19..dc09a3e9256a70d84565290e89b294e2c33e96d8 100644
--- a/WebCore/page/animation/AnimationBase.cpp
+++ b/WebCore/page/animation/AnimationBase.cpp
@@ -134,7 +134,7 @@ static inline TransformOperations blendFunc(const AnimationBase* anim, const Tra
         }
     } else {
         // Convert the TransformOperations into matrices
-        IntSize size = anim->renderer()->isBox() ? RenderBox::toRenderBox(anim->renderer())->borderBoxRect().size() : IntSize();
+        IntSize size = anim->renderer()->isBox() ? toRenderBox(anim->renderer())->borderBoxRect().size() : IntSize();
         TransformationMatrix fromT;
         TransformationMatrix toT;
         from.apply(size, fromT);
diff --git a/WebCore/rendering/InlineBox.cpp b/WebCore/rendering/InlineBox.cpp
index 59b4f5fa3d06456491b52903ed5d9d761b6bd2a3..6f7324a7a134ae2236b174dd3ee24f74c86be8e4 100644
--- a/WebCore/rendering/InlineBox.cpp
+++ b/WebCore/rendering/InlineBox.cpp
@@ -131,7 +131,7 @@ void InlineBox::adjustPosition(int dx, int dy)
     m_x += dx;
     m_y += dy;
     if (m_object->isReplaced()) {
-        RenderBox* box = RenderBox::toRenderBox(m_object);
+        RenderBox* box = toRenderBox(m_object);
         box->move(dx, dy);
     }
 }
diff --git a/WebCore/rendering/InlineBox.h b/WebCore/rendering/InlineBox.h
index 58d3de2df01ad7ebafa3b76f9eac3f1a80bdd0d7..e17b6e8a96855eecb843e2e5421c70ef6ac6ea19 100644
--- a/WebCore/rendering/InlineBox.h
+++ b/WebCore/rendering/InlineBox.h
@@ -240,7 +240,7 @@ public:
     bool visibleToHitTesting() const { return object()->style()->visibility() == VISIBLE && object()->style()->pointerEvents() != PE_NONE; }
     
     // Use with caution! The type is not checked!
-    RenderBox* renderBox() const { return RenderBox::toRenderBox(m_object); }
+    RenderBox* renderBox() const { return toRenderBox(m_object); }
 
 public:
     RenderObject* m_object;
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 77489c7ac85a8c97f64c62f79536e8bb3cfcc73c..eb07770cf60abb95a75bf21d946b5323ef1a7580 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -2877,7 +2877,7 @@ void RenderBlock::clearFloats()
         offset -= toRenderBox(prev)->y();
     else if (parent()->isBox()) {
         prev = parent();
-        xoffset += RenderBox::toRenderBox(prev)->borderLeft() + RenderBox::toRenderBox(prev)->paddingLeft();
+        xoffset += toRenderBox(prev)->borderLeft() + toRenderBox(prev)->paddingLeft();
     }
 
     // Add overhanging floats from the previous RenderBlock, but only if it has a float that intrudes into our space.
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 6df2e9e433366db714258a0c62dec52e4d4c1778..e1583886732b3b89927b3323ce97fc706e3be358 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -1469,7 +1469,7 @@ IntSize RenderBox::offsetFromContainer(RenderObject* o) const
     }
 
     if (o->hasOverflowClip())
-        offset -= RenderBox::toRenderBox(o)->layer()->scrolledContentOffset();
+        offset -= toRenderBox(o)->layer()->scrolledContentOffset();
 
     if (style()->position() == AbsolutePosition)
         offset += offsetForPositionedInContainer(o);
@@ -1616,7 +1616,7 @@ void RenderBox::computeAbsoluteRepaintRect(IntRect& rect, bool fixed)
     // FIXME: We ignore the lightweight clipping rect that controls use, since if |o| is in mid-layout,
     // its controlClipRect will be wrong. For overflow clip we use the values cached by the layer.
     if (o->hasOverflowClip()) {
-        RenderBox* containerBox = RenderBox::toRenderBox(o);
+        RenderBox* containerBox = toRenderBox(o);
 
         // o->height() is inaccurate if we're in the middle of a layout of |o|, so use the
         // layer's size instead.  Even if the layer's size is wrong, the layer itself will repaint
@@ -2199,13 +2199,13 @@ int RenderBox::containingBlockWidthForPositioned(const RenderObject* containingB
         return max(0, (fromRight - fromLeft));
     }
 
-    const RenderBox* containingBlockBox = RenderBox::toConstRenderBox(containingBlock);
+    const RenderBox* containingBlockBox = toRenderBox(containingBlock);
     return containingBlockBox->width() - containingBlockBox->borderLeft() - containingBlockBox->borderRight() - containingBlockBox->verticalScrollbarWidth();
 }
 
 int RenderBox::containingBlockHeightForPositioned(const RenderObject* containingBlock) const
 {
-    const RenderBox* containingBlockBox = RenderBox::toConstRenderBox(containingBlock);
+    const RenderBox* containingBlockBox = toRenderBox(containingBlock);
     
     int heightResult;
     if (containingBlock->isInlineFlow()) {
@@ -2251,7 +2251,7 @@ void RenderBox::calcAbsoluteHorizontal()
 
     // We don't use containingBlock(), since we may be positioned by an enclosing
     // relative positioned inline.
-    const RenderBox* containerBlock = RenderBox::toRenderBox(container());
+    const RenderBox* containerBlock = toRenderBox(container());
     
     const int containerWidth = containingBlockWidthForPositioned(containerBlock);
 
@@ -2558,7 +2558,7 @@ void RenderBox::calcAbsoluteVertical()
 
 
     // We don't use containingBlock(), since we may be positioned by an enclosing relpositioned inline.
-    const RenderBox* containerBlock = RenderBox::toConstRenderBox(container());
+    const RenderBox* containerBlock = toRenderBox(container());
 
     const int containerHeight = containingBlockHeightForPositioned(containerBlock);
 
@@ -2781,7 +2781,7 @@ void RenderBox::calcAbsoluteHorizontalReplaced()
 
     // We don't use containingBlock(), since we may be positioned by an enclosing
     // relative positioned inline.
-    const RenderBox* containerBlock = RenderBox::toConstRenderBox(container());
+    const RenderBox* containerBlock = toRenderBox(container());
 
     const int containerWidth = containingBlockWidthForPositioned(containerBlock);
 
@@ -2954,7 +2954,7 @@ void RenderBox::calcAbsoluteVerticalReplaced()
     // the numbers correspond to numbers in spec)
 
     // We don't use containingBlock(), since we may be positioned by an enclosing relpositioned inline.
-    const RenderBox* containerBlock = RenderBox::toConstRenderBox(container());
+    const RenderBox* containerBlock = toRenderBox(container());
 
     const int containerHeight = containingBlockHeightForPositioned(containerBlock);
 
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index 058fe6494078357f85f14780e616ba169aac4c87..c81d0b03ce184111ea0a4755cbdf069dc476f61b 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -37,9 +37,6 @@ public:
 
     virtual const char* renderName() const { return "RenderBox"; }
 
-    static RenderBox* toRenderBox(RenderObject* o) { ASSERT(!o || o->isBox()); return static_cast<RenderBox*>(o); }
-    static const RenderBox* toConstRenderBox(const RenderObject* o) { ASSERT(!o || o->isBox()); return static_cast<const RenderBox*>(o);}
-    
     int x() const { return m_frameRect.x(); }
     int y() const { return m_frameRect.y(); }
     int width() const { return m_frameRect.width(); }
@@ -76,9 +73,9 @@ public:
     virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
 
     // Use this with caution! No type checking is done!
-    RenderBox* previousSiblingBox() const { ASSERT(!previousSibling() || previousSibling()->isBox()); return toRenderBox(previousSibling()); }
-    RenderBox* nextSiblingBox() const { ASSERT(!nextSibling() || nextSibling()->isBox()); return toRenderBox(nextSibling()); }
-    RenderBox* parentBox() const { ASSERT(!parent() || parent()->isBox()); return toRenderBox(parent()); }
+    RenderBox* previousSiblingBox() const;
+    RenderBox* nextSiblingBox() const;
+    RenderBox* parentBox() const;
 
     // The height of a block when you include normal flow overflow spillage out of the bottom
     // of the block (e.g., a <div style="height:25px"> that has a 100px tall image inside
@@ -382,6 +379,33 @@ private:
     static bool s_hadOverflowClip;
 };
 
+inline RenderBox* toRenderBox(RenderObject* o)
+{ 
+    ASSERT(!o || o->isBox());
+    return static_cast<RenderBox*>(o);
+}
+
+inline const RenderBox* toRenderBox(const RenderObject* o)
+{ 
+    ASSERT(!o || o->isBox());
+    return static_cast<const RenderBox*>(o);
+}
+
+inline RenderBox* RenderBox::previousSiblingBox() const
+{
+    return toRenderBox(previousSibling());
+}
+
+inline RenderBox* RenderBox::nextSiblingBox() const
+{ 
+    return toRenderBox(nextSibling());
+}
+
+inline RenderBox* RenderBox::parentBox() const
+{
+    return toRenderBox(parent());
+}
+
 } // namespace WebCore
 
 #endif // RenderBox_h
diff --git a/WebCore/rendering/RenderFlow.cpp b/WebCore/rendering/RenderFlow.cpp
index af99dfea635a12785939fa80d51335b1ccc08464..8c9fc6c81cf0028ad481cc294a0ee539ac278106 100644
--- a/WebCore/rendering/RenderFlow.cpp
+++ b/WebCore/rendering/RenderFlow.cpp
@@ -503,7 +503,7 @@ IntRect RenderFlow::absoluteClippedOverflowRect()
         for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb; 
              inlineFlow = inlineFlow->parent()) {
              if (inlineFlow->style()->position() == RelativePosition && inlineFlow->hasLayer())
-                RenderBox::toRenderBox(inlineFlow)->layer()->relativePositionOffset(left, top);
+                toRenderBox(inlineFlow)->layer()->relativePositionOffset(left, top);
         }
 
         IntRect r(-ow + left, -ow + top, boundingBox.width() + ow * 2, boundingBox.height() + ow * 2);
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index acf043b0ea7c78658272233b8ee05dffead4d974..86a3a2efab977f7744752ce79dbf773e241b3ec5 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -402,8 +402,8 @@ void RenderLayer::updateLayerPosition()
 
     m_relX = m_relY = 0;
     if (renderer()->isRelPositioned()) {
-        m_relX = RenderBox::toRenderBox(renderer())->relativePositionOffsetX();
-        m_relY = RenderBox::toRenderBox(renderer())->relativePositionOffsetY();
+        m_relX = toRenderBox(renderer())->relativePositionOffsetX();
+        m_relY = toRenderBox(renderer())->relativePositionOffsetY();
         x += m_relX; y += m_relY;
     }
     
@@ -415,7 +415,7 @@ void RenderLayer::updateLayerPosition()
         positionedParent->subtractScrolledContentOffset(x, y);
         
         if (renderer()->isPositioned()) {
-            IntSize offset = RenderBox::toRenderBox(renderer())->offsetForPositionedInContainer(positionedParent->renderer());
+            IntSize offset = toRenderBox(renderer())->offsetForPositionedInContainer(positionedParent->renderer());
             x += offset.width();
             y += offset.height();
         }
@@ -1043,7 +1043,7 @@ void RenderLayer::resize(const PlatformMouseEvent& evt, const IntSize& oldOffset
     // Set the width and height of the shadow ancestor node if there is one.
     // This is necessary for textarea elements since the resizable layer is in the shadow content.
     Element* element = static_cast<Element*>(renderer()->node()->shadowAncestorNode());
-    RenderBox* renderer = RenderBox::toRenderBox(element->renderer());
+    RenderBox* renderer = toRenderBox(element->renderer());
 
     EResize resize = renderer->style()->resize();
     if (resize == RESIZE_NONE)
@@ -2230,7 +2230,7 @@ IntRect RenderLayer::boundingBox(const RenderLayer* rootLayer) const
         // Our bounding box is just the union of all of our cells' border/overflow rects.
         for (RenderObject* child = renderer()->firstChild(); child; child = child->nextSibling()) {
             if (child->isTableCell()) {
-                IntRect bbox = RenderBox::toRenderBox(child)->borderBoxRect();
+                IntRect bbox = toRenderBox(child)->borderBoxRect();
                 result.unite(bbox);
                 IntRect overflowRect = renderer()->overflowRect(false);
                 if (bbox != overflowRect)
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index 86c1a317616803a2315e0014909a34eb32fde79f..bb3a6cacd604a485c75fad045cc01e47f1848399 100644
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -399,7 +399,7 @@ static void addLayers(RenderObject* obj, RenderLayer* parentLayer, RenderObject*
             beforeChild = newObject->parent()->findNextLayer(parentLayer, newObject);
             newObject = 0;
         }
-        parentLayer->addChild(RenderBox::toRenderBox(obj)->layer(), beforeChild);
+        parentLayer->addChild(toRenderBox(obj)->layer(), beforeChild);
         return;
     }
 
@@ -423,7 +423,7 @@ void RenderObject::removeLayers(RenderLayer* parentLayer)
         return;
 
     if (hasLayer()) {
-        parentLayer->removeChild(RenderBox::toRenderBox(this)->layer());
+        parentLayer->removeChild(toRenderBox(this)->layer());
         return;
     }
 
@@ -437,7 +437,7 @@ void RenderObject::moveLayers(RenderLayer* oldParent, RenderLayer* newParent)
         return;
 
     if (hasLayer()) {
-        RenderLayer* layer = RenderBox::toRenderBox(this)->layer();
+        RenderLayer* layer = toRenderBox(this)->layer();
         if (oldParent)
             oldParent->removeChild(layer);
         newParent->addChild(layer);
@@ -456,7 +456,7 @@ RenderLayer* RenderObject::findNextLayer(RenderLayer* parentLayer, RenderObject*
         return 0;
 
     // Step 1: If our layer is a child of the desired parent, then return our layer.
-    RenderLayer* ourLayer = hasLayer() ? RenderBox::toRenderBox(this)->layer() : 0;
+    RenderLayer* ourLayer = hasLayer() ? toRenderBox(this)->layer() : 0;
     if (ourLayer && ourLayer->parent() == parentLayer)
         return ourLayer;
 
@@ -488,7 +488,7 @@ RenderLayer* RenderObject::enclosingLayer() const
 {
     const RenderObject* curr = this;
     while (curr) {
-        RenderLayer* layer = curr->hasLayer() ? RenderBox::toConstRenderBox(curr)->layer() : 0;
+        RenderLayer* layer = curr->hasLayer() ? toRenderBox(curr)->layer() : 0;
         if (layer)
             return layer;
         curr = curr->parent();
@@ -547,7 +547,7 @@ void RenderObject::setNeedsLayout(bool b, bool markParents)
             if (markParents)
                 markContainingBlocksForLayout();
             if (hasLayer())
-                RenderBox::toRenderBox(this)->layer()->setNeedsFullRepaint();
+                toRenderBox(this)->layer()->setNeedsFullRepaint();
         }
     } else {
         m_everHadLayout = true;
@@ -578,7 +578,7 @@ void RenderObject::setNeedsPositionedMovementLayout()
     if (!alreadyNeededLayout) {
         markContainingBlocksForLayout();
         if (hasLayer())
-            RenderBox::toRenderBox(this)->layer()->setNeedsFullRepaint();
+            toRenderBox(this)->layer()->setNeedsFullRepaint();
     }
 }
 
@@ -1749,7 +1749,7 @@ bool RenderObject::repaintAfterLayoutIfNeeded(const IntRect& oldBounds, const In
         for (ShadowData* shadow = boxShadow; shadow; shadow = shadow->next)
             shadowRight = max(shadow->x + shadow->blur, shadowRight);
 
-        int borderRight = isBox() ? RenderBox::toRenderBox(this)->borderRight() : 0;
+        int borderRight = isBox() ? toRenderBox(this)->borderRight() : 0;
         int borderWidth = max(-outlineStyle->outlineOffset(), max(borderRight, max(style()->borderTopRightRadius().width(), style()->borderBottomRightRadius().width()))) + max(ow, shadowRight);
         IntRect rightRect(newOutlineBox.x() + min(newOutlineBox.width(), oldOutlineBox.width()) - borderWidth,
             newOutlineBox.y(),
@@ -1767,7 +1767,7 @@ bool RenderObject::repaintAfterLayoutIfNeeded(const IntRect& oldBounds, const In
         for (ShadowData* shadow = boxShadow; shadow; shadow = shadow->next)
             shadowBottom = max(shadow->y + shadow->blur, shadowBottom);
 
-        int borderBottom = isBox() ? RenderBox::toRenderBox(this)->borderBottom() : 0;
+        int borderBottom = isBox() ? toRenderBox(this)->borderBottom() : 0;
         int borderHeight = max(-outlineStyle->outlineOffset(), max(borderBottom, max(style()->borderBottomLeftRadius().height(), style()->borderBottomRightRadius().height()))) + max(ow, shadowBottom);
         IntRect bottomRect(newOutlineBox.x(),
             min(newOutlineBox.bottom(), oldOutlineBox.bottom()) - borderHeight,
@@ -1804,7 +1804,7 @@ IntRect RenderObject::getAbsoluteRepaintRectWithOutline(int ow)
     r.inflate(ow);
 
     if (virtualContinuation() && !isInline())
-        r.inflateY(RenderBox::toRenderBox(this)->collapsedMarginTop());
+        r.inflateY(toRenderBox(this)->collapsedMarginTop());
 
     if (isInlineFlow()) {
         for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
@@ -1836,7 +1836,7 @@ void RenderObject::computeAbsoluteRepaintRect(IntRect& rect, bool fixed)
             // o->height() is inaccurate if we're in the middle of a layout of |o|, so use the
             // layer's size instead.  Even if the layer's size is wrong, the layer itself will repaint
             // anyway if its size does change.
-            RenderBox* boxParent = RenderBox::toRenderBox(o);
+            RenderBox* boxParent = toRenderBox(o);
 
             IntRect boxRect(0, 0, boxParent->layer()->width(), boxParent->layer()->height());
             int x = rect.x();
@@ -2148,7 +2148,7 @@ FloatPoint RenderObject::localToAbsolute(FloatPoint localPoint, bool fixed, bool
     RenderObject* o = parent();
     if (o) {
         if (o->hasOverflowClip())
-            localPoint -= RenderBox::toRenderBox(o)->layer()->scrolledContentOffset();
+            localPoint -= toRenderBox(o)->layer()->scrolledContentOffset();
         return o->localToAbsolute(localPoint, fixed, useTransforms);
     }
 
@@ -2161,7 +2161,7 @@ FloatPoint RenderObject::absoluteToLocal(FloatPoint containerPoint, bool fixed,
     if (o) {
         FloatPoint localPoint = o->absoluteToLocal(containerPoint, fixed, useTransforms);
         if (o->hasOverflowClip())
-            localPoint += RenderBox::toRenderBox(o)->layer()->scrolledContentOffset();
+            localPoint += toRenderBox(o)->layer()->scrolledContentOffset();
         return localPoint;
     }
     return FloatPoint();
@@ -2173,7 +2173,7 @@ FloatQuad RenderObject::localToAbsoluteQuad(const FloatQuad& localQuad, bool fix
     if (o) {
         FloatQuad quad = localQuad;
         if (o->hasOverflowClip())
-            quad -= RenderBox::toRenderBox(o)->layer()->scrolledContentOffset();
+            quad -= toRenderBox(o)->layer()->scrolledContentOffset();
         return o->localToAbsoluteQuad(quad, fixed);
     }
 
@@ -2186,7 +2186,7 @@ IntSize RenderObject::offsetFromContainer(RenderObject* o) const
 
     IntSize offset;
     if (o->hasOverflowClip())
-        offset -= RenderBox::toRenderBox(o)->layer()->scrolledContentOffset();
+        offset -= toRenderBox(o)->layer()->scrolledContentOffset();
 
     return offset;
 }
@@ -2274,14 +2274,14 @@ void RenderObject::removeFromObjectLists()
         }
 
         if (outermostBlock)
-            outermostBlock->markAllDescendantsWithFloatsForLayout(RenderBox::toRenderBox(this));
+            outermostBlock->markAllDescendantsWithFloatsForLayout(toRenderBox(this));
     }
 
     if (isPositioned()) {
         RenderObject* p;
         for (p = parent(); p; p = p->parent()) {
             if (p->isRenderBlock())
-                static_cast<RenderBlock*>(p)->removePositionedObject(RenderBox::toRenderBox(this));
+                static_cast<RenderBlock*>(p)->removePositionedObject(toRenderBox(this));
         }
     }
 }
@@ -2316,7 +2316,7 @@ void RenderObject::destroy()
     // be moved into RenderBox::destroy.
     RenderArena* arena = renderArena();
     if (hasLayer())
-        RenderBox::toRenderBox(this)->layer()->destroy(arena);
+        toRenderBox(this)->layer()->destroy(arena);
     arenaDelete(arena, this);
 }
 
@@ -2416,7 +2416,7 @@ void RenderObject::updateHitTestResult(HitTestResult& result, const IntPoint& po
             RenderBlock* firstBlock = node->renderer()->containingBlock();
             
             // Get our containing block.
-            RenderBox* block = RenderBox::toRenderBox(this);
+            RenderBox* block = toRenderBox(this);
             if (isInline())
                 block = containingBlock();
         
@@ -2682,7 +2682,7 @@ void RenderObject::addDashboardRegions(Vector<DashboardRegionValue>& regions)
     if (style()->visibility() != VISIBLE || !isBox())
         return;
     
-    RenderBox* box = RenderBox::toRenderBox(this);
+    RenderBox* box = toRenderBox(this);
 
     const Vector<StyleDashboardRegion>& styleRegions = style()->dashboardRegions();
     unsigned i, count = styleRegions.size();
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index 1d5f5a79da69e3e4c34a5fc799c03c1e3e5099da..1edf17d0a000848d6c0a3a3933d4802e73d57c3a 100644
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -498,7 +498,7 @@ int RenderTableSection::layoutRows(int toAdd)
                 (!table()->style()->height().isAuto() && rHeight != cell->height());
 
             for (RenderObject* o = cell->firstChild(); o; o = o->nextSibling()) {
-                if (!o->isText() && o->style()->height().isPercent() && (o->isReplaced() || (o->isBox() && RenderBox::toRenderBox(o)->scrollsOverflow()) || flexAllChildren)) {
+                if (!o->isText() && o->style()->height().isPercent() && (o->isReplaced() || (o->isBox() && toRenderBox(o)->scrollsOverflow()) || flexAllChildren)) {
                     // Tables with no sections do not flex.
                     if (!o->isTable() || static_cast<RenderTable*>(o)->hasSections()) {
                         o->setNeedsLayout(true, false);
diff --git a/WebCore/rendering/RenderTheme.cpp b/WebCore/rendering/RenderTheme.cpp
index 44ae92ee331c306bbae314fa9d54c1baf4c25fd7..6d4c7e267c8366a0cd33fd3b7b68200d2b5ba1e5 100644
--- a/WebCore/rendering/RenderTheme.cpp
+++ b/WebCore/rendering/RenderTheme.cpp
@@ -375,7 +375,7 @@ bool RenderTheme::hitTestMediaControlPart(RenderObject* o, const IntPoint& absPo
         return false;
 
     FloatPoint localPoint = o->absoluteToLocal(absPoint, false, true);  // respect transforms
-    return RenderBox::toRenderBox(o)->borderBoxRect().contains(roundedIntPoint(localPoint));
+    return toRenderBox(o)->borderBoxRect().contains(roundedIntPoint(localPoint));
 }
 #endif
 
@@ -485,7 +485,7 @@ int RenderTheme::baselinePosition(const RenderObject* o) const
     if (!o->isBox())
         return 0;
 
-    const RenderBox* box = RenderBox::toConstRenderBox(o);
+    const RenderBox* box = toRenderBox(o);
 
 #if USE(NEW_THEME)
     return box->height() + box->marginTop() + m_theme->baselinePositionAdjustment(o->style()->appearance()) * o->style()->effectiveZoom();
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index ffc2d6080880fa4826674b6258f58da93c3bd370..b2d320a58266190c8200484be0fe243ce54b4412 100644
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -1609,7 +1609,7 @@ bool RenderThemeMac::hitTestMediaControlPart(RenderObject* o, const IntPoint& ab
     if (mediaControllerTheme() == MediaControllerThemeQT) {
         ControlPart part = o->style()->appearance();
         FloatPoint localPoint = o->absoluteToLocal(absPoint, false, true);  // respect transforms
-        return wkHitTestMediaUIPart(part - MediaFullscreenButtonPart, MediaControllerThemeQT, CGRect(RenderBox::toRenderBox(o)->borderBoxRect()), CGPoint(localPoint));
+        return wkHitTestMediaUIPart(part - MediaFullscreenButtonPart, MediaControllerThemeQT, CGRect(toRenderBox(o)->borderBoxRect()), CGPoint(localPoint));
     }
     else
         return RenderTheme::hitTestMediaControlPart(o, absPoint);
diff --git a/WebCore/rendering/RenderThemeSafari.cpp b/WebCore/rendering/RenderThemeSafari.cpp
index 1bc8ed9677e3685b700937d1f1473f3524e2f204..ef39a3e2e8c283b93a570f979e2040a37c45fe09 100644
--- a/WebCore/rendering/RenderThemeSafari.cpp
+++ b/WebCore/rendering/RenderThemeSafari.cpp
@@ -276,8 +276,8 @@ int RenderThemeSafari::baselinePosition(const RenderObject* o) const
         return 0;
 
     if (o->style()->appearance() == CheckboxPart || o->style()->appearance() == RadioPart) {
-        const RenderBox* box = RenderBox::toConstRenderBox(o);
-        return box->marginTop() + RenderBox::toConstRenderBox(o)->height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
+        const RenderBox* box = toRenderBox(o);
+        return box->marginTop() + box->height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
     }
 
     return RenderTheme::baselinePosition(o);
diff --git a/WebCore/rendering/RenderThemeWin.cpp b/WebCore/rendering/RenderThemeWin.cpp
index e537bfb940711a6c37000ee89870e7a9b8c6e24e..5dee9127d08bcc9d33b38e0e3ad269a818754dd0 100644
--- a/WebCore/rendering/RenderThemeWin.cpp
+++ b/WebCore/rendering/RenderThemeWin.cpp
@@ -743,7 +743,7 @@ bool RenderThemeWin::paintSearchFieldCancelButton(RenderObject* o, const RenderO
     if (!o->parent() || !o->parent()->isBox())
         return false;
     
-    RenderBox* parentRenderBox = RenderBox::toRenderBox(o->parent());
+    RenderBox* parentRenderBox = toRenderBox(o->parent());
 
     IntRect parentBox = parentRenderBox->absoluteContentBox();
     
@@ -794,7 +794,7 @@ bool RenderThemeWin::paintSearchFieldResultsDecoration(RenderObject* o, const Re
     if (!o->parent() || !o->parent()->isBox())
         return false;
     
-    RenderBox* parentRenderBox = RenderBox::toRenderBox(o->parent());
+    RenderBox* parentRenderBox = toRenderBox(o->parent());
     IntRect parentBox = parentRenderBox->absoluteContentBox();
     
     // Make sure the scaled decoration stays square and will fit in its parent's box
diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index 293ca59340438d227a70a4c1e611b60ce0405cc5..700b13ebb0960ccaf825a7f04c5447cc26ca85a3 100644
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -541,7 +541,7 @@ String externalRepresentation(RenderObject* o)
     if (o->view()->frameView())
         o->view()->frameView()->layout();
     if (o->hasLayer()) {
-        RenderLayer* l = RenderBox::toRenderBox(o)->layer();
+        RenderLayer* l = toRenderBox(o)->layer();
         writeLayers(ts, l, l, IntRect(l->xPos(), l->yPos(), l->width(), l->height()));
         writeSelection(ts, o);
     }
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index acd3ca5261f32522a627e0e860f909cc6766f647..199396fffe9452dc99a1156ef4e021054a40820c 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -103,9 +103,9 @@ static int inlineWidth(RenderObject* child, bool start = true, bool end = true)
     RenderObject* parent = child->parent();
     while (parent->isBox() && parent->isInline() && !parent->isInlineBlockOrInlineTable() && lineDepth++ < cMaxLineDepth) {
         if (start && parent->firstChild() == child)
-            extraWidth += getBorderPaddingMargin(RenderBox::toRenderBox(parent), false);
+            extraWidth += getBorderPaddingMargin(toRenderBox(parent), false);
         if (end && parent->lastChild() == child)
-            extraWidth += getBorderPaddingMargin(RenderBox::toRenderBox(parent), true);
+            extraWidth += getBorderPaddingMargin(toRenderBox(parent), true);
         child = parent;
         parent = child->parent();
     }
@@ -596,7 +596,7 @@ void RenderBlock::computeHorizontalPositionsForLine(RootInlineBox* lineBox, Bidi
             }
             r->m_box->setWidth(rt->width(r->m_start, r->m_stop - r->m_start, totWidth, m_firstLine));
         } else if (!r->m_object->isInlineFlow()) {
-            RenderBox* renderBox = RenderBox::toRenderBox(r->m_object);
+            RenderBox* renderBox = toRenderBox(r->m_object);
             renderBox->calcWidth();
             r->m_box->setWidth(renderBox->width());
             if (!r->m_compact)
@@ -1430,7 +1430,7 @@ static inline bool requiresLineBox(const InlineIterator& it)
     if (it.obj->isFloatingOrPositioned())
         return false;
 
-    if (it.obj->isInlineFlow() && !inlineFlowRequiresLineBox(RenderBox::toRenderBox(it.obj)))
+    if (it.obj->isInlineFlow() && !inlineFlowRequiresLineBox(toRenderBox(it.obj)))
         return false;
 
     if (!shouldCollapseWhiteSpace(it.obj->style()) || it.obj->isBR())
@@ -1707,7 +1707,7 @@ InlineIterator RenderBlock::findNextLineBreak(InlineBidiResolver& resolver, ECle
             // Right now, we should only encounter empty inlines here.
             ASSERT(!o->firstChild());
     
-            RenderBox* flowBox = RenderBox::toRenderBox(o);
+            RenderBox* flowBox = toRenderBox(o);
             
             // Now that some inline flows have line boxes, if we are already ignoring spaces, we need 
             // to make sure that we stop to include this object and then start ignoring spaces again. 
diff --git a/WebCore/svg/SVGLength.cpp b/WebCore/svg/SVGLength.cpp
index 8ce450ef67148df3d8b8439d09481014f66753fd..d1b8856e9db74e5389909535e0ad214d1e649547 100644
--- a/WebCore/svg/SVGLength.cpp
+++ b/WebCore/svg/SVGLength.cpp
@@ -302,7 +302,7 @@ float SVGLength::PercentageOfViewport(float value, const SVGElement* context, SV
     } else if (context->parent() && !context->parent()->isSVGElement()) {
         if (RenderObject* renderer = context->renderer()) {
             if (renderer->isBox()) {
-                RenderBox* box = RenderBox::toRenderBox(renderer);
+                RenderBox* box = toRenderBox(renderer);
                 width = box->width();
                 height = box->height();
             }
diff --git a/WebCore/wml/WMLAElement.cpp b/WebCore/wml/WMLAElement.cpp
index c1a6321d0311645612e8940bb3efc34f7f6757d1..e4ef56ef779705445fb9d39c36121972deeabaf5 100644
--- a/WebCore/wml/WMLAElement.cpp
+++ b/WebCore/wml/WMLAElement.cpp
@@ -104,7 +104,7 @@ bool WMLAElement::isKeyboardFocusable(KeyboardEvent* event) const
     // Before calling absoluteRects, check for the common case where the renderer
     // or one of the continuations is non-empty, since this is a faster check and
     // almost always returns true.
-    RenderBox* box = RenderBox::toRenderBox(renderer());
+    RenderBox* box = toRenderBox(renderer());
     if (box->width() > 0 && box->height() > 0)
         return true;
     for (RenderFlow* r = box->virtualContinuation(); r; r = r->continuation())
diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp
index 9925b331a47f27b875ed23d2a076525667586d71..a6e8e06f8b7b8fa7bc1e157dc967be05fc7fab5b 100644
--- a/WebCore/wml/WMLInputElement.cpp
+++ b/WebCore/wml/WMLInputElement.cpp
@@ -53,7 +53,7 @@ static inline bool isInputFocusable(RenderObject* renderer)
     if (!renderer || !renderer->isBox())
         return false;
 
-    if (RenderBox::toRenderBox(renderer)->size().isEmpty())
+    if (toRenderBox(renderer)->size().isEmpty())
         return false;
 
     if (RenderStyle* style = renderer->style()) {