Remove canCollapseAnonymousBlockChild.

sky/engine/core/rendering/RenderBlockLineLayout.cpp

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 1191 matching lines @@
     if (isFullLayout) {
         // Ensure the old line boxes will be erased.
         if (firstLineBox())
             setShouldDoFullPaintInvalidation(true);
         lineBoxes()->deleteLineBoxes();
     }
 
     // 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(), why is that okay?

[ojan, 2014/11/20 19:25:53]

That was just to make the toRenderBlock(parent()) call safe.

FWIW, I think we want to delete this line of code entirely and stop looking at
the parent's style at all, but I want to test exactly what it does before
removing it.

[ojan, 2014/11/21 05:37:14]

See https://codereview.chromium.org/751483002#msg2. I think this new behavior is
correct assuming we decide to keep anonymous blocks at all.

 
     // Walk all the lines and delete our ellipsis line boxes if they exist.
     if (hasTextOverflow)
          deleteEllipsisLineBoxes();
 
     if (firstChild()) {
         // In full layout mode, clear the line boxes of children upfront. Otherwise,
         // siblings can run into stale root lineboxes during layout. Then layout
         // the replaced elements later. In partial layout mode, line boxes are not
         // deleted and only dirtied. In that case, we can layout the replaced
@@ skipping 358 matching lines @@
     float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat();
     float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), false) - logicalLeft;
     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWidth, availableLogicalWidth, 0);
 
     if (!style()->isLeftToRightDirection())
         return logicalWidth() - logicalLeft;
     return logicalLeft;
 }
 
 }