Move rendering/RenderObject to layout/LayoutObject.

Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 433 matching lines @@
         return false;
     // FIXME: This check is broken in for OOPI.
     HTMLFrameOwnerElement* owner = doc->ownerElement();
     if (!owner)
         return false;
     return owner->treeScope() == scope;
 }
 
 void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial)
 {
-    RenderObject* root = view()->layoutRoot();
+    LayoutObject* root = view()->layoutRoot();
     isPartial = true;
     if (!root) {
         isPartial = false;
         root = contentRenderer();
     }
 
     needsLayoutObjects = 0;
     totalObjects = 0;
 
-    for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
+    for (LayoutObject* o = root; o; o = o->nextInPreOrder(root)) {
         ++totalObjects;
         if (o->needsLayout())
             ++needsLayoutObjects;
     }
 }
 
 String LocalFrame::layerTreeAsText(LayerTreeFlags flags) const
 {
     TextStream textStream;
     textStream << localLayerTreeAsText(flags);
@@ skipping 182 matching lines @@
         return nullptr;
 
     const ScopedFramePaintingState state(this, &node);
 
     m_view->updateLayoutAndStyleForPainting();
 
     m_view->setPaintBehavior(state.paintBehavior | PaintBehaviorFlattenCompositingLayers);
 
     m_view->setNodeToDraw(&node); // Enable special sub-tree drawing mode.
 
-    // Document::updateLayout may have blown away the original RenderObject.
-    RenderObject* renderer = node.renderer();
+    // Document::updateLayout may have blown away the original LayoutObject.
+    LayoutObject* renderer = node.renderer();
     if (!renderer)
         return nullptr;
 
     LayoutRect rect;
 
     return paintIntoDragImage(renderer->displayItemClient(), DisplayItem::ClipNodeImage, renderer->shouldRespectImageOrientation(),
         pixelSnappedIntRect(renderer->paintingRootRect(rect)));
 }
 
 PassOwnPtr<DragImage> LocalFrame::dragImageForSelection()
@@ skipping 18 matching lines @@
 {
     return selection().selectedTextForClipboard();
 }
 
 VisiblePosition LocalFrame::visiblePositionForPoint(const IntPoint& framePoint)
 {
     HitTestResult result = eventHandler().hitTestResultAtPoint(framePoint);
     Node* node = result.innerNonSharedNode();
     if (!node)
         return VisiblePosition();
-    RenderObject* renderer = node->renderer();
+    LayoutObject* renderer = node->renderer();
     if (!renderer)
         return VisiblePosition();
     VisiblePosition visiblePos = VisiblePosition(renderer->positionForPoint(result.localPoint()));
     if (visiblePos.isNull())
         visiblePos = VisiblePosition(firstPositionInOrBeforeNode(node));
     return visiblePos;
 }
 
 Document* LocalFrame::documentAtPoint(const IntPoint& point)
 {
@@ skipping 118 matching lines @@
     // We detach the FrameView's custom scroll bars as early as
     // possible to prevent m_doc->detach() from messing with the view
     // such that its scroll bars won't be torn down.
     //
     // FIXME: We should revisit this.
     if (m_view)
         m_view->prepareForDetach();
 }
 
 } // namespace blink