Place ellipsis correctly in presence of list markers

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

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 290 matching lines @@
 }
 
 SelectionState InlineBox::getSelectionState() const {
   return getLineLayoutItem().getSelectionState();
 }
 
 bool InlineBox::canAccommodateEllipsis(bool ltr,
                                        int blockEdge,
                                        int ellipsisWidth) const {
   // Non-atomic inline-level elements can always accommodate an ellipsis.
-  if (!getLineLayoutItem().isAtomicInlineLevel())
+  // Skip list markers and try the next box.
+  if (!getLineLayoutItem().isAtomicInlineLevel() ||
+      getLineLayoutItem().isListMarker())
     return true;
 
   IntRect boxRect(x().toInt(), 0, m_logicalWidth.toInt(), 10);
   IntRect ellipsisRect(ltr ? blockEdge - ellipsisWidth : blockEdge, 0,
                        ellipsisWidth, 10);
   return !(boxRect.intersects(ellipsisRect));
 }
 
 LayoutUnit InlineBox::placeEllipsisBox(bool,
                                        LayoutUnit,
@@ skipping 76 matching lines @@
 }
 
 void showLineTree(const blink::InlineBox* b) {
   if (b)
     b->showLineTreeForThis();
   else
     fprintf(stderr, "Cannot showLineTree for (nil) InlineBox.\n");
 }
 
 #endif