Place ellipsis correctly inside inline-blocks

third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.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 2381 matching lines @@
                            styleRef(), ellipsisDirection));
     }
   }
 
   // For LTR text truncation, we want to get the right edge of our padding box,
   // and then we want to see if the right edge of a line box exceeds that.
   // For RTL, we use the left edge of the padding box and check the left edge of
   // the line box to see if it is less Include the scrollbar for overflow
   // blocks, which means we want to use "contentWidth()".
   bool ltr = style()->isLeftToRightDirection();
-  ETextAlign textAlign = style()->textAlign();
   IndentTextOrNot indentText = IndentText;
   for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
     LayoutUnit currLogicalLeft = curr->logicalLeft();
     LayoutUnit blockRightEdge =
         logicalRightOffsetForLine(curr->lineTop(), indentText);
     LayoutUnit blockLeftEdge =
         logicalLeftOffsetForLine(curr->lineTop(), indentText);
     LayoutUnit lineBoxEdge =
         ltr ? currLogicalLeft + curr->logicalWidth() : currLogicalLeft;
     if ((ltr && lineBoxEdge > blockRightEdge) ||
         (!ltr && lineBoxEdge < blockLeftEdge)) {
       // This line spills out of our box in the appropriate direction. Now we
       // need to see if the line can be truncated.  In order for truncation to
       // be possible, the line must have sufficient space to accommodate our
       // truncation string, and no replaced elements (images, tables) can
       // overlap the ellipsis space.
 
       LayoutUnit width(indentText == IndentText ? firstLineEllipsisWidth
                                                 : ellipsisWidth);
       LayoutUnit blockEdge = ltr ? blockRightEdge : blockLeftEdge;
       if (curr->lineCanAccommodateEllipsis(ltr, blockEdge, lineBoxEdge,
                                            width)) {
-        LayoutUnit totalLogicalWidth = curr->placeEllipsis(
-            selectedEllipsisStr, ltr, blockLeftEdge, blockRightEdge, width);
-        LayoutUnit logicalLeft;  // We are only interested in the delta from the
-                                 // base position.
-        LayoutUnit availableLogicalWidth = blockRightEdge - blockLeftEdge;
-        updateLogicalWidthForAlignment(textAlign, curr, 0, logicalLeft,
-                                       totalLogicalWidth, availableLogicalWidth,
-                                       0);
-        if (ltr)
-          curr->moveInInlineDirection(logicalLeft);
-        else
-          curr->moveInInlineDirection(
-              logicalLeft - (availableLogicalWidth - totalLogicalWidth));
+        placeEllipsis(curr, blockLeftEdge, blockRightEdge, selectedEllipsisStr,
+                      width, LayoutUnit(), false);
+      } else {
+        tryPlacingEllipsisOnAtomicInlines(curr, blockRightEdge, blockLeftEdge,
+                                          width, selectedEllipsisStr);
       }
     }
     indentText = DoNotIndentText;
   }
 }
 
+void LayoutBlockFlow::tryPlacingEllipsisOnAtomicInlines(
+    RootInlineBox* root,
+    LayoutUnit blockRightEdge,
+    LayoutUnit blockLeftEdge,
+    LayoutUnit ellipsisWidth,
+    const AtomicString& selectedEllipsisStr) {
+  bool ltr = style()->isLeftToRightDirection();
+  LayoutUnit logicalLeftOffset = blockLeftEdge;
+
+  bool foundBox = false;
+  for (InlineBox* box = ltr ? root->firstChild() : root->lastChild(); box;
+       box = ltr ? box->nextOnLine() : box->prevOnLine()) {
+    if (!box->getLineLayoutItem().isAtomicInlineLevel() ||
+        !box->getLineLayoutItem().isLayoutBlockFlow())
+      continue;
+
+    RootInlineBox* firstRootBox =
+        LineLayoutBlockFlow(box->getLineLayoutItem()).firstRootBox();
+    if (!firstRootBox)
+      continue;
+
+    bool placedEllipsis = false;
+    // Move the right edge of the block in so that we can test it against the
+    // width of the root line boxes.
+    for (RootInlineBox* curr = firstRootBox; curr; curr = curr->nextRootBox()) {

[eae, 2017/02/21 21:55:17]

It might be easier to move the ltr check outside of the loop?

if (ltr) {
  for (...)...
} else {
  for (...)...
}

Up to you!

+      LayoutUnit currLogicalLeft = logicalLeftOffset + curr->logicalLeft();
+      LayoutUnit ellipsisEdge =
+          ltr ? currLogicalLeft + curr->logicalWidth() + ellipsisWidth
+              : box->logicalLeft() + curr->logicalLeft() - ellipsisWidth;
+
+      if ((ltr && ellipsisEdge > blockRightEdge) ||
+          (!ltr && ellipsisEdge < blockLeftEdge)) {
+        placeEllipsis(
+            curr, blockLeftEdge, blockRightEdge, selectedEllipsisStr,
+            ellipsisWidth,
+            ltr ? logicalLeftOffset : LayoutUnit(box->logicalLeft().ceil()),
+            foundBox);
+        placedEllipsis = true;
+      }
+    }
+    foundBox |= placedEllipsis;
+    logicalLeftOffset += box->logicalWidth();
+  }
+}
+
+void LayoutBlockFlow::placeEllipsis(RootInlineBox* curr,
+                                    LayoutUnit blockLeftEdge,
+                                    LayoutUnit blockRightEdge,
+                                    const AtomicString& selectedEllipsisStr,
+                                    LayoutUnit ellipsisWidth,
+                                    LayoutUnit logicalLeftOffset,
+                                    bool foundBox) {
+  bool ltr = style()->isLeftToRightDirection();
+  ETextAlign textAlign = style()->textAlign();
+  LayoutUnit totalLogicalWidth = curr->placeEllipsis(
+      selectedEllipsisStr, ltr, blockLeftEdge, blockRightEdge, ellipsisWidth,
+      logicalLeftOffset, foundBox);
+  LayoutUnit logicalLeft;
+  LayoutUnit availableLogicalWidth = blockRightEdge - blockLeftEdge;
+  updateLogicalWidthForAlignment(textAlign, curr, 0, logicalLeft,
+                                 totalLogicalWidth, availableLogicalWidth, 0);
+  if (ltr) {
+    curr->moveInInlineDirection(logicalLeft);
+  } else {
+    curr->moveInInlineDirection(logicalLeft -
+                                (availableLogicalWidth - totalLogicalWidth));

[eae, 2017/02/21 21:55:17]

What happens if totalLogicalWidth is more than availableLogicalWidth or can that
never happen?

+  }
+}
+
 void LayoutBlockFlow::markLinesDirtyInBlockRange(LayoutUnit logicalTop,
                                                  LayoutUnit logicalBottom,
                                                  RootInlineBox* highest) {
   if (logicalTop >= logicalBottom)
     return;
 
   RootInlineBox* lowestDirtyLine = lastRootBox();
   RootInlineBox* afterLowest = lowestDirtyLine;
   while (lowestDirtyLine &&
          lowestDirtyLine->lineBottomWithLeading() >= logicalBottom &&
@@ skipping 58 matching lines @@
 
 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
   // LayoutBlockFlow is in charge of paint invalidation of the first line.
   if (firstLineBox())
     return false;
 
   return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize();
 }
 
 }  // namespace blink