Force all LayoutUnit construction to be explicit

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

Index: third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
diff --git a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
index 16f36e81866f7e8a32f6b9df7575ee236303d90d..b550ab161bc6762a2aff0696dc132c8cc3cc5e50 100644
--- a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
+++ b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
@@ -183,13 +183,13 @@ const Shape& ShapeOutsideInfo::computedShape() const
 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)
@@ -222,14 +222,14 @@ inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& layoutBox,
 {
     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)
@@ -294,11 +294,11 @@ ShapeOutsideDeltas ShapeOutsideInfo::computeDeltasForContainingBlockLine(const L
             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);