| Index: Source/core/editing/TextIterator.cpp
|
| diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp
|
| index 668fde6021b1780b8f3ae6c30eeacf324096899c..d25805c9ac3299dc504e58873895582856e97e23 100644
|
| --- a/Source/core/editing/TextIterator.cpp
|
| +++ b/Source/core/editing/TextIterator.cpp
|
| @@ -621,26 +621,13 @@ void TextIterator::handleTextBox()
|
| }
|
| }
|
|
|
| -static inline RenderText* firstRenderTextInFirstLetter(RenderObject* firstLetter)
|
| -{
|
| - if (!firstLetter)
|
| - return 0;
|
| -
|
| - // FIXME: Should this check descendent objects?
|
| - for (RenderObject* current = firstLetter->firstChild(); current; current = current->nextSibling()) {
|
| - if (current->isText())
|
| - return toRenderText(current);
|
| - }
|
| - return 0;
|
| -}
|
| -
|
| void TextIterator::handleTextNodeFirstLetter(RenderTextFragment* renderer)
|
| {
|
| if (renderer->firstLetter()) {
|
| RenderObject* r = renderer->firstLetter();
|
| if (r->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
|
| return;
|
| - if (RenderText* firstLetter = firstRenderTextInFirstLetter(r)) {
|
| + if (RenderText* firstLetter = renderer->firstRenderTextInFirstLetter()) {
|
| m_handledFirstLetter = true;
|
| m_remainingTextBox = m_textBox;
|
| m_textBox = firstLetter->firstTextBox();
|
| @@ -1290,7 +1277,7 @@ RenderText* SimplifiedBackwardsTextIterator::handleFirstLetter(int& startOffset,
|
|
|
| m_shouldHandleFirstLetter = false;
|
| offsetInNode = 0;
|
| - return firstRenderTextInFirstLetter(fragment->firstLetter());
|
| + return fragment->firstRenderTextInFirstLetter();
|
| }
|
|
|
| bool SimplifiedBackwardsTextIterator::handleReplacedElement()
|
|
|