Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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
  * 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 131 matching lines @@
 }
 
 FloatPoint RenderView::absoluteToLocal(FloatPoint containerPoint, bool fixed, bool) const
 {
     if (fixed && m_frameView)
         containerPoint -= m_frameView->scrollOffset();
 
     return containerPoint;
 }
 
-FloatQuad RenderView::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed) const
+FloatQuad RenderView::localToContainerQuad(const FloatQuad& localQuad, RenderBox* repaintContainer, bool fixed) const
 {
     // If a container was specified, and was not 0 or the RenderView,
     // then we should have found it by now.
     ASSERT_UNUSED(repaintContainer, !repaintContainer || repaintContainer == this);
 
     FloatQuad quad = localQuad;
     if (fixed && m_frameView)
         quad += m_frameView->scrollOffset();
 
     return quad;
@@ skipping 102 matching lines @@
     // If we're a frame, repaintViewRectangle will have repainted via a RenderObject in the
     // parent document.
     if (document()->ownerElement())
         return;
 
     if (compositor()->inCompositingMode())
         compositor()->repaintCompositedLayersAbsoluteRect(ur);
 #endif
 }
 
-void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed)
+void RenderView::computeRectForRepaint(RenderBox* repaintContainer, IntRect& rect, bool fixed)
 {
     // If a container was specified, and was not 0 or the RenderView,
     // then we should have found it by now.
     ASSERT_UNUSED(repaintContainer, !repaintContainer || repaintContainer == this);
 
     if (printing())
         return;
 
     if (fixed && m_frameView)
         rect.move(m_frameView->scrollX(), m_frameView->scrollY());
@@ skipping 402 matching lines @@
 void RenderView::willMoveOffscreen()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_compositor)
         m_compositor->willMoveOffscreen();
 #endif
 }
 
 } // namespace WebCore