Changeset 157674 in webkit for trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

Timestamp:

Oct 19, 2013, 12:55:40 PM (12 years ago)

Author:

[email protected]

Message:

Move m_lineBoxes from RenderBlock to RenderBlockFlow (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=122969

Reviewed by Antti Koivisto.

• Move truncation (e.g. line clamp and ellipse) support to RenderBlockFlow.

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::EllipsisBox):
(WebCore::EllipsisBox::paint):
(WebCore::EllipsisBox::markupBox):
(WebCore::EllipsisBox::selectionRect):
(WebCore::EllipsisBox::paintSelection):
(WebCore::EllipsisBox::nodeAtPoint):

• rendering/EllipsisBox.h:
• rendering/RenderBlock.cpp:
• rendering/RenderBlock.h:
• rendering/RenderBlockFlow.cpp:

(WebCore::shouldCheckLines):
(WebCore::RenderBlockFlow::lineAtIndex):
(WebCore::RenderBlockFlow::lineCount):
(WebCore::getHeightForLineCount):
(WebCore::RenderBlockFlow::heightForLineCount):
(WebCore::RenderBlockFlow::clearTruncation):

• rendering/RenderBlockFlow.h:
• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
(WebCore::RenderDeprecatedFlexibleBox::clearLineClamp):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::placeEllipsis):

File:

• trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (4 diffs)

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -955 +955 @@
         child->clearOverrideSize();
         if (relayoutChildren || (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent()))
-            || (child->style()->height().isAuto() && child->isRenderBlock())) {
+            || (child->style()->height().isAuto() && child->isRenderBlockFlow())) {
             child->setChildNeedsLayout(MarkOnlyThis);
 
             // Dirty all the positioned objects.
-            if (child->isRenderBlock()) {
-                toRenderBlock(child)->markPositionedObjectsForLayout();
-                toRenderBlock(child)->clearTruncation();
+            if (child->isRenderBlockFlow()) {
+                toRenderBlockFlow(child)->markPositionedObjectsForLayout();
+                toRenderBlockFlow(child)->clearTruncation();
             }
         }
         child->layoutIfNeeded();
-        if (child->style()->height().isAuto() && child->isRenderBlock())
-            maxLineCount = max(maxLineCount, toRenderBlock(child)->lineCount());
+        if (child->style()->height().isAuto() && child->isRenderBlockFlow())
+            maxLineCount = max(maxLineCount, toRenderBlockFlow(child)->lineCount());
     }
 
@@ -977 +977 @@
 
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
-        if (childDoesNotAffectWidthOrFlexing(child) || !child->style()->height().isAuto() || !child->isRenderBlock())
+        if (childDoesNotAffectWidthOrFlexing(child) || !child->style()->height().isAuto() || !child->isRenderBlockFlow())
             continue;
 
-        RenderBlock* blockChild = toRenderBlock(child);
+        RenderBlockFlow* blockChild = toRenderBlockFlow(child);
         int lineCount = blockChild->lineCount();
         if (lineCount <= numVisibleLines)
@@ -1023 +1023 @@
 
         // See if this width can be accommodated on the last visible line
-        RenderBlock& destBlock = toRenderBlock(lastVisibleLine->renderer());
-        RenderBlock& srcBlock = toRenderBlock(lastLine->renderer());
+        RenderBlockFlow& destBlock = lastVisibleLine->blockFlow();
+        RenderBlockFlow& srcBlock = lastLine->blockFlow();
 
         // FIXME: Directions of src/destBlock could be different from our direction and from one another.
@@ -1058 +1058 @@
             child->setChildNeedsLayout();
 
-            if (child->isRenderBlock()) {
-                toRenderBlock(child)->markPositionedObjectsForLayout();
-                toRenderBlock(child)->clearTruncation();
+            if (child->isRenderBlockFlow()) {
+                toRenderBlockFlow(child)->markPositionedObjectsForLayout();
+                toRenderBlockFlow(child)->clearTruncation();
             }
         }