Reapply the non-MathExtras parts of

Source/platform/graphics/skia/NativeImageSkia.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 64 matching lines @@
 //
 // scaledSrcRect = srcRect * (approximateScaleX, approximateScaleY)
 // enclosingScaledSrcRect = enclosingIntRect(scaledSrcRect)
 //
 // Finally we extract the scaled image fragment using
 // (scaledImageSize, enclosingScaledSrcRect).
 //
 SkBitmap NativeImageSkia::extractScaledImageFragment(const SkRect& srcRect, float scaleX, float scaleY, SkRect* scaledSrcRect) const
 {
     SkISize imageSize = SkISize::Make(bitmap().width(), bitmap().height());
-    SkISize scaledImageSize = SkISize::Make(clampToInteger(roundf(imageSize.width() * scaleX)),
-        clampToInteger(roundf(imageSize.height() * scaleY)));
+    SkISize scaledImageSize = SkISize::Make(clampTo<int>(roundf(imageSize.width() * scaleX)),
+        clampTo<int>(roundf(imageSize.height() * scaleY)));
 
     SkRect imageRect = SkRect::MakeWH(imageSize.width(), imageSize.height());
     SkRect scaledImageRect = SkRect::MakeWH(scaledImageSize.width(), scaledImageSize.height());
 
     SkMatrix scaleTransform;
     scaleTransform.setRectToRect(imageRect, scaledImageRect, SkMatrix::kFill_ScaleToFit);
     scaleTransform.mapRect(scaledSrcRect, srcRect);
 
     scaledSrcRect->intersect(scaledImageRect);
     SkIRect enclosingScaledSrcRect = enclosingIntRect(*scaledSrcRect);
@@ skipping 272 matching lines @@
 SkIRect NativeImageSkia::ImageResourceInfo::rectInSubset(const SkIRect& otherScaledImageSubset)
 {
     if (!scaledImageSubset.contains(otherScaledImageSubset))
         return SkIRect::MakeEmpty();
     SkIRect subsetRect = otherScaledImageSubset;
     subsetRect.offset(-scaledImageSubset.x(), -scaledImageSubset.y());
     return subsetRect;
 }
 
 } // namespace blink