Move rendering/RenderObject to layout/LayoutObject.

Source/core/paint/FramePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/FramePainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/frame/FrameView.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ skipping 111 matching lines @@
     if (m_frameView.paintBehavior() == PaintBehaviorNormal)
         document->markers().invalidateRenderedRectsForMarkersInRect(rect);
 
     if (document->printing())
         m_frameView.setPaintBehavior(m_frameView.paintBehavior() | PaintBehaviorFlattenCompositingLayers);
 
     ASSERT(!m_frameView.isPainting());
     m_frameView.setIsPainting(true);
 
     // m_frameView.nodeToDraw() is used to draw only one element (and its descendants)
-    RenderObject* renderer = m_frameView.nodeToDraw() ? m_frameView.nodeToDraw()->renderer() : 0;
+    LayoutObject* renderer = m_frameView.nodeToDraw() ? m_frameView.nodeToDraw()->renderer() : 0;
     Layer* rootLayer = renderView->layer();
 
 #if ENABLE(ASSERT)
     renderView->assertSubtreeIsLaidOut();
-    RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
+    LayoutObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
 #endif
 
     LayerPainter layerPainter(*rootLayer);
 
     float deviceScaleFactor = blink::deviceScaleFactor(rootLayer->renderer()->frame());
     context->setDeviceScaleFactor(deviceScaleFactor);
 
     layerPainter.paint(context, rect, m_frameView.paintBehavior(), renderer);
 
     if (rootLayer->containsDirtyOverlayScrollbars())
@@ skipping 82 matching lines @@
 {
     IntRect horizontalOverhangRect;
     IntRect verticalOverhangRect;
     m_frameView.calculateOverhangAreasForPainting(horizontalOverhangRect, verticalOverhangRect);
 
     if (dirtyRect.intersects(horizontalOverhangRect) || dirtyRect.intersects(verticalOverhangRect))
         paintOverhangAreas(context, horizontalOverhangRect, verticalOverhangRect, dirtyRect);
 }
 
 } // namespace blink