More explicit LayoutUnit conversions

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

 /*
  * Copyright (C) 2012 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 462 matching lines @@
 LayoutUnit LayoutMultiColumnFlowThread::remainingLogicalHeightAt(LayoutUnit blockOffset)
 {
     return pageRemainingLogicalHeightForOffset(blockOffset, AssociateWithLatterPage);
 }
 
 void LayoutMultiColumnFlowThread::calculateColumnCountAndWidth(LayoutUnit& width, unsigned& count) const
 {
     LayoutBlock* columnBlock = multiColumnBlockFlow();
     const ComputedStyle* columnStyle = columnBlock->style();
     LayoutUnit availableWidth = columnBlock->contentLogicalWidth();
-    LayoutUnit columnGap = columnBlock->columnGap();
+    LayoutUnit columnGap = LayoutUnit(columnBlock->columnGap());
     LayoutUnit computedColumnWidth = max(LayoutUnit(1), LayoutUnit(columnStyle->columnWidth()));
     unsigned computedColumnCount = max<int>(1, columnStyle->columnCount());
 
     ASSERT(!columnStyle->hasAutoColumnCount() || !columnStyle->hasAutoColumnWidth());
     if (columnStyle->hasAutoColumnWidth() && !columnStyle->hasAutoColumnCount()) {
         count = computedColumnCount;
         width = ((availableWidth - ((count - 1) * columnGap)) / count).clampNegativeToZero();
     } else if (!columnStyle->hasAutoColumnWidth() && columnStyle->hasAutoColumnCount()) {
         count = std::max(LayoutUnit(1), (availableWidth + columnGap) / (computedColumnWidth + columnGap));
         width = ((availableWidth + columnGap) / count) - columnGap;
@@ skipping 357 matching lines @@
 {
     LayoutFlowThread::computePreferredLogicalWidths();
 
     // The min/max intrinsic widths calculated really tell how much space elements need when
     // laid out inside the columns. In order to eventually end up with the desired column width,
     // we need to convert them to values pertaining to the multicol container.
     const LayoutBlockFlow* multicolContainer = multiColumnBlockFlow();
     const ComputedStyle* multicolStyle = multicolContainer->style();
     int columnCount = multicolStyle->hasAutoColumnCount() ? 1 : multicolStyle->columnCount();
     LayoutUnit columnWidth;
-    LayoutUnit gapExtra = (columnCount - 1) * multicolContainer->columnGap();
+    LayoutUnit gapExtra = LayoutUnit((columnCount - 1) * multicolContainer->columnGap());
     if (multicolStyle->hasAutoColumnWidth()) {
         m_minPreferredLogicalWidth = m_minPreferredLogicalWidth * columnCount + gapExtra;
     } else {
         columnWidth = multicolStyle->columnWidth();
         m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, columnWidth);
     }
     // Note that if column-count is auto here, we should resolve it to calculate the maximum
     // intrinsic width, instead of pretending that it's 1. The only way to do that is by performing
     // a layout pass, but this is not an appropriate time or place for layout. The good news is that
     // if height is unconstrained and there are no explicit breaks, the resolved column-count really
@@ skipping 53 matching lines @@
     // the "mayBe"), if we're in an out-of-flow subtree and have an outer multicol container that
     // doesn't affect us, but that's okay. We'll discover that further down the road when trying to
     // locate our enclosing flow thread for real.
     bool mayBeNested = multiColumnBlockFlow()->isInsideFlowThread() || view()->fragmentationContext();
     if (!mayBeNested)
         return;
     appendNewFragmentainerGroupIfNeeded(logicalBottomInFlowThreadAfterPagination);
 }
 
 } // namespace blink