Bug 1254243 - use SkPath::contains directly now that it considers boundaries inclusively. r=mattwoodrow

gfx/2d/PathSkia.cpp

@@ -129,45 +129,13 @@ PathSkia::TransformedCopyToBuilder(const Matrix &aTransform, FillRule aFillRule)
 static bool
 SkPathContainsPoint(const SkPath& aPath, const Point& aPoint, const Matrix& aTransform)
 {
-  // Skia's SkPath::contains method does not support the inclusive boundary conditions
-  // required by canvas (bug 831259), so we employ the same workaround as used by Blink.
-  // First, we scale the path up to the largest coordinates that won't cause precision
-  // issues (2^15) and consequently also scale larger paths than that down.
-  // Next, we make a clip region representing the point to be tested and convert the
-  // path to a region within this clip region.
-  // If the resulting region is non-empty, then the path should contain the point.
   Matrix inverse = aTransform;
-  inverse.Invert();
+  if (!inverse.Invert()) {
+    return false;
+  }
+
   SkPoint point = PointToSkPoint(inverse * aPoint);
-
-  SkRect bounds = aPath.getBounds();
-  if (point.fX < bounds.fLeft || point.fY < bounds.fTop ||
-      point.fX > bounds.fRight || point.fY > bounds.fBottom) {
-    return false;
-  }
-
-  SkPoint scale = SkPoint::Make(SkMaxScalar(bounds.fRight, -bounds.fLeft),
-                                SkMaxScalar(bounds.fBottom, -bounds.fTop));
-  if (SkScalarNearlyZero(scale.fX) || SkScalarNearlyZero(scale.fY)) {
-    return false;
-  }
-  scale.set(SkMaxScalar(scale.fX, SkScalarAbs(point.fX) + SK_Scalar1),
-            SkMaxScalar(scale.fY, SkScalarAbs(point.fY) + SK_Scalar1));
-
-  const SkScalar maxCoord = SkIntToScalar(1 << 15);
-  SkMatrix scaleMatrix;
-  scaleMatrix.setScale(maxCoord / scale.fX, maxCoord / scale.fY);
-
-  SkPath scaledPath(aPath);
-  scaledPath.transform(scaleMatrix, nullptr);
-
-  scaleMatrix.mapPoints(&point, 1);
-  SkRegion pointClip(SkIRect::MakeXYWH(SkScalarRoundToInt(point.fX) - 1,
-                                       SkScalarRoundToInt(point.fY) - 1,
-                                       2, 2));
-
-  SkRegion pathRegion;
-  return pathRegion.setPath(scaledPath, pointClip);
+  return aPath.contains(point.fX, point.fY);
 }
 
 bool