Revert 158496 "Update the first letter when the first line is ch..."

trunk/Source/core/rendering/RenderBlock.cpp

Index: trunk/Source/core/rendering/RenderBlock.cpp
===================================================================
--- trunk/Source/core/rendering/RenderBlock.cpp	(revision 158773)
+++ trunk/Source/core/rendering/RenderBlock.cpp	(working copy)
@@ -28,7 +28,6 @@
 #include "core/accessibility/AXObjectCache.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
-#include "core/dom/Text.h"
 #include "core/events/OverflowEvent.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/Editor.h"
@@ -5814,6 +5813,8 @@
     if (style()->styleType() == FIRST_LETTER)
         return;
 
+    // FIXME: We need to destroy the first-letter object if it is no longer the first child. Need to find
+    // an efficient way to check for that situation though before implementing anything.
     RenderObject* firstLetterBlock = findFirstLetterBlock(this);
     if (!firstLetterBlock)
         return;
@@ -5844,24 +5845,9 @@
     if (!currChild)
         return;
 
+    // If the child already has style, then it has already been created, so we just want
+    // to update it.
     if (currChild->parent()->style()->styleType() == FIRST_LETTER) {
-        // Destroy the first-letter object if it is no longer the first child.
-        RenderObject* remainingText = currChild->parent()->nextSibling();
-        if (remainingText && currChild->node() != remainingText->node()) {
-            if (!remainingText->isText() || remainingText->isBR())
-                return;
-
-            LayoutStateDisabler layoutStateDisabler(view());
-
-            if (RenderObject* oldRemainingText = toRenderBoxModelObject(currChild->parent())->firstLetterRemainingText())

[joone, 2013/10/03 18:25:32]

What do you think about changing the code as follows?

RenderObject* oldRemainingText =
toRenderBoxModelObject(currChild->parent())->firstLetterRemainingText();
if (oldRemainingText && oldRemainingText->isText())

-                toRenderText(oldRemainingText)->setText(toText(oldRemainingText->node())->data().impl());
-
-            createFirstLetterRenderer(firstLetterBlock, remainingText);
-            return;
-        }
-
-        // If the child already has style, then it has already been created, so we just want
-        // to update it.
         updateFirstLetterStyle(firstLetterBlock, currChild);
         return;
     }