Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

sky/engine/platform/graphics/skia/SkiaUtils.cpp

 /*
  * Copyright (c) 2006,2007,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 129 matching lines @@
     // Scale the path to a large size before hit testing for two reasons:
     // 1) Skia has trouble with coordinates close to the max signed 16-bit values, so we scale larger paths down.
     //    TODO: when Skia is patched to work properly with large values, this will not be necessary.
     // 2) Skia does not support analytic hit testing, so we scale paths up to do raster hit testing with subpixel accuracy.
     SkScalar biggestCoord = std::max(std::max(std::max(bounds.fRight, bounds.fBottom), -bounds.fLeft), -bounds.fTop);
     if (SkScalarNearlyZero(biggestCoord))
         return false;
     biggestCoord = std::max(std::max(biggestCoord, fX + 1), fY + 1);
 
     const SkScalar kMaxCoordinate = SkIntToScalar(1 << 15);
-    SkScalar scale = SkScalarDiv(kMaxCoordinate, biggestCoord);
+    SkScalar scale = kMaxCoordinate / biggestCoord;
 
     SkRegion rgn;
     SkRegion clip;
     SkMatrix m;
     SkPath scaledPath(originalPath);
 
     scaledPath.setFillType(ft);
     m.setScale(scale, scale);
     scaledPath.transform(m, 0);
 
@@ skipping 146 matching lines @@
     // though - that's why it's not always on.
     SkScalar widthExpansion, heightExpansion;
     if (totalMatrix.getType() & SkMatrix::kAffine_Mask)
         widthExpansion = totalMatrix[SkMatrix::kMSkewY], heightExpansion = totalMatrix[SkMatrix::kMSkewX];
     else
         widthExpansion = totalMatrix[SkMatrix::kMScaleX], heightExpansion = totalMatrix[SkMatrix::kMScaleY];
     return destRect.width() * fabs(widthExpansion) < 1 || destRect.height() * fabs(heightExpansion) < 1;
 }
 
 }  // namespace blink