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 20f518f411efb627f41165815671c59eefc80566..cd323a2aed4ef2e9762daf14af01db41a10cb298 100644
--- a/Source/core/rendering/RenderTextFragment.cpp
+++ b/Source/core/rendering/RenderTextFragment.cpp
@@ -23,6 +23,9 @@
 #include "config.h"
 #include "core/rendering/RenderTextFragment.h"
 
+#include "core/dom/FirstLetterHelper.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"
@@ -33,7 +36,6 @@ 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_firstLetter(nullptr)
 {
 }
 
@@ -42,7 +44,6 @@ RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str)
     , m_start(0)
     , m_end(str ? str->length() : 0)
     , m_contentString(str)
-    , m_firstLetter(nullptr)
 {
 }
 
@@ -50,71 +51,47 @@ RenderTextFragment::~RenderTextFragment()
 {
 }
 
-void RenderTextFragment::trace(Visitor* visitor)
+PassRefPtr<StringImpl> RenderTextFragment::completeText() const
 {
-    visitor->trace(m_firstLetter);
-    RenderText::trace(visitor);
-}
-
-RenderText* RenderTextFragment::firstRenderTextInFirstLetter() const
-{
-    for (RenderObject* current = m_firstLetter; current; current = current->nextInPreOrder(m_firstLetter)) {
-        if (current->isText())
-            return toRenderText(current);
-    }
-    return 0;
+    Text* text = associatedTextNode();
+    return text ? text->dataImpl() : contentString();
 }
 
 PassRefPtr<StringImpl> RenderTextFragment::originalText() const
 {
-    Node* e = node();
-    RefPtr<StringImpl> result = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString());
+    RefPtr<StringImpl> result = completeText();
     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 (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);
-        }
+
+    // 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
+        previous->node()->setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::PseudoClass));
+        previous->node()->parentElement()->setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::PseudoClass));
+
+        // FIXME:: Will this get cleaned up properly? OR am I leaking here?
+        previous->node()->detach();

[Julien - ping for review, 2014/10/01 21:14:47]

It's interesting that detach doesn't trigger the
dont-modify-the-tree-during-layout-assert as we still call it during layout
(unless I missed the part of the patch that fixes this). It does modify the tree
by removing some child and have some side effects that we don't want during
layout.

[dsinclair, 2014/10/04 02:01:34]

Done. This should be cleaned up when we do the recalc style as triggered above.

     }
 }
 
 void RenderTextFragment::transformText()
 {
-    // Don't reset first-letter here because we are only transforming the truncated fragment.
     if (RefPtr<StringImpl> textToTransform = originalText())
         RenderText::setText(textToTransform.release(), true);
 }
@@ -122,8 +99,7 @@ void RenderTextFragment::transformText()
 UChar RenderTextFragment::previousCharacter() const
 {
     if (start()) {
-        Node* e = node();
-        StringImpl* original = ((e && e->isTextNode()) ? toText(e)->dataImpl() : contentString());
+        StringImpl* original = completeText().get();
         if (original && start() <= original->length())
             return (*original)[start() - 1];
     }
@@ -131,31 +107,35 @@ UChar RenderTextFragment::previousCharacter() const
     return RenderText::previousCharacter();
 }
 
-RenderBlock* RenderTextFragment::blockForAccompanyingFirstLetter() const
-{
-    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 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())
+    if (!node())
         return;
 
-    if (isDescendantOf(toRenderTextFragment(nodeRenderer)->m_firstLetter))
-        result.setIsFirstLetter(true);
+    // FIXME(dsinclair): First letter?
+}
+
+// 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
+{
+    Node* node = this->node();
+    if (!node)
+        return nullptr;
+
+    if (node->isFirstLetterPseudoElement()) {
+        PseudoElement* pseudo = toPseudoElement(node);
+        RenderObject* nextRenderer = FirstLetterHelper::firstLetterTextRenderer(*pseudo);
+        if (!nextRenderer)
+            return nullptr;
+        node = nextRenderer->node();
+    }
+    return (node && node->isTextNode()) ? toText(node) : nullptr;
 }
 
+
 } // namespace blink