Removing more implicit LayoutUnit construction

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

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * 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
@@ skipping 136 matching lines @@
     if (node() && style()->autoWrap()) {
         // See if nowrap was set.
         Length w = styleOrColLogicalWidth();
         const AtomicString& nowrap = toElement(node())->getAttribute(nowrapAttr);
         if (!nowrap.isNull() && w.isFixed()) {
             // Nowrap is set, but we didn't actually use it because of the
             // fixed width set on the cell.  Even so, it is a WinIE/Moz trait
             // to make the minwidth of the cell into the fixed width.  They do this
             // even in strict mode, so do not make this a quirk.  Affected the top
             // of hiptop.com.
-            m_minPreferredLogicalWidth = std::max<LayoutUnit>(w.value(), m_minPreferredLogicalWidth);
+            m_minPreferredLogicalWidth = std::max(LayoutUnit(w.value()), m_minPreferredLogicalWidth);
         }
     }
 }
 
 void LayoutTableCell::addLayerHitTestRects(LayerHitTestRects& layerRects, const PaintLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const
 {
     LayoutPoint adjustedLayerOffset = layerOffset;
     // LayoutTableCell's location includes the offset of it's containing LayoutTableRow, so
     // we need to subtract that again here (as for LayoutTableCell::offsetFromContainer.
     if (parent())
         adjustedLayerOffset -= parentBox()->locationOffset();
     LayoutBox::addLayerHitTestRects(layerRects, currentLayer, adjustedLayerOffset, containerRect);
 }
 
 void LayoutTableCell::computeIntrinsicPadding(int rowHeight, SubtreeLayoutScope& layouter)
 {
     int oldIntrinsicPaddingBefore = intrinsicPaddingBefore();
     int oldIntrinsicPaddingAfter = intrinsicPaddingAfter();
     int logicalHeightWithoutIntrinsicPadding = pixelSnappedLogicalHeight() - oldIntrinsicPaddingBefore - oldIntrinsicPaddingAfter;
 
     int intrinsicPaddingBefore = 0;
     switch (style()->verticalAlign()) {
     case SUB:
     case SUPER:
     case TEXT_TOP:
     case TEXT_BOTTOM:
     case LENGTH:
     case BASELINE: {
-        LayoutUnit baseline = cellBaselinePosition();
+        int baseline = cellBaselinePosition();
         if (baseline > borderBefore() + paddingBefore())
             intrinsicPaddingBefore = section()->rowBaseline(rowIndex()) - (baseline - oldIntrinsicPaddingBefore);
         break;
     }
     case TOP:
         break;
     case MIDDLE:
         intrinsicPaddingBefore = (rowHeight - logicalHeightWithoutIntrinsicPadding) / 2;
         break;
     case BOTTOM:
@@ skipping 17 matching lines @@
 {
 }
 
 void LayoutTableCell::setCellLogicalWidth(int tableLayoutLogicalWidth, SubtreeLayoutScope& layouter)
 {
     if (tableLayoutLogicalWidth == logicalWidth())
         return;
 
     layouter.setNeedsLayout(this, LayoutInvalidationReason::SizeChanged);
 
-    setLogicalWidth(tableLayoutLogicalWidth);
+    setLogicalWidth(LayoutUnit(tableLayoutLogicalWidth));
     setCellWidthChanged(true);
 }
 
 void LayoutTableCell::layout()
 {
     ASSERT(needsLayout());
     LayoutAnalyzer::Scope analyzer(*this);
 
     int oldCellBaseline = cellBaselinePosition();
     layoutBlock(cellWidthChanged());
 
     // If we have replaced content, the intrinsic height of our content may have changed since the last time we laid out. If that's the case the intrinsic padding we used
     // for layout (the padding required to push the contents of the cell down to the row's baseline) is included in our new height and baseline and makes both
     // of them wrong. So if our content's intrinsic height has changed push the new content up into the intrinsic padding and relayout so that the rest of
     // table and row layout can use the correct baseline and height for this cell.
     if (isBaselineAligned() && section()->rowBaseline(rowIndex()) && cellBaselinePosition() > section()->rowBaseline(rowIndex())) {
-        int newIntrinsicPaddingBefore = (intrinsicPaddingBefore() - (cellBaselinePosition() - oldCellBaseline).clampNegativeToZero()).clampNegativeToZero();
+        int newIntrinsicPaddingBefore = std::max(intrinsicPaddingBefore() - std::max(cellBaselinePosition() - oldCellBaseline, 0), 0);
         setIntrinsicPaddingBefore(newIntrinsicPaddingBefore);
         SubtreeLayoutScope layouter(*this);
         layouter.setNeedsLayout(this, LayoutInvalidationReason::TableChanged);
         layoutBlock(cellWidthChanged());
     }
 
     // FIXME: This value isn't the intrinsic content logical height, but we need
     // to update the value as its used by flexbox layout. crbug.com/367324
     setIntrinsicContentLogicalHeight(contentLogicalHeight());
 
     setCellWidthChanged(false);
 }
 
 LayoutUnit LayoutTableCell::paddingTop() const
 {
-    int result = computedCSSPaddingTop();
-    if (!isHorizontalWritingMode())
-        return result;
-    return result + (style()->writingMode() == TopToBottomWritingMode ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
+    LayoutUnit result = computedCSSPaddingTop();
+    if (isHorizontalWritingMode())
+        result += (style()->writingMode() == TopToBottomWritingMode ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
+    // TODO(leviw): The floor call should be removed when Table is sub-pixel aware. crbug.com/377847
+    return LayoutUnit(result.floor());
 }
 
 LayoutUnit LayoutTableCell::paddingBottom() const
 {
-    int result = computedCSSPaddingBottom();
-    if (!isHorizontalWritingMode())
-        return result;
-    return result + (style()->writingMode() == TopToBottomWritingMode ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
+    LayoutUnit result = computedCSSPaddingBottom();
+    if (isHorizontalWritingMode())
+        result += (style()->writingMode() == TopToBottomWritingMode ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
+    // TODO(leviw): The floor call should be removed when Table is sub-pixel aware. crbug.com/377847
+    return LayoutUnit(result.floor());
 }
 
 LayoutUnit LayoutTableCell::paddingLeft() const
 {
-    int result = computedCSSPaddingLeft();
-    if (isHorizontalWritingMode())
-        return result;
-    return result + (style()->writingMode() == LeftToRightWritingMode ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
+    LayoutUnit result = computedCSSPaddingLeft();
+    if (!isHorizontalWritingMode())
+        result += (style()->writingMode() == LeftToRightWritingMode ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
+    // TODO(leviw): The floor call should be removed when Table is sub-pixel aware. crbug.com/377847
+    return LayoutUnit(result.floor());
 }
 
 LayoutUnit LayoutTableCell::paddingRight() const
 {
-    int result = computedCSSPaddingRight();
-    if (isHorizontalWritingMode())
-        return result;
-    return result + (style()->writingMode() == LeftToRightWritingMode ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
+    LayoutUnit result = computedCSSPaddingRight();
+    if (!isHorizontalWritingMode())
+        result += (style()->writingMode() == LeftToRightWritingMode ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
+    // TODO(leviw): The floor call should be removed when Table is sub-pixel aware. crbug.com/377847
+    return LayoutUnit(result.floor());
 }
 
 LayoutUnit LayoutTableCell::paddingBefore() const
 {
-    return static_cast<int>(computedCSSPaddingBefore()) + intrinsicPaddingBefore();
+    return LayoutUnit(computedCSSPaddingBefore().floor() + intrinsicPaddingBefore());
 }
 
 LayoutUnit LayoutTableCell::paddingAfter() const
 {
-    return static_cast<int>(computedCSSPaddingAfter()) + intrinsicPaddingAfter();
+    return LayoutUnit(computedCSSPaddingAfter().floor() + intrinsicPaddingAfter());
 }
 
 void LayoutTableCell::setOverrideLogicalContentHeightFromRowHeight(LayoutUnit rowHeight)
 {
     clearIntrinsicPadding();
     setOverrideLogicalContentHeight((rowHeight - borderAndPaddingLogicalHeight()).clampNegativeToZero());
 }
 
 LayoutSize LayoutTableCell::offsetFromContainer(const LayoutObject* o, const LayoutPoint& point, bool* offsetDependsOnPoint) const
 {
@@ skipping 38 matching lines @@
             left = std::max(left, above->borderHalfLeft(true));
             right = std::max(right, above->borderHalfRight(true));
         }
     }
     if (bottom) {
         if (LayoutTableCell* below = table()->cellBelow(this)) {
             left = std::max(left, below->borderHalfLeft(true));
             right = std::max(right, below->borderHalfRight(true));
         }
     }
-    LayoutPoint location(std::max<LayoutUnit>(left, -visualOverflowRect().x()), std::max<LayoutUnit>(top, -visualOverflowRect().y()));
+    LayoutPoint location(std::max(LayoutUnit(left), -visualOverflowRect().x()), std::max(LayoutUnit(top), -visualOverflowRect().y()));
     LayoutRect r(-location.x(), -location.y(), location.x() + std::max(size().width() + right, visualOverflowRect().maxX()), location.y() + std::max(size().height() + bottom, visualOverflowRect().maxY()));
 
     mapToVisibleRectInAncestorSpace(paintInvalidationContainer, r, paintInvalidationState);
     return r;
 }
 
 void LayoutTableCell::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& r, const PaintInvalidationState* paintInvalidationState) const
 {
     if (ancestor == this)
         return;
     r.setY(r.y());
     if ((!paintInvalidationState || !paintInvalidationState->canMapToContainer(ancestor)) && parent())
         r.moveBy(-parentBox()->location()); // Rows are in the same coordinate space, so don't add their offset in.
     LayoutBlockFlow::mapToVisibleRectInAncestorSpace(ancestor, r, paintInvalidationState);
 }
 
-LayoutUnit LayoutTableCell::cellBaselinePosition() const
+int LayoutTableCell::cellBaselinePosition() const
 {
     // <http://www.w3.org/TR/2007/CR-CSS21-20070719/tables.html#height-layout>: The baseline of a cell is the baseline of
     // the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first. If there
     // is no such line box or table-row, the baseline is the bottom of content edge of the cell box.
-    LayoutUnit firstLineBaseline = firstLineBoxBaseline();
+    int firstLineBaseline = firstLineBoxBaseline();
     if (firstLineBaseline != -1)
         return firstLineBaseline;
     return borderBefore() + paddingBefore() + contentLogicalHeight();
 }
 
 void LayoutTableCell::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     ASSERT(style()->display() == TABLE_CELL);
 
     LayoutBlockFlow::styleDidChange(diff, oldStyle);
@@ skipping 579 matching lines @@
     TableCellPainter(*this).paintMask(paintInfo, paintOffset);
 }
 
 bool LayoutTableCell::boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, const InlineFlowBox*) const
 {
     return false;
 }
 
 void LayoutTableCell::scrollbarsChanged(bool horizontalScrollbarChanged, bool verticalScrollbarChanged)
 {
-    LayoutUnit scrollbarHeight = scrollbarLogicalHeight();
+    int scrollbarHeight = scrollbarLogicalHeight();
     if (!scrollbarHeight)
         return; // Not sure if we should be doing something when a scrollbar goes away or not.
 
     // We only care if the scrollbar that affects our intrinsic padding has been added.
     if ((isHorizontalWritingMode() && !horizontalScrollbarChanged)
         || (!isHorizontalWritingMode() && !verticalScrollbarChanged))
         return;
 
     // Shrink our intrinsic padding as much as possible to accommodate the scrollbar.
     if (style()->verticalAlign() == MIDDLE) {
@@ skipping 27 matching lines @@
 bool LayoutTableCell::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const
 {
     // If this object has layer, the area of collapsed borders should be transparent
     // to expose the collapsed borders painted on the underlying layer.
     if (hasLayer() && table()->collapseBorders())
         return false;
     return LayoutBlockFlow::backgroundIsKnownToBeOpaqueInRect(localRect);
 }
 
 } // namespace blink