More explicit LayoutUnit conversions

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. 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
@@ skipping 597 matching lines @@
 LayoutUnit LayoutBox::constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUnit intrinsicContentHeight) const
 {
     // If the min/max height and logical height are both percentages we take advantage of already knowing the current resolved percentage height
     // to avoid recursing up through our containing blocks again to determine it.
     const ComputedStyle& styleToUse = styleRef();
     if (!styleToUse.logicalMaxHeight().isMaxSizeNone()) {
         if (styleToUse.logicalMaxHeight().hasPercent() && styleToUse.logicalHeight().hasPercent()) {
             LayoutUnit availableLogicalHeight = logicalHeight / styleToUse.logicalHeight().value() * 100;
             logicalHeight = std::min(logicalHeight, valueForLength(styleToUse.logicalMaxHeight(), availableLogicalHeight));
         } else {
-            LayoutUnit maxHeight = computeContentLogicalHeight(MaxSize, styleToUse.logicalMaxHeight(), -1);
+            LayoutUnit maxHeight = computeContentLogicalHeight(MaxSize, styleToUse.logicalMaxHeight(), LayoutUnit(-1));
             if (maxHeight != -1)
                 logicalHeight = std::min(logicalHeight, maxHeight);
         }
     }
 
     if (styleToUse.logicalMinHeight().hasPercent() && styleToUse.logicalHeight().hasPercent()) {
         LayoutUnit availableLogicalHeight = logicalHeight / styleToUse.logicalHeight().value() * 100;
         logicalHeight = std::max(logicalHeight, valueForLength(styleToUse.logicalMinHeight(), availableLogicalHeight));
     } else {
         logicalHeight = std::max(logicalHeight, computeContentLogicalHeight(MinSize, styleToUse.logicalMinHeight(), intrinsicContentHeight));
@@ skipping 401 matching lines @@
 
 void LayoutBox::setOverrideLogicalContentWidth(LayoutUnit width)
 {
     ASSERT(width >= 0);
     ensureRareData().m_overrideLogicalContentWidth = width;
 }
 
 void LayoutBox::clearOverrideLogicalContentHeight()
 {
     if (m_rareData)
-        m_rareData->m_overrideLogicalContentHeight = -1;
+        m_rareData->m_overrideLogicalContentHeight = LayoutUnit(-1);
 }
 
 void LayoutBox::clearOverrideLogicalContentWidth()
 {
     if (m_rareData)
-        m_rareData->m_overrideLogicalContentWidth = -1;
+        m_rareData->m_overrideLogicalContentWidth = LayoutUnit(-1);
 }
 
 void LayoutBox::clearOverrideSize()
 {
     clearOverrideLogicalContentHeight();
     clearOverrideLogicalContentWidth();
 }
 
 LayoutUnit LayoutBox::overrideLogicalContentWidth() const
 {
@@ skipping 3583 matching lines @@
 
 void LayoutBox::clearPercentHeightDescendants()
 {
     for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrder(this)) {
         if (curr->isBox())
             toLayoutBox(curr)->removeFromPercentHeightContainer();
     }
 }
 
 } // namespace blink