Rename renderer to layoutObject in core/editing.

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);
 }
 
 LayoutBlock* CaretBase::caretLayoutObject(Node* node)
 {
     if (!node)
         return 0;
 
-    LayoutObject* renderer = node->layoutObject();
-    if (!renderer)
+    LayoutObject* layoutObject = node->layoutObject();
+    if (!layoutObject)
         return 0;
 
     // if caretNode is a block and caret is inside it then caret should be painted by that block
-    bool paintedByBlock = renderer->isLayoutBlock() && caretRendersInsideNode(node);
-    return paintedByBlock ? toLayoutBlock(renderer) : renderer->containingBlock();
+    bool paintedByBlock = layoutObject->isLayoutBlock() && caretRendersInsideNode(node);
+    return paintedByBlock ? toLayoutBlock(layoutObject) : layoutObject->containingBlock();
 }
 
 static void mapCaretRectToCaretPainter(LayoutObject* caretLayoutObject, LayoutBlock* 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 caretLayoutObject and the caretPainter.
 
     ASSERT(caretLayoutObject->isDescendantOf(caretPainter));
 
@@ skipping 14 matching lines @@
 
 bool CaretBase::updateCaretRect(Document* document, const PositionWithAffinity& caretPosition)
 {
     m_caretLocalRect = LayoutRect();
 
     if (caretPosition.position().isNull())
         return false;
 
     ASSERT(caretPosition.position().deprecatedNode()->layoutObject());
 
-    // First compute a rect local to the renderer at the selection start.
-    LayoutObject* renderer;
-    m_caretLocalRect = localCaretRectOfPosition(caretPosition, renderer);
+    // First compute a rect local to the layoutObject at the selection start.
+    LayoutObject* layoutObject;
+    m_caretLocalRect = localCaretRectOfPosition(caretPosition, layoutObject);
 
-    // Get the renderer that will be responsible for painting the caret
-    // (which is either the renderer we just found, or one of its containers).
+    // Get the layoutObject that will be responsible for painting the caret
+    // (which is either the layoutObject we just found, or one of its containers).
     LayoutBlock* caretPainter = caretLayoutObject(caretPosition.position().deprecatedNode());
 
-    mapCaretRectToCaretPainter(renderer, caretPainter, m_caretLocalRect);
+    mapCaretRectToCaretPainter(layoutObject, caretPainter, m_caretLocalRect);
 
     return true;
 }
 
 bool CaretBase::updateCaretRect(Document* document, const VisiblePosition& caretPosition)
 {
     return updateCaretRect(document, PositionWithAffinity(caretPosition.deepEquivalent(), caretPosition.affinity()));
 }
 
 LayoutBlock* DragCaretController::caretLayoutObject() const
@@ skipping 59 matching lines @@
             invalidateLocalCaretRect(node, localCaretRectWithoutUpdate());
     }
 }
 
 void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
 {
     if (m_caretVisibility == Hidden)
         return;
 
     LayoutRect drawingRect = localCaretRectWithoutUpdate();
-    if (LayoutBlock* renderer = caretLayoutObject(node))
-        renderer->flipForWritingMode(drawingRect);
+    if (LayoutBlock* layoutObject = caretLayoutObject(node))
+        layoutObject->flipForWritingMode(drawingRect);
     drawingRect.moveBy(roundedIntPoint(paintOffset));
     LayoutRect caret = intersection(drawingRect, clipRect);
     if (caret.isEmpty())
         return;
 
     Color caretColor = Color::black;
 
     Element* element;
     if (node->isElementNode())
         element = toElement(node);
     else
         element = node->parentElement();
 
     if (element && element->layoutObject())
         caretColor = element->layoutObject()->resolveColor(CSSPropertyColor);
 
     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);
 }
 
 }