Place ellipsis correctly in presence of list markers

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

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 1390 matching lines @@
 
   while (box) {
     int currResult =
         box->placeEllipsisBox(ltr, LayoutUnit(visibleLeftEdge),
                               LayoutUnit(visibleRightEdge), ellipsisWidth,
                               truncatedWidth, foundBox)
             .toInt();
     if (currResult != -1 && result == -1)
       result = LayoutUnit(currResult);
 
+    // List markers will sit outside the box so don't let them contribute
+    // width.
+    int boxWidth = box->getLineLayoutItem().isListMarker()
+                       ? 0
+                       : box->logicalWidth().round();
     if (ltr) {
-      visibleLeftEdge += box->logicalWidth().round();
+      visibleLeftEdge += boxWidth;
       box = box->nextOnLine();
     } else {
-      visibleRightEdge -= box->logicalWidth().round();
+      visibleRightEdge -= boxWidth;
       box = box->prevOnLine();
     }
   }
   return result;
 }
 
 void InlineFlowBox::clearTruncation() {
   for (InlineBox* box = firstChild(); box; box = box->nextOnLine())
     box->clearTruncation();
 }
@@ skipping 220 matching lines @@
     ASSERT(child->prevOnLine() == prev);
     prev = child;
   }
   ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 }  // namespace blink