sky/engine/core/rendering/RenderBlockLineLayout.cpp - Issue 741893002: Remove canCollapseAnonymousBlockChild.

Unified Diff: sky/engine/core/rendering/RenderBlockLineLayout.cpp

Issue 741893002: Remove canCollapseAnonymousBlockChild. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sky/engine/core/rendering/RenderBlockLineLayout.cpp

diff --git a/sky/engine/core/rendering/RenderBlockLineLayout.cpp b/sky/engine/core/rendering/RenderBlockLineLayout.cpp

index cda928cb477863ac38c3a6e411bc8d1e94f89f4b..b65f42e39da0c11462e985015942319bf8aa2b16 100644

--- a/sky/engine/core/rendering/RenderBlockLineLayout.cpp

+++ b/sky/engine/core/rendering/RenderBlockLineLayout.cpp

@@ -1209,14 +1209,12 @@ void RenderBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& pa

// Text truncation kicks in in two cases:

// 1) If your overflow isn't visible and your text-overflow-mode isn't clip.

// 2) If you're an anonymous block with a block parent that satisfies #1 that was created

- // to accomodate a block that has inline and block children. This excludes parents where

- // canCollapseAnonymousBlockChild is false, notabley flex items.

+ // to accomodate a block that has inline and block children.

// FIXME: CSS3 says that descendants that are clipped must also know how to truncate. This is insanely

// difficult to figure out in general (especially in the middle of doing layout), so we only handle the

// simple case of an anonymous block truncating when it's parent is clipped.

bool hasTextOverflow = (style()->textOverflow() && hasOverflowClip())

- || (isAnonymousBlock() && parent() && parent()->isRenderBlock() && toRenderBlock(parent())->canCollapseAnonymousBlockChild()

- && parent()->style()->textOverflow() && parent()->hasOverflowClip());

+ || (isAnonymousBlock() && parent() && parent()->style()->textOverflow() && parent()->hasOverflowClip());

esprehn 2014/11/20 19:06:54 You lost the check for parent()->isRenderBlock(),

ojan 2014/11/20 19:25:53 That was just to make the toRenderBlock(parent())

ojan 2014/11/21 05:37:14 See https://codereview.chromium.org/751483002#msg2

// Walk all the lines and delete our ellipsis line boxes if they exist.

if (hasTextOverflow)