Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderReplaced.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 37 matching lines @@
     virtual void paintReplaced(PaintInfo&, int /*tx*/, int /*ty*/) { }
 
     virtual IntSize intrinsicSize() const;
 
     virtual int overflowHeight(bool includeInterior = true) const;
     virtual int overflowWidth(bool includeInterior = true) const;
     virtual int overflowLeft(bool includeInterior = true) const;
     virtual int overflowTop(bool includeInterior = true) const;
     virtual IntRect overflowRect(bool includeInterior = true) const;
 
-    virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
+    virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContainer);
 
     virtual unsigned caretMaxRenderedOffset() const;
     virtual VisiblePosition positionForCoordinates(int x, int y);
     
     virtual bool canBeSelectionLeaf() const { return true; }
     virtual void setSelectionState(SelectionState);
-    virtual IntRect selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool clipToVisibleContent = true);
+    virtual IntRect selectionRectForRepaint(RenderBox* repaintContainer, bool clipToVisibleContent = true);
 
     bool isSelected() const;
 
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
     void setIntrinsicSize(const IntSize&);
     virtual void intrinsicSizeChanged();
 
     bool shouldPaint(PaintInfo&, int& tx, int& ty);
     void adjustOverflowForBoxShadow();
     IntRect localSelectionRect(bool checkWhetherSelected = true) const;
 
 private:
     IntSize m_intrinsicSize;
     bool m_hasOverflow;
 };
 
 }
 
 #endif