Revert of Convert first letter into a pseudo element.

Source/core/rendering/RenderTextFragment.cpp

Index: Source/core/rendering/RenderTextFragment.cpp
diff --git a/Source/core/rendering/RenderTextFragment.cpp b/Source/core/rendering/RenderTextFragment.cpp
index b1157c9b8bf83e91643ed6e060c83595d4367557..20f518f411efb627f41165815671c59eefc80566 100644
--- a/Source/core/rendering/RenderTextFragment.cpp
+++ b/Source/core/rendering/RenderTextFragment.cpp
@@ -23,9 +23,6 @@
 #include "config.h"
 #include "core/rendering/RenderTextFragment.h"
 
-#include "core/dom/FirstLetterPseudoElement.h"
-#include "core/dom/PseudoElement.h"
-#include "core/dom/StyleChangeReason.h"
 #include "core/dom/Text.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderBlock.h"
@@ -36,8 +33,7 @@ RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOff
     : RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<StringImpl>(nullptr))
     , m_start(startOffset)
     , m_end(length)
-    , m_isRemainingTextRenderer(false)
-    , m_firstLetterPseudoElement(nullptr)
+    , m_firstLetter(nullptr)
 {
 }
 
@@ -45,71 +41,80 @@ RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str)
     : RenderText(node, str)
     , m_start(0)
     , m_end(str ? str->length() : 0)
-    , m_isRemainingTextRenderer(false)
     , m_contentString(str)
-    , m_firstLetterPseudoElement(nullptr)
+    , m_firstLetter(nullptr)
 {
 }
 
 RenderTextFragment::~RenderTextFragment()
 {
-    ASSERT(!m_firstLetterPseudoElement);
-}
-
-void RenderTextFragment::destroy()
-{
-    if (m_isRemainingTextRenderer && m_firstLetterPseudoElement)
-        m_firstLetterPseudoElement->setRemainingTextRenderer(nullptr);
-    m_firstLetterPseudoElement = nullptr;
-    RenderText::destroy();
 }
 
 void RenderTextFragment::trace(Visitor* visitor)
 {
-    visitor->trace(m_firstLetterPseudoElement);
+    visitor->trace(m_firstLetter);
     RenderText::trace(visitor);
 }
 
-PassRefPtr<StringImpl> RenderTextFragment::completeText() const
+RenderText* RenderTextFragment::firstRenderTextInFirstLetter() const
 {
-    Text* text = associatedTextNode();
-    return text ? text->dataImpl() : contentString();
+    for (RenderObject* current = m_firstLetter; current; current = current->nextInPreOrder(m_firstLetter)) {
+        if (current->isText())
+            return toRenderText(current);
+    }
+    return 0;
 }
 
 PassRefPtr<StringImpl> RenderTextFragment::originalText() const
 {
-    RefPtr<StringImpl> result = completeText();
+    Node* e = node();
+    RefPtr<StringImpl> result = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString());
     if (!result)
         return nullptr;
     return result->substring(start(), end());
 }
 
+void RenderTextFragment::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderText::styleDidChange(diff, oldStyle);
+
+    if (RenderBlock* block = blockForAccompanyingFirstLetter()) {
+        block->style()->removeCachedPseudoStyle(FIRST_LETTER);
+        block->updateFirstLetter();
+    }
+}
+
+void RenderTextFragment::willBeDestroyed()
+{
+    if (m_firstLetter)
+        m_firstLetter->destroy();
+    RenderText::willBeDestroyed();
+}
+
 void RenderTextFragment::setText(PassRefPtr<StringImpl> text, bool force)
 {
     RenderText::setText(text, force);
 
     m_start = 0;
     m_end = textLength();
-
-    // If we're the remaining text from a first letter then we have to tell the
-    // first letter pseudo element to reattach itself so it can re-calculate the
-    // correct first-letter settings.
-    if (RenderObject* previous = previousSibling()) {
-        if (!previous->isPseudoElement() || !previous->node()->isFirstLetterPseudoElement())
-            return;
-
-        // Tell the first letter container node, and the first-letter node
-        // that their style may have changed.
-        // e.g. fast/css/first-letter-detach.html
-        toFirstLetterPseudoElement(previous->node())->setNeedsUpdate();
+    if (m_firstLetter) {
+        // FIXME: We should not modify the structure of the render tree during
+        // layout. crbug.com/370458
+        DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
+
+        ASSERT(!m_contentString);
+        m_firstLetter->destroy();
+        m_firstLetter = nullptr;
+        if (Node* t = node()) {
+            ASSERT(!t->renderer());
+            t->setRenderer(this);
+        }
     }
 }
 
 void RenderTextFragment::transformText()
 {
-    // Note, we have to call RenderText::setText here because, if we use our
-    // version we will, potentially, screw up the first-letter settings where
-    // we only use portions of the string.
+    // Don't reset first-letter here because we are only transforming the truncated fragment.
     if (RefPtr<StringImpl> textToTransform = originalText())
         RenderText::setText(textToTransform.release(), true);
 }
@@ -117,7 +122,8 @@ void RenderTextFragment::transformText()
 UChar RenderTextFragment::previousCharacter() const
 {
     if (start()) {
-        StringImpl* original = completeText().get();
+        Node* e = node();
+        StringImpl* original = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString());
         if (original && start() <= original->length())
             return (*original)[start() - 1];
     }
@@ -125,22 +131,31 @@ UChar RenderTextFragment::previousCharacter() const
     return RenderText::previousCharacter();
 }
 
-// If this is the renderer for a first-letter pseudoNode then we have to look
-// at the node for the remaining text to find our content.
-Text* RenderTextFragment::associatedTextNode() const
+RenderBlock* RenderTextFragment::blockForAccompanyingFirstLetter() const
 {
-    Node* node = m_isRemainingTextRenderer ? this->node() : this->firstLetterPseudoElement();
-    if (!node)
-        return nullptr;
-
-    if (node->isFirstLetterPseudoElement()) {
-        FirstLetterPseudoElement* pseudo = toFirstLetterPseudoElement(node);
-        RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTextRenderer(*pseudo);
-        if (!nextRenderer)
-            return nullptr;
-        node = nextRenderer->node();
+    if (!m_firstLetter)
+        return 0;
+    for (RenderObject* block = m_firstLetter->parent(); block; block = block->parent()) {
+        if (block->style()->hasPseudoStyle(FIRST_LETTER) && block->canHaveChildren() && block->isRenderBlock())
+            return toRenderBlock(block);
     }
-    return (node && node->isTextNode()) ? toText(node) : nullptr;
+    return 0;
+}
+
+void RenderTextFragment::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
+{
+    if (result.innerNode())
+        return;
+
+    RenderObject::updateHitTestResult(result, point);
+    if (m_firstLetter || !node())
+        return;
+    RenderObject* nodeRenderer = node()->renderer();
+    if (!nodeRenderer || !nodeRenderer->isText() || !toRenderText(nodeRenderer)->isTextFragment())
+        return;
+
+    if (isDescendantOf(toRenderTextFragment(nodeRenderer)->m_firstLetter))
+        result.setIsFirstLetter(true);
 }
 
 } // namespace blink