Transition to explicit constructors in LayoutUnit

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 469 matching lines @@
     LayoutBlock* columnBlock = multiColumnBlockFlow();
     const ComputedStyle* columnStyle = columnBlock->style();
     LayoutUnit availableWidth = columnBlock->contentLogicalWidth();
     LayoutUnit columnGap = 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 = std::max<LayoutUnit>(0, (availableWidth - ((count - 1) * columnGap)) / count);

[eae, 2016/01/29 03:38:12]

LayoutUnit()

     } else if (!columnStyle->hasAutoColumnWidth() && columnStyle->hasAutoColumnCount()) {
         count = std::max<LayoutUnit>(1, (availableWidth + columnGap) / (computedColumnWidth + columnGap));

[eae, 2016/01/29 03:38:12]

LayoutUnit(1)

         width = ((availableWidth + columnGap) / count) - columnGap;
     } else {
-        count = std::max<LayoutUnit>(std::min<LayoutUnit>(computedColumnCount, (availableWidth + columnGap) / (computedColumnWidth + columnGap)), 1);
+        count = std::max<LayoutUnit>(std::min<LayoutUnit>(LayoutUnit(computedColumnCount), (availableWidth + columnGap) / (computedColumnWidth + columnGap)), 1);

[eae, 2016/01/29 03:38:12]

LayoutUnit(computedColumnCount)

         width = ((availableWidth + columnGap) / count) - columnGap;
     }
 }
 
 void LayoutMultiColumnFlowThread::createAndInsertMultiColumnSet(LayoutBox* insertBefore)
 {
     LayoutBlockFlow* multicolContainer = multiColumnBlockFlow();
     LayoutMultiColumnSet* newSet = LayoutMultiColumnSet::createAnonymous(*this, multicolContainer->styleRef());
     multicolContainer->LayoutBlock::addChild(newSet, insertBefore);
     invalidateColumnSets();
@@ skipping 419 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