Split more Paragraph-specific code from RenderBlock into RenderParagraph

sky/engine/core/rendering/RenderBlock.cpp

Index: sky/engine/core/rendering/RenderBlock.cpp
diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
index bb39f8fd14a1e85c7caf3cf3d4efb72d95672d46..2ea5de9946840932653a56445f4dffcc088c4036 100644
--- a/sky/engine/core/rendering/RenderBlock.cpp
+++ b/sky/engine/core/rendering/RenderBlock.cpp
@@ -83,7 +83,6 @@ RenderBlock::RenderBlock(ContainerNode* node)
     , m_hasMarginBeforeQuirk(false)
     , m_hasMarginAfterQuirk(false)
     , m_beingDestroyed(false)
-    , m_hasMarkupTruncation(false)
     , m_hasBorderOrPaddingLogicalWidthChanged(false)
 {
 }
@@ -885,7 +884,7 @@ GapRects RenderBlock::selectionGaps(RenderBlock* rootBlock, const LayoutPoint& r
     }
 
     if (isRenderParagraph())
-        result = toRenderBlockFlow(this)->inlineSelectionGaps(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, lastLogicalTop, lastLogicalLeft, lastLogicalRight, paintInfo);
+        result = toRenderParagraph(this)->inlineSelectionGaps(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, lastLogicalTop, lastLogicalLeft, lastLogicalRight, paintInfo);
     else
         result = blockSelectionGaps(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, lastLogicalTop, lastLogicalLeft, lastLogicalRight, paintInfo);
 
