Index: Source/core/editing/TextIterator.cpp |
diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp |
index a2763b7a62a622c25b98dcf06d89a8e16db4a3fc..385b6d4b6bd181870c61a812f3c143d580cfdb80 100644 |
--- a/Source/core/editing/TextIterator.cpp |
+++ b/Source/core/editing/TextIterator.cpp |
@@ -250,7 +250,7 @@ TextIterator::TextIterator(const Range* range, TextIteratorBehaviorFlags behavio |
, m_needsAnotherNewline(false) |
, m_textBox(0) |
, m_remainingTextBox(0) |
- , m_firstLetterText(0) |
+ , m_firstLetterText(nullptr) |
, m_lastTextNode(nullptr) |
, m_lastTextNodeEndedWithCollapsedSpace(false) |
, m_lastCharacter(0) |
@@ -281,7 +281,7 @@ TextIterator::TextIterator(const Position& start, const Position& end, TextItera |
, m_needsAnotherNewline(false) |
, m_textBox(0) |
, m_remainingTextBox(0) |
- , m_firstLetterText(0) |
+ , m_firstLetterText(nullptr) |
, m_lastTextNode(nullptr) |
, m_lastTextNodeEndedWithCollapsedSpace(false) |
, m_lastCharacter(0) |
@@ -396,7 +396,7 @@ void TextIterator::advance() |
if (!m_textBox && m_remainingTextBox) { |
m_textBox = m_remainingTextBox; |
m_remainingTextBox = 0; |
- m_firstLetterText = 0; |
+ m_firstLetterText = nullptr; |
m_offset = 0; |
} |
// handle remembered text box |
@@ -537,7 +537,7 @@ void TextIterator::advance() |
m_fullyClippedStack.pop(); |
} |
m_handledFirstLetter = false; |
- m_firstLetterText = 0; |
+ m_firstLetterText = nullptr; |
continue; |
} |
} |
@@ -550,7 +550,7 @@ void TextIterator::advance() |
pushFullyClippedState(m_fullyClippedStack, m_node); |
m_iterationProgress = HandledNone; |
m_handledFirstLetter = false; |
- m_firstLetterText = 0; |
+ m_firstLetterText = nullptr; |
// how would this ever be? |
if (m_positionNode) |
@@ -623,7 +623,7 @@ bool TextIterator::handleTextNode() |
if (m_firstLetterText) { |
String firstLetter = m_firstLetterText->text(); |
emitText(textNode, m_firstLetterText, m_offset, m_offset + firstLetter.length()); |
- m_firstLetterText = 0; |
+ m_firstLetterText = nullptr; |
m_textBox = 0; |
return false; |
} |
@@ -675,7 +675,7 @@ bool TextIterator::handleTextNode() |
void TextIterator::handleTextBox() |
{ |
- RenderText* renderer = m_firstLetterText ? m_firstLetterText : toRenderText(m_node->renderer()); |
+ RenderText* renderer = m_firstLetterText ? m_firstLetterText.get() : toRenderText(m_node->renderer()); |
if (renderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility) { |
m_textBox = 0; |
return; |
@@ -753,7 +753,7 @@ void TextIterator::handleTextBox() |
if (!m_textBox && m_remainingTextBox) { |
m_textBox = m_remainingTextBox; |
m_remainingTextBox = 0; |
- m_firstLetterText = 0; |
+ m_firstLetterText = nullptr; |
m_offset = 0; |
handleTextBox(); |
} |