Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderView.h

Index: third_party/WebKit/WebCore/rendering/RenderView.h
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderView.h	(revision 9383)
+++ third_party/WebKit/WebCore/rendering/RenderView.h	(working copy)
@@ -65,7 +65,7 @@
 
     virtual bool hasOverhangingFloats() { return false; }
 
-    virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
+    virtual void computeRectForRepaint(RenderBox* repaintContainer, IntRect&, bool fixed = false);
     virtual void repaintViewRectangle(const IntRect&, bool immediate = false);
     // Repaint the view, and all composited layers that intersect the given absolute rectangle.
     // FIXME: ideally we'd never have to do this, if all repaints are container-relative.
@@ -169,7 +169,7 @@
 #endif
 
 protected:
-    virtual FloatQuad localToContainerQuad(const FloatQuad&, RenderBoxModelObject* repaintContainer, bool fixed = false) const;
+    virtual FloatQuad localToContainerQuad(const FloatQuad&, RenderBox* repaintContainer, bool fixed = false) const;
 
 private:
     bool shouldRepaint(const IntRect& r) const;