Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderBlock.h

Index: third_party/WebKit/WebCore/rendering/RenderBlock.h
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderBlock.h	(revision 9383)
+++ third_party/WebKit/WebCore/rendering/RenderBlock.h	(working copy)
@@ -256,7 +256,7 @@
 
     bool inRootBlockContext() const;
 
-    virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth);
+    virtual IntRect rectWithOutlineForRepaint(RenderBox* repaintContainer, int outlineWidth);
     virtual RenderStyle* outlineStyleForRepaint() const;
     
     virtual RenderObject* hoverAncestor() const;
@@ -267,11 +267,11 @@
 
     virtual void setSelectionState(SelectionState s);
 
-    virtual IntRect selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool /*clipToVisibleContent*/)
+    virtual IntRect selectionRectForRepaint(RenderBox* repaintContainer, bool /*clipToVisibleContent*/)
     {
         return selectionGapRectsForRepaint(repaintContainer);
     }
-    GapRects selectionGapRectsForRepaint(RenderBoxModelObject* repaintContainer);
+    GapRects selectionGapRectsForRepaint(RenderBox* repaintContainer);
     virtual bool shouldPaintSelectionGaps() const;
     bool isSelectionRoot() const;
     GapRects fillSelectionGaps(RenderBlock* rootBlock, int blockX, int blockY, int tx, int ty,