Rename renderer() to layoutObject().

Source/core/editing/RenderedPosition.cpp

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 
 namespace blink {
 
 static inline LayoutObject* rendererFromPosition(const Position& position)
 {
     ASSERT(position.isNotNull());
     Node* rendererNode = nullptr;
     switch (position.anchorType()) {
     case Position::PositionIsOffsetInAnchor:
         rendererNode = position.computeNodeAfterPosition();
-        if (!rendererNode || !rendererNode->renderer())
+        if (!rendererNode || !rendererNode->layoutObject())
             rendererNode = position.anchorNode()->lastChild();
         break;
 
     case Position::PositionIsBeforeAnchor:
     case Position::PositionIsAfterAnchor:
         break;
 
     case Position::PositionIsBeforeChildren:
         rendererNode = position.anchorNode()->firstChild();
         break;
     case Position::PositionIsAfterChildren:
         rendererNode = position.anchorNode()->lastChild();
         break;
     }
-    if (!rendererNode || !rendererNode->renderer())
+    if (!rendererNode || !rendererNode->layoutObject())
         rendererNode = position.anchorNode();
-    return rendererNode->renderer();
+    return rendererNode->layoutObject();
 }
 
 RenderedPosition::RenderedPosition(const VisiblePosition& position)
     : m_renderer(nullptr)
     , m_inlineBox(nullptr)
     , m_offset(0)
     , m_prevLeafChild(uncachedInlineBox())
     , m_nextLeafChild(uncachedInlineBox())
 {
     if (position.isNull())
         return;
     position.getInlineBoxAndOffset(m_inlineBox, m_offset);
     if (m_inlineBox)
-        m_renderer = &m_inlineBox->renderer();
+        m_renderer = &m_inlineBox->layoutObject();
     else
         m_renderer = rendererFromPosition(position.deepEquivalent());
 }
 
 RenderedPosition::RenderedPosition(const Position& position, EAffinity affinity)
     : m_renderer(nullptr)
     , m_inlineBox(nullptr)
     , m_offset(0)
     , m_prevLeafChild(uncachedInlineBox())
     , m_nextLeafChild(uncachedInlineBox())
 {
     if (position.isNull())
         return;
     position.getInlineBoxAndOffset(affinity, m_inlineBox, m_offset);
     if (m_inlineBox)
-        m_renderer = &m_inlineBox->renderer();
+        m_renderer = &m_inlineBox->layoutObject();
     else
         m_renderer = rendererFromPosition(position);
 }
 
 InlineBox* RenderedPosition::prevLeafChild() const
 {
     if (m_prevLeafChild == uncachedInlineBox())
         m_prevLeafChild = m_inlineBox->prevLeafChildIgnoringLineBreak();
     return m_prevLeafChild;
 }
@@ skipping 26 matching lines @@
 
 RenderedPosition RenderedPosition::leftBoundaryOfBidiRun(unsigned char bidiLevelOfRun)
 {
     if (!m_inlineBox || bidiLevelOfRun > m_inlineBox->bidiLevel())
         return RenderedPosition();
 
     InlineBox* box = m_inlineBox;
     do {
         InlineBox* prev = box->prevLeafChildIgnoringLineBreak();
         if (!prev || prev->bidiLevel() < bidiLevelOfRun)
-            return RenderedPosition(&box->renderer(), box, box->caretLeftmostOffset());
+            return RenderedPosition(&box->layoutObject(), box, box->caretLeftmostOffset());
         box = prev;
     } while (box);
 
     ASSERT_NOT_REACHED();
     return RenderedPosition();
 }
 
 RenderedPosition RenderedPosition::rightBoundaryOfBidiRun(unsigned char bidiLevelOfRun)
 {
     if (!m_inlineBox || bidiLevelOfRun > m_inlineBox->bidiLevel())
         return RenderedPosition();
 
     InlineBox* box = m_inlineBox;
     do {
         InlineBox* next = box->nextLeafChildIgnoringLineBreak();
         if (!next || next->bidiLevel() < bidiLevelOfRun)
-            return RenderedPosition(&box->renderer(), box, box->caretRightmostOffset());
+            return RenderedPosition(&box->layoutObject(), box, box->caretRightmostOffset());
         box = next;
     } while (box);
 
     ASSERT_NOT_REACHED();
     return RenderedPosition();
 }
 
 bool RenderedPosition::atLeftBoundaryOfBidiRun(ShouldMatchBidiLevel shouldMatchBidiLevel, unsigned char bidiLevelOfRun) const
 {
     if (!m_inlineBox)
@@ skipping 34 matching lines @@
     return false;
 }
 
 Position RenderedPosition::positionAtLeftBoundaryOfBiDiRun() const
 {
     ASSERT(atLeftBoundaryOfBidiRun());
 
     if (atLeftmostOffsetInBox())
         return createLegacyEditingPosition(m_renderer->node(), m_offset);
 
-    return createLegacyEditingPosition(nextLeafChild()->renderer().node(), nextLeafChild()->caretLeftmostOffset());
+    return createLegacyEditingPosition(nextLeafChild()->layoutObject().node(), nextLeafChild()->caretLeftmostOffset());
 }
 
 Position RenderedPosition::positionAtRightBoundaryOfBiDiRun() const
 {
     ASSERT(atRightBoundaryOfBidiRun());
 
     if (atRightmostOffsetInBox())
         return createLegacyEditingPosition(m_renderer->node(), m_offset);
 
-    return createLegacyEditingPosition(prevLeafChild()->renderer().node(), prevLeafChild()->caretRightmostOffset());
+    return createLegacyEditingPosition(prevLeafChild()->layoutObject().node(), prevLeafChild()->caretRightmostOffset());
 }
 
 IntRect RenderedPosition::absoluteRect(LayoutUnit* extraWidthToEndOfLine) const
 {
     if (isNull())
         return IntRect();
 
     IntRect localRect = pixelSnappedIntRect(m_renderer->localCaretRect(m_inlineBox, m_offset, extraWidthToEndOfLine));
     return localRect == IntRect() ? IntRect() : m_renderer->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
 }
@@ skipping 16 matching lines @@
 bool layoutObjectContainsPosition(LayoutObject* target, const Position& position)
 {
     for (LayoutObject* renderer = rendererFromPosition(position); renderer && renderer->node(); renderer = renderer->parent()) {
         if (renderer == target)
             return true;
     }
     return false;
 }
 
 };