Display ellipsis correctly in inline blocks adjacent to floats

third_party/WebKit/Source/core/layout/line/InlineTextBox.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple 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 365 matching lines @@
   // Criteria for full truncation:
   // LTR: the left edge of the ellipsis is to the left of our text run.
   // RTL: the right edge of the ellipsis is to the right of our text run.
   LayoutUnit adjusted_logical_left = logical_left_offset + LogicalLeft();
 
   // For LTR this is the left edge of the box, for RTL, the right edge in parent
   // coordinates.
   LayoutUnit ellipsis_x = flow_is_ltr ? visible_right_edge - ellipsis_width
                                       : visible_left_edge + ellipsis_width;
 
-  if (IsLeftToRightDirection() == flow_is_ltr && !flow_is_ltr &&
-      logical_left_offset < 0)
-    ellipsis_x -= logical_left_offset;
-
   bool ltr_full_truncation = flow_is_ltr && ellipsis_x <= adjusted_logical_left;
   bool rtl_full_truncation =
-      !flow_is_ltr &&
-      ellipsis_x > adjusted_logical_left + LogicalWidth() + ellipsis_width;
+      !flow_is_ltr && ellipsis_x > adjusted_logical_left + LogicalWidth();
   if (ltr_full_truncation || rtl_full_truncation) {
     // Too far.  Just set full truncation, but return -1 and let the ellipsis
     // just be placed at the edge of the box.
     SetTruncation(kCFullTruncation);
     found_box = true;
     return LayoutUnit(-1);
   }
 
   bool ltr_ellipsis_within_box =
       flow_is_ltr && ellipsis_x < adjusted_logical_left + LogicalWidth();
   bool rtl_ellipsis_within_box =
       !flow_is_ltr && ellipsis_x > adjusted_logical_left;
   if (ltr_ellipsis_within_box || rtl_ellipsis_within_box) {
     found_box = true;
 
     // The inline box may have different directionality than it's parent. Since
     // truncation behavior depends both on both the parent and the inline
     // block's directionality, we must keep track of these separately.
     bool ltr = IsLeftToRightDirection();
     if (ltr != flow_is_ltr) {
       // Width in pixels of the visible portion of the box, excluding the
       // ellipsis.
       LayoutUnit visible_box_width =
           visible_right_edge - visible_left_edge - ellipsis_width;
       ellipsis_x = flow_is_ltr ? adjusted_logical_left + visible_box_width
                                : LogicalRight() - visible_box_width;
     }
 
+    // OffsetForPosition() expects the position relative to the root box.
+    if (ltr == flow_is_ltr && !flow_is_ltr && logical_left_offset < 0)
+      ellipsis_x -= logical_left_offset;
+
     // We measure the text using the second half of the previous character and
     // the first half of the current one when the text is rtl. This gives a
     // more accurate position in rtl text.
+    // TODO(crbug.com/722043: This doesn't always give the best results.
     int offset = OffsetForPosition(ellipsis_x, !ltr);
     // Full truncation is only necessary when we're flowing left-to-right.
     if (flow_is_ltr && offset == 0 && ltr == flow_is_ltr) {
       // No characters should be laid out.  Set ourselves to full truncation and
       // place the ellipsis at the min of our start and the ellipsis edge.
       SetTruncation(kCFullTruncation);
       truncated_width += ellipsis_width;
       return std::min(ellipsis_x, LogicalLeft());
     }
 
@@ skipping 325 matching lines @@
   for (; printed_characters < kLayoutObjectCharacterOffset;
        printed_characters++)
     fputc(' ', stderr);
   fprintf(stderr, "(%d,%d) \"%s\"\n", Start(), Start() + Len(),
           value.Utf8().data());
 }
 
 #endif
 
 }  // namespace blink