Transition to explicit constructors in LayoutUnit

third_party/WebKit/Source/platform/LengthFunctions.cpp

 /*
     Copyright (C) 1999 Lars Knoll (knoll@kde.org)
     Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
     Copyright (C) 2011 Rik Cabanier (cabanier@adobe.com)
     Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
     Copyright (C) 2012 Motorola Mobility, 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
     License as published by the Free Software Foundation; either
@@ skipping 26 matching lines @@
 {
     switch (length.type()) {
     case Fixed:
         return length.getFloatValue();
     case Percent:
         return static_cast<float>(maximumValue * length.percent() / 100.0f);
     case FillAvailable:
     case Auto:
         return static_cast<float>(maximumValue);
     case Calculated:
-        return length.nonNanCalculatedValue(maximumValue);
+        return length.nonNanCalculatedValue(LayoutUnit(maximumValue));
     case MinContent:
     case MaxContent:
     case FitContent:
     case ExtendToZoom:
     case DeviceWidth:
     case DeviceHeight:
     case MaxSizeNone:
         ASSERT_NOT_REACHED();
         return 0;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 LayoutUnit minimumValueForLength(const Length& length, LayoutUnit maximumValue)
 {
     switch (length.type()) {
     case Fixed:
-        return length.value();
+        return LayoutUnit(length.value());
     case Percent:
         // Don't remove the extra cast to float. It is needed for rounding on 32-bit Intel machines that use the FPU stack.
-        return static_cast<float>(maximumValue * length.percent() / 100.0f);
+        return LayoutUnit(static_cast<float>(maximumValue * length.percent() / 100.0f));
     case Calculated:
-        return length.nonNanCalculatedValue(maximumValue.toFloat());
+        return LayoutUnit(length.nonNanCalculatedValue(maximumValue));
     case FillAvailable:
     case Auto:
-        return 0;
+        return LayoutUnit();
     case MinContent:
     case MaxContent:
     case FitContent:
     case ExtendToZoom:
     case DeviceWidth:
     case DeviceHeight:
     case MaxSizeNone:
         ASSERT_NOT_REACHED();
-        return 0;
+        return LayoutUnit();
     }
     ASSERT_NOT_REACHED();
-    return 0;
+    return LayoutUnit();
 }
 
 LayoutUnit roundedMinimumValueForLength(const Length& length, LayoutUnit maximumValue)
 {
     if (length.type() == Percent)
         return static_cast<LayoutUnit>(round(maximumValue * length.percent() / 100.0f));
     return minimumValueForLength(length, maximumValue);
 }
 
 LayoutUnit valueForLength(const Length& length, LayoutUnit maximumValue)
 {
     switch (length.type()) {
     case Fixed:
     case Percent:
     case Calculated:
         return minimumValueForLength(length, maximumValue);
     case FillAvailable:
     case Auto:
         return maximumValue;
     case MinContent:
     case MaxContent:
     case FitContent:
     case ExtendToZoom:
     case DeviceWidth:
     case DeviceHeight:
     case MaxSizeNone:
         ASSERT_NOT_REACHED();
-        return 0;
+        return LayoutUnit();
     }
     ASSERT_NOT_REACHED();
-    return 0;
+    return LayoutUnit();
 }
 
 FloatSize floatSizeForLengthSize(const LengthSize& lengthSize, const FloatSize& boxSize)
 {
     return FloatSize(floatValueForLength(lengthSize.width(), boxSize.width()), floatValueForLength(lengthSize.height(), boxSize.height()));
 }
 
 } // namespace blink