Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderBlock.h

 /*
  * This file is part of the render object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 238 matching lines @@
 
     bool containsNonZeroBidiLevel() const;
 
     // Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline
     // children.
     virtual RenderBlock* firstLineBlock() const;
     virtual void updateFirstLetter();
 
     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;
     virtual void updateDragState(bool dragOn);
     virtual void updateHitTestResult(HitTestResult&, const IntPoint&);
     
     virtual void childBecameNonInline(RenderObject* child);
 
     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,
                                int& lastTop, int& lastLeft, int& lastRight, const PaintInfo* = 0);
     GapRects fillInlineSelectionGaps(RenderBlock* rootBlock, int blockX, int blockY, int tx, int ty,
                                      int& lastTop, int& lastLeft, int& lastRight, const PaintInfo*);
     GapRects fillBlockSelectionGaps(RenderBlock* rootBlock, int blockX, int blockY, int tx, int ty,
                                     int& lastTop, int& lastLeft, int& lastRight, const PaintInfo*);
     IntRect fillVerticalSelectionGap(int lastTop, int lastLeft, int lastRight, int bottomY, RenderBlock* rootBlock,
                                      int blockX, int blockY, const PaintInfo*);
@@ skipping 230 matching lines @@
     return static_cast<const RenderBlock*>(o);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderBlock(const RenderBlock* o);
 
 } // namespace WebCore
 
 #endif // RenderBlock_h