Rename renderer() to 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);
 }
 
 LayoutBlock* CaretBase::caretRenderer(Node* node)
 {
     if (!node)
         return 0;
 
-    LayoutObject* renderer = node->renderer();
+    LayoutObject* renderer = node->layoutObject();
     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->isLayoutBlock() && caretRendersInsideNode(node);
     return paintedByBlock ? toLayoutBlock(renderer) : renderer->containingBlock();
 }
 
 static void mapCaretRectToCaretPainter(LayoutObject* caretRenderer, LayoutBlock* caretPainter, LayoutRect& caretRect)
 {
@@ skipping 18 matching lines @@
         caretRect = LayoutRect();
 }
 
 bool CaretBase::updateCaretRect(Document* document, const PositionWithAffinity& caretPosition)
 {
     m_caretLocalRect = LayoutRect();
 
     if (caretPosition.position().isNull())
         return false;
 
-    ASSERT(caretPosition.position().deprecatedNode()->renderer());
+    ASSERT(caretPosition.position().deprecatedNode()->layoutObject());
 
     // First compute a rect local to the renderer at the selection start.
     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).
     LayoutBlock* caretPainter = caretRenderer(caretPosition.position().deprecatedNode());
 
     mapCaretRectToCaretPainter(renderer, caretPainter, m_caretLocalRect);
@@ skipping 27 matching lines @@
     LayoutBlock* caretPainter = caretRenderer(node);
     if (!caretPainter)
         return;
 
     // FIXME: Need to over-paint 1 pixel to workaround some rounding problems.
     // https://bugs.webkit.org/show_bug.cgi?id=108283
     LayoutRect inflatedRect = rect;
     inflatedRect.inflate(1);
 
     // FIXME: We should use mapLocalToContainer() since we know we're not un-rooted.
-    mapCaretRectToCaretPainter(node->renderer(), caretPainter, inflatedRect);
+    mapCaretRectToCaretPainter(node->layoutObject(), caretPainter, inflatedRect);
 
     // FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415
     DisablePaintInvalidationStateAsserts disabler;
     caretPainter->invalidatePaintRectangle(inflatedRect);
 }
 
 bool CaretBase::shouldRepaintCaret(Node& node) const
 {
     // If PositionIsBeforeAnchor or PositionIsAfterAnchor, carets need to be
     // repainted not only when the node is contentEditable but also when its
@@ skipping 36 matching lines @@
         return;
 
     Color caretColor = Color::black;
 
     Element* element;
     if (node->isElementNode())
         element = toElement(node);
     else
         element = node->parentElement();
 
-    if (element && element->renderer())
-        caretColor = element->renderer()->resolveColor(CSSPropertyColor);
+    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);
 }
 
 }