Revert of Convert first letter into a pseudo element.

Source/core/editing/TextIterator.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/editing/TextIterator.h"
 
 #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"
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLTextFormControlElement.h"
 #include "core/rendering/InlineTextBox.h"
 #include "core/rendering/RenderImage.h"
@@ skipping 711 matching lines @@
     }
     if (!m_textBox && m_remainingTextBox) {
         m_textBox = m_remainingTextBox;
         m_remainingTextBox = 0;
         m_firstLetterText = nullptr;
         m_offset = 0;
         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)
+            return;
+        if (RenderText* firstLetter = firstRenderTextInFirstLetter(r)) {
+            m_handledFirstLetter = true;
+            m_remainingTextBox = m_textBox;
+            m_textBox = firstLetter->firstTextBox();
+            m_sortedTextBoxes.clear();
+            m_firstLetterText = firstLetter;
+        }
+    }
     m_handledFirstLetter = true;
-
-    if (!renderer->isRemainingTextRenderer())
-        return;
-
-    FirstLetterPseudoElement* firstLetterElement = renderer->firstLetterPseudoElement();
-    if (!firstLetterElement)
-        return;
-
-    RenderObject* pseudoRenderer = firstLetterElement->renderer();
-    if (pseudoRenderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
-        return;
-
-    RenderObject* firstLetter = pseudoRenderer->slowFirstChild();
-    ASSERT(firstLetter);
-
-    m_remainingTextBox = m_textBox;
-    m_textBox = toRenderText(firstLetter)->firstTextBox();
-    m_sortedTextBoxes.clear();
-    m_firstLetterText = toRenderText(firstLetter);
 }
 
 bool TextIterator::handleReplacedElement()
 {
     if (m_fullyClippedStack.top())
         return false;
 
     RenderObject* renderer = m_node->renderer();
     if (renderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
         return false;
@@ skipping 41 matching lines @@
     m_textLength = 0;
     m_lastCharacter = 0;
 
     return true;
 }
 
 bool TextIterator::hasVisibleTextNode(RenderText* renderer)
 {
     if (renderer->style()->visibility() == VISIBLE)
         return true;
-
-    if (!renderer->isTextFragment())
-        return false;
-
-    RenderTextFragment* fragment = toRenderTextFragment(renderer);
-    if (!fragment->isRemainingTextRenderer())
-        return false;
-
-    RenderObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->renderer();
-    if (pseudoElementRenderer && pseudoElementRenderer->style()->visibility() == VISIBLE)
-        return true;
-
+    if (renderer->isTextFragment()) {
+        RenderTextFragment* fragment = toRenderTextFragment(renderer);
+        if (fragment->firstLetter() && fragment->firstLetter()->style()->visibility() == VISIBLE)
+            return true;
+    }
     return false;
 }
 
 static bool shouldEmitTabBeforeNode(Node* node)
 {
     RenderObject* r = node->renderer();
 
     // Table cells are delimited by tabs.
     if (!r || !isTableCell(node))
         return false;
@@ skipping 653 matching lines @@
     }
 
     if (!m_shouldHandleFirstLetter && offsetAfterFirstLetter < m_offset) {
         m_shouldHandleFirstLetter = true;
         offsetInNode = offsetAfterFirstLetter;
         return renderer;
     }
 
     m_shouldHandleFirstLetter = false;
     offsetInNode = 0;
-
-    ASSERT(fragment->isRemainingTextRenderer());
-    ASSERT(fragment->firstLetterPseudoElement());
-
-    RenderObject* pseudoElementRenderer = fragment->firstLetterPseudoElement()->renderer();
-    ASSERT(pseudoElementRenderer);
-    ASSERT(pseudoElementRenderer->slowFirstChild());
-    RenderText* firstLetterRenderer = toRenderText(pseudoElementRenderer->slowFirstChild());
+    RenderText* firstLetterRenderer = firstRenderTextInFirstLetter(fragment->firstLetter());
 
     m_offset = firstLetterRenderer->caretMaxOffset();
     m_offset += collapsedSpaceLength(firstLetterRenderer, m_offset);
 
     return firstLetterRenderer;
 }
 
 bool SimplifiedBackwardsTextIterator::handleReplacedElement()
 {
     unsigned index = m_node->nodeIndex();
@@ skipping 879 matching lines @@
             resultEnd = collapseTo;
             return;
         }
     }
 
     CharacterIterator computeRangeIterator(inputStart, inputEnd, iteratorFlagsForFindPlainText);
     calculateCharacterSubrange(computeRangeIterator, matchStart, matchLength, resultStart, resultEnd);
 }
 
 }