Removing more implicit LayoutUnit construction

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

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 78 matching lines @@
         layoutHorizontalPart();
     else
         layoutVerticalPart();
 
     clearNeedsLayout();
 }
 
 void LayoutScrollbarPart::layoutHorizontalPart()
 {
     if (m_part == ScrollbarBGPart) {
-        setWidth(m_scrollbar->width());
+        setWidth(LayoutUnit(m_scrollbar->width()));
         computeScrollbarHeight();
     } else {
         computeScrollbarWidth();
-        setHeight(m_scrollbar->height());
+        setHeight(LayoutUnit(m_scrollbar->height()));
     }
 }
 
 void LayoutScrollbarPart::layoutVerticalPart()
 {
     if (m_part == ScrollbarBGPart) {
         computeScrollbarWidth();
-        setHeight(m_scrollbar->height());
+        setHeight(LayoutUnit(m_scrollbar->height()));
     } else {
-        setWidth(m_scrollbar->width());
+        setWidth(LayoutUnit(m_scrollbar->width()));
         computeScrollbarHeight();
     }
 }
 
 static int calcScrollbarThicknessUsing(SizeType sizeType, const Length& length, int containingLength)
 {
     if (!length.isIntrinsicOrAuto() || (sizeType == MinSize && length.isAuto()))
-        return minimumValueForLength(length, containingLength);
+        return minimumValueForLength(length, LayoutUnit(containingLength));
     return ScrollbarTheme::theme().scrollbarThickness();
 }
 
 void LayoutScrollbarPart::computeScrollbarWidth()
 {
     if (!m_scrollbar->owningLayoutObject())
         return;
     // FIXME: We are querying layout information but nothing guarantees that it's up-to-date, especially since we are called at style change.
     // FIXME: Querying the style's border information doesn't work on table cells with collapsing borders.
     int visibleSize = m_scrollbar->owningLayoutObject()->size().width() - m_scrollbar->owningLayoutObject()->style()->borderLeftWidth() - m_scrollbar->owningLayoutObject()->style()->borderRightWidth();
     int w = calcScrollbarThicknessUsing(MainOrPreferredSize, style()->width(), visibleSize);
     int minWidth = calcScrollbarThicknessUsing(MinSize, style()->minWidth(), visibleSize);
     int maxWidth = style()->maxWidth().isMaxSizeNone() ? w : calcScrollbarThicknessUsing(MaxSize, style()->maxWidth(), visibleSize);
-    setWidth(std::max(minWidth, std::min(maxWidth, w)));
+    setWidth(LayoutUnit(std::max(minWidth, std::min(maxWidth, w))));
 
     // Buttons and track pieces can all have margins along the axis of the scrollbar.
-    setMarginLeft(minimumValueForLength(style()->marginLeft(), visibleSize));
-    setMarginRight(minimumValueForLength(style()->marginRight(), visibleSize));
+    setMarginLeft(minimumValueForLength(style()->marginLeft(), LayoutUnit(visibleSize)));
+    setMarginRight(minimumValueForLength(style()->marginRight(), LayoutUnit(visibleSize)));
 }
 
 void LayoutScrollbarPart::computeScrollbarHeight()
 {
     if (!m_scrollbar->owningLayoutObject())
         return;
     // FIXME: We are querying layout information but nothing guarantees that it's up-to-date, especially since we are called at style change.
     // FIXME: Querying the style's border information doesn't work on table cells with collapsing borders.
     int visibleSize = m_scrollbar->owningLayoutObject()->size().height() -  m_scrollbar->owningLayoutObject()->style()->borderTopWidth() - m_scrollbar->owningLayoutObject()->style()->borderBottomWidth();
     int h = calcScrollbarThicknessUsing(MainOrPreferredSize, style()->height(), visibleSize);
     int minHeight = calcScrollbarThicknessUsing(MinSize, style()->minHeight(), visibleSize);
     int maxHeight = style()->maxHeight().isMaxSizeNone() ? h : calcScrollbarThicknessUsing(MaxSize, style()->maxHeight(), visibleSize);
-    setHeight(std::max(minHeight, std::min(maxHeight, h)));
+    setHeight(LayoutUnit(std::max(minHeight, std::min(maxHeight, h))));
 
     // Buttons and track pieces can all have margins along the axis of the scrollbar.
-    setMarginTop(minimumValueForLength(style()->marginTop(), visibleSize));
-    setMarginBottom(minimumValueForLength(style()->marginBottom(), visibleSize));
+    setMarginTop(minimumValueForLength(style()->marginTop(), LayoutUnit(visibleSize)));
+    setMarginBottom(minimumValueForLength(style()->marginBottom(), LayoutUnit(visibleSize)));
 }
 
 void LayoutScrollbarPart::computePreferredLogicalWidths()
 {
     if (!preferredLogicalWidthsDirty())
         return;
 
-    m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0;
+    m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = LayoutUnit();
 
     clearPreferredLogicalWidthsDirty();
 }
 
 void LayoutScrollbarPart::styleWillChange(StyleDifference diff, const ComputedStyle& newStyle)
 {
     LayoutBlock::styleWillChange(diff, newStyle);
     setInline(false);
 }
 
@@ skipping 33 matching lines @@
             frameView->setScrollCornerNeedsPaintInvalidation();
             return;
         }
     }
 
     // This LayoutScrollbarPart belongs to a PaintLayerScrollableArea.
     toLayoutBox(parent())->scrollableArea()->setScrollCornerNeedsPaintInvalidation();
 }
 
 } // namespace blink