Index: Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp |
diff --git a/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp b/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp |
index 8fcb418b27acf612392116e872477d91a6919cbf..9c9314318c66070c73ed7da09bae3037a0518326 100644 |
--- a/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp |
+++ b/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp |
@@ -52,8 +52,8 @@ static int maxOffsetIncludingCollapsedSpaces(Node* node) |
{ |
int offset = caretMaxOffset(node); |
- if (node->renderer() && node->renderer()->isText()) |
- offset += collapsedSpaceLength(toLayoutText(node->renderer()), offset); |
+ if (node->layoutObject() && node->layoutObject()->isText()) |
+ offset += collapsedSpaceLength(toLayoutText(node->layoutObject()), offset); |
return offset; |
} |
@@ -185,7 +185,7 @@ void SimplifiedBackwardsTextIterator::advance() |
while (m_node && !m_havePassedStartNode) { |
// Don't handle node if we start iterating at [node, 0]. |
if (!m_handledNode && !(m_node == m_endNode && !m_endOffset)) { |
- LayoutObject* renderer = m_node->renderer(); |
+ LayoutObject* renderer = m_node->layoutObject(); |
if (renderer && renderer->isText() && m_node->nodeType() == Node::TEXT_NODE) { |
// FIXME: What about CDATA_SECTION_NODE? |
if (renderer->style()->visibility() == VISIBLE && m_offset > 0) |
@@ -281,7 +281,7 @@ bool SimplifiedBackwardsTextIterator::handleTextNode() |
LayoutText* SimplifiedBackwardsTextIterator::handleFirstLetter(int& startOffset, int& offsetInNode) |
{ |
- LayoutText* renderer = toLayoutText(m_node->renderer()); |
+ LayoutText* renderer = toLayoutText(m_node->layoutObject()); |
startOffset = (m_node == m_startNode) ? m_startOffset : 0; |
if (!renderer->isTextFragment()) { |
@@ -309,7 +309,7 @@ LayoutText* SimplifiedBackwardsTextIterator::handleFirstLetter(int& startOffset, |
ASSERT(fragment->isRemainingTextRenderer()); |
ASSERT(fragment->firstLetterPseudoElement()); |
- LayoutObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->renderer(); |
+ LayoutObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->layoutObject(); |
ASSERT(pseudoElementRenderer); |
ASSERT(pseudoElementRenderer->slowFirstChild()); |
LayoutText* firstLetterRenderer = toLayoutText(pseudoElementRenderer->slowFirstChild()); |