Move rendering/RenderObject to layout/LayoutObject.

Source/core/editing/Caret.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 110 matching lines @@
 static inline bool caretRendersInsideNode(Node* node)
 {
     return node && !isRenderedTableElement(node) && !editingIgnoresContent(node);
 }
 
 RenderBlock* CaretBase::caretRenderer(Node* node)
 {
     if (!node)
         return 0;
 
-    RenderObject* renderer = node->renderer();
+    LayoutObject* renderer = node->renderer();
     if (!renderer)
         return 0;
 
     // if caretNode is a block and caret is inside it then caret should be painted by that block
     bool paintedByBlock = renderer->isRenderBlock() && caretRendersInsideNode(node);
     return paintedByBlock ? toRenderBlock(renderer) : renderer->containingBlock();
 }
 
-static void mapCaretRectToCaretPainter(RenderObject* caretRenderer, RenderBlock* caretPainter, LayoutRect& caretRect)
+static void mapCaretRectToCaretPainter(LayoutObject* caretRenderer, RenderBlock* caretPainter, LayoutRect& caretRect)
 {
     // FIXME: This shouldn't be called on un-rooted subtrees.
     // FIXME: This should probably just use mapLocalToContainer.
     // Compute an offset between the caretRenderer and the caretPainter.
 
     ASSERT(caretRenderer->isDescendantOf(caretPainter));
 
     bool unrooted = false;
     while (caretRenderer != caretPainter) {
-        RenderObject* containerObject = caretRenderer->container();
+        LayoutObject* containerObject = caretRenderer->container();
         if (!containerObject) {
             unrooted = true;
             break;
         }
         caretRect.move(caretRenderer->offsetFromContainer(containerObject, caretRect.location()));
         caretRenderer = containerObject;
     }
 
     if (unrooted)
         caretRect = LayoutRect();
 }
 
 bool CaretBase::updateCaretRect(Document* document, const PositionWithAffinity& caretPosition)
 {
     m_caretLocalRect = LayoutRect();
 
     if (caretPosition.position().isNull())
         return false;
 
     ASSERT(caretPosition.position().deprecatedNode()->renderer());
 
     // First compute a rect local to the renderer at the selection start.
-    RenderObject* renderer;
+    LayoutObject* renderer;
     m_caretLocalRect = localCaretRectOfPosition(caretPosition, renderer);
 
     // Get the renderer that will be responsible for painting the caret
     // (which is either the renderer we just found, or one of its containers).
     RenderBlock* caretPainter = caretRenderer(caretPosition.position().deprecatedNode());
 
     mapCaretRectToCaretPainter(renderer, caretPainter, m_caretLocalRect);
 
     return true;
 }
@@ skipping 92 matching lines @@
     context->fillRect(caret, caretColor);
 }
 
 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
 {
     if (m_position.deepEquivalent().deprecatedNode()->document().frame() == frame)
         paintCaret(m_position.deepEquivalent().deprecatedNode(), p, paintOffset, clipRect);
 }
 
 }