@@ -1717,19 +1716,11 @@ LayoutUnit RenderBlock::minLineHeightForReplacedRenderer(bool isFirstLine, Layou
 
 int RenderBlock::firstLineBoxBaseline() const
 {
-    if (isRenderParagraph()) {
-        if (firstLineBox())
-            return firstLineBox()->logicalTop() + style(true)->fontMetrics().ascent(firstRootBox()->baselineType());
-        else
-            return -1;
-    }
-    else {
-        for (RenderBox* curr = firstChildBox(); curr; curr = curr->nextSiblingBox()) {
-            if (!curr->isFloatingOrOutOfFlowPositioned()) {
-                int result = curr->firstLineBoxBaseline();
-                if (result != -1)
-                    return curr->logicalTop() + result; // Translate to our coordinate space.
-            }
+    for (RenderBox* curr = firstChildBox(); curr; curr = curr->nextSiblingBox()) {
+        if (!curr->isFloatingOrOutOfFlowPositioned()) {
+            int result = curr->firstLineBoxBaseline();
+            if (result != -1)
+                return curr->logicalTop() + result; // Translate to our coordinate space.
         }
     }
 
@@ -1748,33 +1739,21 @@ int RenderBlock::inlineBlockBaseline(LineDirectionMode direction) const
 
 int RenderBlock::lastLineBoxBaseline(LineDirectionMode lineDirection) const
 {
-    if (isRenderParagraph()) {
-        if (!firstLineBox() && hasLineIfEmpty()) {
-            const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics();
-            return fontMetrics.ascent()
-                 + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
-                 + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
-        }
-        if (lastLineBox())
-            return lastLineBox()->logicalTop() + style(lastLineBox() == firstLineBox())->fontMetrics().ascent(lastRootBox()->baselineType());
-        return -1;
-    } else {
-        bool haveNormalFlowChild = false;
-        for (RenderBox* curr = lastChildBox(); curr; curr = curr->previousSiblingBox()) {
-            if (!curr->isFloatingOrOutOfFlowPositioned()) {
-                haveNormalFlowChild = true;
-                int result = curr->inlineBlockBaseline(lineDirection);
-                if (result != -1)
-                    return curr->logicalTop() + result; // Translate to our coordinate space.
-            }
-        }
-        if (!haveNormalFlowChild && hasLineIfEmpty()) {
-            const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics();
-            return fontMetrics.ascent()
-                 + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
-                 + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
+    bool haveNormalFlowChild = false;
+    for (RenderBox* curr = lastChildBox(); curr; curr = curr->previousSiblingBox()) {
+        if (!curr->isFloatingOrOutOfFlowPositioned()) {
+            haveNormalFlowChild = true;
+            int result = curr->inlineBlockBaseline(lineDirection);
+            if (result != -1)
+                return curr->logicalTop() + result; // Translate to our coordinate space.
         }
     }
+    if (!haveNormalFlowChild && hasLineIfEmpty()) {
+        const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics();
+        return fontMetrics.ascent()
+             + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
+             + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
+    }
 
     return -1;
 }
@@ -1815,25 +1794,18 @@ static bool shouldCheckLines(RenderObject* obj)
 
 static int getHeightForLineCount(RenderBlock* block, int l, bool includeBottom, int& count)
 {
-    if (block->isRenderParagraph()) {
-        for (RootInlineBox* box = toRenderBlockFlow(block)->firstRootBox(); box; box = box->nextRootBox()) {
-            if (++count == l)
-                return box->lineBottom() + (includeBottom ? (block->borderBottom() + block->paddingBottom()) : LayoutUnit());
-        }
-    } else {
-        RenderBox* normalFlowChildWithoutLines = 0;
-        for (RenderBox* obj = block->firstChildBox(); obj; obj = obj->nextSiblingBox()) {
-            if (shouldCheckLines(obj)) {
-                int result = getHeightForLineCount(toRenderBlock(obj), l, false, count);
-                if (result != -1)
-                    return result + obj->y() + (includeBottom ? (block->borderBottom() + block->paddingBottom()) : LayoutUnit());
-            } else if (!obj->isFloatingOrOutOfFlowPositioned()) {
-                normalFlowChildWithoutLines = obj;
-            }
+    RenderBox* normalFlowChildWithoutLines = 0;
+    for (RenderBox* obj = block->firstChildBox(); obj; obj = obj->nextSiblingBox()) {
+        if (shouldCheckLines(obj)) {
+            int result = getHeightForLineCount(toRenderBlock(obj), l, false, count);
+            if (result != -1)
+                return result + obj->y() + (includeBottom ? (block->borderBottom() + block->paddingBottom()) : LayoutUnit());
+        } else if (!obj->isFloatingOrOutOfFlowPositioned()) {
+            normalFlowChildWithoutLines = obj;
         }
-        if (normalFlowChildWithoutLines && l == 0)
-            return normalFlowChildWithoutLines->y() + normalFlowChildWithoutLines->height();
     }
+    if (normalFlowChildWithoutLines && l == 0)
+        return normalFlowChildWithoutLines->y() + normalFlowChildWithoutLines->height();
 
     return -1;
 }
@@ -1842,17 +1814,11 @@ RootInlineBox* RenderBlock::lineAtIndex(int i) const
 {
     ASSERT(i >= 0);
 
-    if (isRenderParagraph()) {
-        for (RootInlineBox* box = firstRootBox(); box; box = box->nextRootBox())
-            if (!i--)
-                return box;
-    } else {
-        for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
-            if (!shouldCheckLines(child))
-                continue;
-            if (RootInlineBox* box = toRenderBlock(child)->lineAtIndex(i))
-                return box;
-        }
+    for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+        if (!shouldCheckLines(child))
+            continue;
+        if (RootInlineBox* box = toRenderBlock(child)->lineAtIndex(i))
+            return box;
     }
 
     return 0;
@@ -1861,27 +1827,18 @@ RootInlineBox* RenderBlock::lineAtIndex(int i) const
 int RenderBlock::lineCount(const RootInlineBox* stopRootInlineBox, bool* found) const
 {
     int count = 0;
-    if (isRenderParagraph()) {
-        for (RootInlineBox* box = firstRootBox(); box; box = box->nextRootBox()) {
-            count++;
-            if (box == stopRootInlineBox) {
+    for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling()) {
+        if (shouldCheckLines(obj)) {
+            bool recursiveFound = false;
+            count += toRenderBlock(obj)->lineCount(stopRootInlineBox, &recursiveFound);
+            if (recursiveFound) {
                 if (found)
                     *found = true;
                 break;
             }
         }
-    } else {
-        for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling())
-            if (shouldCheckLines(obj)) {
-                bool recursiveFound = false;
-                count += toRenderBlock(obj)->lineCount(stopRootInlineBox, &recursiveFound);
-                if (recursiveFound) {
-                    if (found)
-                        *found = true;
-                    break;
-                }
-            }
     }
+
     return count;
 }
 
@@ -1893,15 +1850,9 @@ int RenderBlock::heightForLineCount(int l)
 
 void RenderBlock::clearTruncation()

[ojan, 2014/11/28 04:02:23]

FWIW, I think you can delete this function too? Or maybe this is used for
text-overflow:ellipsis? FWIW, there is an ellipsis test checked in, but you need
to run it manually because we don't have pixel tests yet.

 {
-    if (isRenderParagraph() && hasMarkupTruncation()) {
-        setHasMarkupTruncation(false);
-        for (RootInlineBox* box = firstRootBox(); box; box = box->nextRootBox())
-            box->clearTruncation();
-    } else {
-        for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling()) {
-            if (shouldCheckLines(obj))
-                toRenderBlock(obj)->clearTruncation();
-        }
+    for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling()) {
+        if (shouldCheckLines(obj))
+            toRenderBlock(obj)->clearTruncation();
     }
 }