Force all LayoutUnit construction to be explicit

third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. 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.
@@ skipping 165 matching lines @@
     }
     }
 
     ASSERT(m_shape);
     return *m_shape;
 }
 
 inline LayoutUnit borderBeforeInWritingMode(const LayoutBox& layoutBox, WritingMode writingMode)
 {
     switch (writingMode) {
-    case TopToBottomWritingMode: return layoutBox.borderTop();
-    case LeftToRightWritingMode: return layoutBox.borderLeft();
-    case RightToLeftWritingMode: return layoutBox.borderRight();
+    case TopToBottomWritingMode: return LayoutUnit(layoutBox.borderTop());
+    case LeftToRightWritingMode: return LayoutUnit(layoutBox.borderLeft());
+    case RightToLeftWritingMode: return LayoutUnit(layoutBox.borderRight());
     }
 
     ASSERT_NOT_REACHED();
-    return layoutBox.borderBefore();
+    return LayoutUnit(layoutBox.borderBefore());
 }
 
 inline LayoutUnit borderAndPaddingBeforeInWritingMode(const LayoutBox& layoutBox, WritingMode writingMode)
 {
     switch (writingMode) {
     case TopToBottomWritingMode: return layoutBox.borderTop() + layoutBox.paddingTop();
     case LeftToRightWritingMode: return layoutBox.borderLeft() + layoutBox.paddingLeft();
     case RightToLeftWritingMode: return layoutBox.borderRight() + layoutBox.paddingRight();
     }
 
@@ skipping 12 matching lines @@
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
 inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& layoutBox, const ComputedStyle* style)
 {
     if (style->isHorizontalWritingMode()) {
         if (style->isLeftToRightDirection())
-            return layoutBox.borderLeft();
+            return LayoutUnit(layoutBox.borderLeft());
 
-        return layoutBox.borderRight();
+        return LayoutUnit(layoutBox.borderRight());
     }
     if (style->isLeftToRightDirection())
-        return layoutBox.borderTop();
+        return LayoutUnit(layoutBox.borderTop());
 
-    return layoutBox.borderBottom();
+    return LayoutUnit(layoutBox.borderBottom());
 }
 
 inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const LayoutBox& layoutBox, const ComputedStyle* style)
 {
     if (style->isHorizontalWritingMode()) {
         if (style->isLeftToRightDirection())
             return layoutBox.borderLeft() + layoutBox.paddingLeft();
 
         return layoutBox.borderRight() + layoutBox.paddingRight();
     }
@@ skipping 44 matching lines @@
     LayoutUnit borderBoxLineTop = lineTop - borderBoxTop;
 
     if (isShapeDirty() || !m_shapeOutsideDeltas.isForLine(borderBoxLineTop, lineHeight)) {
         LayoutUnit referenceBoxLineTop = borderBoxLineTop - logicalTopOffset();
         LayoutUnit floatMarginBoxWidth = std::max(containingBlock.logicalWidthForFloat(floatingObject), LayoutUnit());
 
         if (computedShape().lineOverlapsShapeMarginBounds(referenceBoxLineTop, lineHeight)) {
             LineSegment segment = computedShape().getExcludedInterval((borderBoxLineTop - logicalTopOffset()), std::min(lineHeight, shapeLogicalBottom() - borderBoxLineTop));
             if (segment.isValid) {
                 LayoutUnit logicalLeftMargin = containingBlock.style()->isLeftToRightDirection() ? containingBlock.marginStartForChild(m_layoutBox) : containingBlock.marginEndForChild(m_layoutBox);
-                LayoutUnit rawLeftMarginBoxDelta = segment.logicalLeft + logicalLeftOffset() + logicalLeftMargin;
+                LayoutUnit rawLeftMarginBoxDelta(segment.logicalLeft + logicalLeftOffset() + logicalLeftMargin);
                 LayoutUnit leftMarginBoxDelta = clampTo<LayoutUnit>(rawLeftMarginBoxDelta, LayoutUnit(), floatMarginBoxWidth);
 
                 LayoutUnit logicalRightMargin = containingBlock.style()->isLeftToRightDirection() ? containingBlock.marginEndForChild(m_layoutBox) : containingBlock.marginStartForChild(m_layoutBox);
-                LayoutUnit rawRightMarginBoxDelta = segment.logicalRight + logicalLeftOffset() - containingBlock.logicalWidthForChild(m_layoutBox) - logicalRightMargin;
+                LayoutUnit rawRightMarginBoxDelta(segment.logicalRight + logicalLeftOffset() - containingBlock.logicalWidthForChild(m_layoutBox) - logicalRightMargin);
                 LayoutUnit rightMarginBoxDelta = clampTo<LayoutUnit>(rawRightMarginBoxDelta, -floatMarginBoxWidth, LayoutUnit());
 
                 m_shapeOutsideDeltas = ShapeOutsideDeltas(leftMarginBoxDelta, rightMarginBoxDelta, true, borderBoxLineTop, lineHeight);
                 return m_shapeOutsideDeltas;
             }
         }
 
         // Lines that do not overlap the shape should act as if the float
         // wasn't there for layout purposes. So we set the deltas to remove the
         // entire width of the float.
@@ skipping 32 matching lines @@
 }
 
 FloatSize ShapeOutsideInfo::shapeToLayoutObjectSize(FloatSize size) const
 {
     if (!m_layoutBox.style()->isHorizontalWritingMode())
         return size.transposedSize();
     return size;
 }
 
 } // namespace blink