Transition to explicit constructors in LayoutUnit

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

 /*
  * This file is part of the layout object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003 Apple Computer, 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
@@ skipping 401 matching lines @@
             if (!child->needsLayout())
                 child->markForPaginationRelayoutIfNeeded(layoutScope);
 
             child->layoutIfNeeded();
 
             // We can place the child now, using our value of box-align.
             xPos += child->marginLeft();
             LayoutUnit childY = yPos;
             switch (style()->boxAlign()) {
             case BCENTER:
-                childY += child->marginTop() + std::max<LayoutUnit>(0, (contentHeight() - (child->size().height() + child->marginHeight())) / 2);
+                childY += child->marginTop() + ((contentHeight() - (child->size().height() + child->marginHeight())) / 2).clampToZero();
                 break;
             case BBASELINE: {
                 LayoutUnit ascent = child->firstLineBoxBaseline();
                 if (ascent == -1)
                     ascent = child->size().height() + child->marginBottom();
                 ascent += child->marginTop();
                 childY += child->marginTop() + (maxAscent - ascent);
                 break;
             }
             case BEND:
@@ skipping 123 matching lines @@
 
                     if (firstChild) {
                         firstChild = false;
                         continue;
                     }
 
                     offset += remainingSpace / totalChildren;
                     remainingSpace -= (remainingSpace / totalChildren);
                     --totalChildren;
 
-                    placeChild(child, child->location() + LayoutSize(offset, 0));
+                    placeChild(child, child->location() + LayoutSize(offset, LayoutUnit()));
                 }
             }
         } else {
             if (style()->boxPack() == Center)
                 offset += remainingSpace / 2;
             else // END for LTR, START for RTL
                 offset += remainingSpace;
             for (LayoutBox* child = iterator.first(); child; child = iterator.next()) {
                 if (childDoesNotAffectWidthOrFlexing(child))
                     continue;
 
-                placeChild(child, child->location() + LayoutSize(offset, 0));
+                placeChild(child, child->location() + LayoutSize(offset, LayoutUnit()));
             }
         }
     }
 
     // So that the computeLogicalHeight in layoutBlock() knows to relayout positioned objects because of
     // a height change, we revert our height back to the intrinsic height before returning.
     if (heightSpecified)
         setHeight(oldHeight);
 }
 
@@ skipping 62 matching lines @@
                 child->markForPaginationRelayoutIfNeeded(layoutScope);
 
             // Now do a layout.
             child->layoutIfNeeded();
 
             // We can place the child now, using our value of box-align.
             LayoutUnit childX = borderLeft() + paddingLeft();
             switch (style()->boxAlign()) {
             case BCENTER:
             case BBASELINE: // Baseline just maps to center for vertical boxes
-                childX += child->marginLeft() + std::max<LayoutUnit>(0, (contentWidth() - (child->size().width() + child->marginWidth())) / 2);
+                childX += child->marginLeft() + std::max<LayoutUnit>(LayoutUnit(), (contentWidth() - (child->size().width() + child->marginWidth())) / 2);
                 break;
             case BEND:
                 if (!style()->isLeftToRightDirection())
                     childX += child->marginLeft();
                 else
                     childX += contentWidth() - child->marginRight() - child->size().width();
                 break;
             default: // BSTART/BSTRETCH
                 if (style()->isLeftToRightDirection())
                     childX += child->marginLeft();
@@ skipping 134 matching lines @@
                         continue;
 
                     if (firstChild) {
                         firstChild = false;
                         continue;
                     }
 
                     offset += remainingSpace / totalChildren;
                     remainingSpace -= (remainingSpace / totalChildren);
                     --totalChildren;
-                    placeChild(child, child->location() + LayoutSize(0, offset));
+                    placeChild(child, child->location() + LayoutSize(LayoutUnit(), offset));
                 }
             }
         } else {
             if (style()->boxPack() == Center)
                 offset += remainingSpace / 2;
             else // END
                 offset += remainingSpace;
             for (LayoutBox* child = iterator.first(); child; child = iterator.next()) {
                 if (childDoesNotAffectWidthOrFlexing(child))
                     continue;
-                placeChild(child, child->location() + LayoutSize(0, offset));
+                placeChild(child, child->location() + LayoutSize(LayoutUnit(), offset));
             }
         }
     }
 
     // So that the computeLogicalHeight in layoutBlock() knows to relayout positioned objects because of
     // a height change, we revert our height back to the intrinsic height before returning.
     if (heightSpecified)
         setHeight(oldHeight);
 }
 
@@ skipping 157 matching lines @@
     if (minHeight.isFixed() || minHeight.isAuto()) {
         LayoutUnit minHeight = child->style()->minHeight().value();
         LayoutUnit height = contentHeightForChild(child);
         LayoutUnit allowedShrinkage = std::min<LayoutUnit>(0, minHeight - height);
         return allowedShrinkage;
     }
     return 0;
 }
 
 } // namespace blink