Convert first letter into a pseudo element.

Source/core/editing/TextIterator.cpp

Index: Source/core/editing/TextIterator.cpp
diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp
index 0b48f881ad8c46e93780de8646050ba26e34a898..6c936f908e1988052b489353f9782b48b8878955 100644
--- a/Source/core/editing/TextIterator.cpp
+++ b/Source/core/editing/TextIterator.cpp
@@ -30,6 +30,7 @@
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
+#include "core/dom/FirstLetterPseudoElement.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/VisiblePosition.h"
@@ -761,32 +762,21 @@ void TextIterator::handleTextBox()
     }
 }
 
-static inline RenderText* firstRenderTextInFirstLetter(RenderBoxModelObject* firstLetter)
-{
-    if (!firstLetter)
-        return 0;
-
-    // FIXME: Should this check descendent objects?
-    for (RenderObject* current = firstLetter->slowFirstChild(); current; current = current->nextSibling()) {
-        if (current->isText())
-            return toRenderText(current);
-    }
-    return 0;
-}
-
 void TextIterator::handleTextNodeFirstLetter(RenderTextFragment* renderer)
 {
-    if (renderer->firstLetter()) {
-        RenderBoxModelObject* r = renderer->firstLetter();
-        if (r->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
+    if (FirstLetterPseudoElement* firstLetterElement = renderer->firstLetterPseudoElement()) {
+        RenderObject* pseudoRenderer = firstLetterElement->renderer();
+        if (pseudoRenderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
             return;
-        if (RenderText* firstLetter = firstRenderTextInFirstLetter(r)) {
-            m_handledFirstLetter = true;
-            m_remainingTextBox = m_textBox;
-            m_textBox = firstLetter->firstTextBox();
-            m_sortedTextBoxes.clear();
-            m_firstLetterText = firstLetter;
-        }
+
+        RenderObject* firstLetter = pseudoRenderer->slowFirstChild();
+        ASSERT(firstLetter);
+
+        m_handledFirstLetter = true;
+        m_remainingTextBox = m_textBox;
+        m_textBox = toRenderText(firstLetter)->firstTextBox();
+        m_sortedTextBoxes.clear();
+        m_firstLetterText = toRenderText(firstLetter);
     }
     m_handledFirstLetter = true;
 }
@@ -850,9 +840,9 @@ bool TextIterator::hasVisibleTextNode(RenderText* renderer)
 {
     if (renderer->style()->visibility() == VISIBLE)
         return true;
-    if (renderer->isTextFragment()) {
-        RenderTextFragment* fragment = toRenderTextFragment(renderer);
-        if (fragment->firstLetter() && fragment->firstLetter()->style()->visibility() == VISIBLE)
+    if (renderer->isTextFragment() && toRenderTextFragment(renderer)->firstLetterPseudoElement()) {
+        RenderObject* pseudoElementRenderer = toRenderTextFragment(renderer)->firstLetterPseudoElement()->renderer();
+        if (pseudoElementRenderer && pseudoElementRenderer->style()->visibility() == VISIBLE)
             return true;
     }
     return false;
@@ -1528,7 +1518,12 @@ RenderText* SimplifiedBackwardsTextIterator::handleFirstLetter(int& startOffset,
 
     m_shouldHandleFirstLetter = false;
     offsetInNode = 0;
-    RenderText* firstLetterRenderer = firstRenderTextInFirstLetter(fragment->firstLetter());
+
+    ASSERT(fragment->firstLetterPseudoElement());
+
+    RenderObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->renderer();
+    ASSERT(pseudoElementRenderer && pseudoElementRenderer->slowFirstChild());

[Julien - ping for review, 2014/10/10 22:47:23]

Let's split this ASSERT in 2 (cf my rationale earlier).

[dsinclair, 2014/10/14 14:31:28]

Done.

+    RenderText* firstLetterRenderer = toRenderText(pseudoElementRenderer->slowFirstChild());
 
     m_offset = firstLetterRenderer->caretMaxOffset();
     m_offset += collapsedSpaceLength(firstLetterRenderer, m_offset);