Removing more implicit LayoutUnit construction

third_party/WebKit/Source/core/layout/TableLayoutAlgorithmFixed.cpp

 /*
  * Copyright (C) 2002 Lars Knoll (knoll@kde.org)
  *           (C) 2002 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
  *
  * 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.
  *
@@ skipping 159 matching lines @@
         // in case we later call setPreferredLogicalWidthsDirty() on it later.
         if (cell->preferredLogicalWidthsDirty())
             cell->clearPreferredLogicalWidthsDirty();
     }
 
     return usedWidth;
 }
 
 void TableLayoutAlgorithmFixed::computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth)
 {
-    minWidth = maxWidth = calcWidthArray();
+    minWidth = maxWidth = LayoutUnit(calcWidthArray());
 }
 
 void TableLayoutAlgorithmFixed::applyPreferredLogicalWidthQuirks(LayoutUnit& minWidth, LayoutUnit& maxWidth) const
 {
     Length tableLogicalWidth = m_table->style()->logicalWidth();
-    if (tableLogicalWidth.isFixed() && tableLogicalWidth.isPositive())
-        minWidth = maxWidth = max<int>(minWidth, tableLogicalWidth.value() - m_table->bordersPaddingAndSpacingInRowDirection());
+    if (tableLogicalWidth.isFixed() && tableLogicalWidth.isPositive()) {
+        minWidth = maxWidth = LayoutUnit(max(minWidth, LayoutUnit(tableLogicalWidth.value() - m_table->bordersPaddingAndSpacingInRowDirection())).floor());
+    }
 
     /*
         <table style="width:100%; background-color:red"><tr><td>
             <table style="background-color:blue"><tr><td>
                 <table style="width:100%; background-color:green; table-layout:fixed"><tr><td>
                     Content
                 </td></tr></table>
             </td></tr></table>
         </td></tr></table>
     */
     // In this example, the two inner tables should be as large as the outer table.
     // We can achieve this effect by making the maxwidth of fixed tables with percentage
     // widths be infinite.
     if (m_table->style()->logicalWidth().hasPercent() && maxWidth < tableMaxWidth)
-        maxWidth = tableMaxWidth;
+        maxWidth = LayoutUnit(tableMaxWidth);
 }
 
 void TableLayoutAlgorithmFixed::layout()
 {
     int tableLogicalWidth = m_table->logicalWidth() - m_table->bordersPaddingAndSpacingInRowDirection();
     unsigned nEffCols = m_table->numEffCols();
 
     // FIXME: It is possible to be called without having properly updated our internal representation.
     // This means that our preferred logical widths were not recomputed as expected.
     if (nEffCols != m_width.size()) {
@@ skipping 13 matching lines @@
     // Compute requirements and try to satisfy fixed and percent widths.
     // Percentages are of the table's width, so for example
     // for a table width of 100px with columns (40px, 10%), the 10% compute
     // to 10px here, and will scale up to 20px in the final (80px, 20px).
     for (unsigned i = 0; i < nEffCols; i++) {
         if (m_width[i].isFixed()) {
             calcWidth[i] = m_width[i].value();
             totalFixedWidth += calcWidth[i];
         } else if (m_width[i].hasPercent()) {
             // TODO(alancutter): Make this work correctly for calc lengths.
-            calcWidth[i] = valueForLength(m_width[i], tableLogicalWidth);
+            calcWidth[i] = valueForLength(m_width[i], LayoutUnit(tableLogicalWidth));
             totalPercentWidth += calcWidth[i];
             totalPercent += m_width[i].percent();
         } else if (m_width[i].isAuto()) {
             numAuto++;
             autoSpan += m_table->spanOfEffCol(i);
         }
     }
 
     int hspacing = m_table->hBorderSpacing();
     int totalWidth = totalFixedWidth + totalPercentWidth;
@@ skipping 83 matching lines @@
             LayoutTableRow* row = section->rowLayoutObjectAt(i);
             if (!row)
                 continue;
             for (LayoutTableCell* cell = row->firstCell(); cell; cell = cell->nextCell())
                 cell->setPreferredLogicalWidthsDirty();
         }
     }
 }
 
 } // namespace blink