Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(923)

Unified Diff: Source/core/editing/TextIterator.cpp

Issue 20681004: Make first-letter style to work with editing Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 2013-08-01T17:57:42 Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/TextIterator.cpp
diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp
index d11344ea24f8483bfb5f58372bd99f4eacacb319..9ede8e65c52b5ff31d7c5c62926d17eca413ac15 100644
--- a/Source/core/editing/TextIterator.cpp
+++ b/Source/core/editing/TextIterator.cpp
@@ -620,26 +620,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();
@@ -1289,7 +1276,7 @@ RenderText* SimplifiedBackwardsTextIterator::handleFirstLetter(int& startOffset,
m_shouldHandleFirstLetter = false;
offsetInNode = 0;
- return firstRenderTextInFirstLetter(fragment->firstLetter());
+ return fragment->firstRenderTextInFirstLetter();
}
bool SimplifiedBackwardsTextIterator::handleReplacedElement()

Powered by Google App Engine
This is Rietveld 408576698