Reapply the non-MathExtras parts of

Source/core/rendering/shapes/RasterShape.cpp

 /*
  * Copyright (C) 2013 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 124 matching lines @@
         y = endY - 1;
     }
 }
 
 const RasterShapeIntervals& RasterShape::marginIntervals() const
 {
     ASSERT(shapeMargin() >= 0);
     if (!shapeMargin())
         return *m_intervals;
 
-    int shapeMarginInt = clampToPositiveInteger(ceil(shapeMargin()));
+    int shapeMarginInt = clampTo<int>(ceil(shapeMargin()), 0);
     int maxShapeMarginInt = std::max(m_marginRectSize.width(), m_marginRectSize.height()) * sqrtf(2);
     if (!m_marginIntervals)
         m_marginIntervals = m_intervals->computeShapeMarginIntervals(std::min(shapeMarginInt, maxShapeMarginInt));
 
     return *m_marginIntervals;
 }
 
 LineSegment RasterShape::getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const
 {
     const RasterShapeIntervals& intervals = marginIntervals();
@@ skipping 17 matching lines @@
             excludedInterval.unite(intervals.intervalAt(y));
     }
 
     // Note: |marginIntervals()| returns end-point exclusive
     // intervals. |excludedInterval.x2()| contains the left-most pixel
     // offset to the right of the calculated union.
     return LineSegment(excludedInterval.x1(), excludedInterval.x2());
 }
 
 } // namespace blink