Use LayoutUnit for positioning ellipses

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 1391 matching lines @@
        child = child->prevOnLine())
     leaf = child->isLeaf() ? child : toInlineFlowBox(child)->lastLeafChild();
   return leaf;
 }
 
 SelectionState InlineFlowBox::getSelectionState() const {
   return SelectionNone;
 }
 
 bool InlineFlowBox::canAccommodateEllipsis(bool ltr,
-                                           int blockEdge,
-                                           int ellipsisWidth) const {
+                                           LayoutUnit blockEdge,
+                                           LayoutUnit ellipsisWidth) const {
   for (InlineBox* box = firstChild(); box; box = box->nextOnLine()) {
     if (!box->canAccommodateEllipsis(ltr, blockEdge, ellipsisWidth))
       return false;
   }
   return true;
 }
 
 LayoutUnit InlineFlowBox::placeEllipsisBox(bool ltr,
                                            LayoutUnit blockLeftEdge,
                                            LayoutUnit blockRightEdge,
                                            LayoutUnit ellipsisWidth,
                                            LayoutUnit& truncatedWidth,
                                            bool& foundBox) {
   LayoutUnit result(-1);
   // We iterate over all children, the foundBox variable tells us when we've
   // found the box containing the ellipsis.  All boxes after that one in the
   // flow are hidden.
   // If our flow is ltr then iterate over the boxes from left to right,
   // otherwise iterate from right to left. Varying the order allows us to
   // correctly hide the boxes following the ellipsis.
   InlineBox* box = ltr ? firstChild() : lastChild();
 
   // NOTE: these will cross after foundBox = true.
-  int visibleLeftEdge = blockLeftEdge.toInt();
-  int visibleRightEdge = blockRightEdge.toInt();
+  LayoutUnit visibleLeftEdge = blockLeftEdge;
+  LayoutUnit visibleRightEdge = blockRightEdge;
 
   while (box) {
-    int currResult =
-        box->placeEllipsisBox(ltr, LayoutUnit(visibleLeftEdge),
-                              LayoutUnit(visibleRightEdge), ellipsisWidth,
-                              truncatedWidth, foundBox)
-            .toInt();
+    LayoutUnit currResult = box->placeEllipsisBox(
+        ltr, LayoutUnit(visibleLeftEdge), LayoutUnit(visibleRightEdge),
+        ellipsisWidth, truncatedWidth, foundBox);
     if (currResult != -1 && result == -1)
-      result = LayoutUnit(currResult);
+      result = currResult;
 
     // List markers will sit outside the box so don't let them contribute
     // width.
-    int boxWidth = box->getLineLayoutItem().isListMarker()
-                       ? 0
-                       : box->logicalWidth().round();
+    LayoutUnit boxWidth = box->getLineLayoutItem().isListMarker()
+                              ? LayoutUnit()
+                              : box->logicalWidth();
     if (ltr) {
       visibleLeftEdge += boxWidth;
       box = box->nextOnLine();
     } else {
       visibleRightEdge -= boxWidth;
       box = box->prevOnLine();
     }
   }
   return result;
 }
@@ skipping 225 matching lines @@
     ASSERT(child->prevOnLine() == prev);
     prev = child;
   }
   ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 }  // namespace blink