Drop SkPathContainsPoint in favor of SkPath::contains

third_party/WebKit/Source/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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 
 #include "platform/graphics/GraphicsContext.h"
-#include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/effects/SkCornerPathEffect.h"
 
 namespace blink {
 
 static const struct CompositOpToXfermodeMode {
     CompositeOperator mCompositOp;
     SkXfermode::Mode m_xfermodeMode;
 } gMapCompositOpsToXfermodeModes[] = {
     { CompositeClear,           SkXfermode::kClear_Mode },
     { CompositeCopy,            SkXfermode::kSrc_Mode },
@@ skipping 116 matching lines @@
     case SkXfermode::kColor_Mode:
         return WebBlendModeColor;
     case SkXfermode::kLuminosity_Mode:
         return WebBlendModeLuminosity;
     default:
         break;
     }
     return WebBlendModeNormal;
 }
 
-bool SkPathContainsPoint(const SkPath& originalPath, const FloatPoint& point, SkPath::FillType ft)
-{
-    SkRect bounds = originalPath.getBounds();
-
-    // We can immediately return false if the point is outside the bounding
-    // rect.  We don't use bounds.contains() here, since it would exclude
-    // points on the right and bottom edges of the bounding rect, and we want
-    // to include them.
-    SkScalar fX = SkFloatToScalar(point.x());
-    SkScalar fY = SkFloatToScalar(point.y());
-    if (fX < bounds.fLeft || fX > bounds.fRight || fY < bounds.fTop || fY > bounds.fBottom)
-        return false;
-
-    // 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.
-    // 3) Scale the x/y axis separately so an extreme large/small scale factor on one axis won't
-    //    ruin the resolution of the other axis.
-    SkScalar biggestCoordX = std::max(bounds.fRight, -bounds.fLeft);
-    SkScalar biggestCoordY = std::max(bounds.fBottom, -bounds.fTop);
-    if (SkScalarNearlyZero(biggestCoordX) || SkScalarNearlyZero(biggestCoordY))
-        return false;
-
-    biggestCoordX = std::max(biggestCoordX, std::fabs(fX) + 1);
-    biggestCoordY = std::max(biggestCoordY, std::fabs(fY) + 1);
-
-    const SkScalar kMaxCoordinate = SkIntToScalar(1 << 15);
-    SkScalar scaleX = kMaxCoordinate / biggestCoordX;
-    SkScalar scaleY = kMaxCoordinate / biggestCoordY;
-
-    SkRegion rgn;
-    SkRegion clip;
-    SkMatrix m;
-    SkPath scaledPath(originalPath);
-
-    scaledPath.setFillType(ft);
-    m.setScale(scaleX, scaleY);
-    scaledPath.transform(m, 0);
-
-    int x = static_cast<int>(floorf(0.5f + point.x() * scaleX));
-    int y = static_cast<int>(floorf(0.5f + point.y() * scaleY));
-    clip.setRect(x - 1, y - 1, x + 1, y + 1);
-
-    return rgn.setPath(scaledPath, clip);
-}
-
 SkMatrix affineTransformToSkMatrix(const AffineTransform& source)
 {
     SkMatrix result;
 
     result.setScaleX(WebCoreDoubleToSkScalar(source.a()));
     result.setSkewX(WebCoreDoubleToSkScalar(source.c()));
     result.setTranslateX(WebCoreDoubleToSkScalar(source.e()));
 
     result.setScaleY(WebCoreDoubleToSkScalar(source.d()));
     result.setSkewY(WebCoreDoubleToSkScalar(source.b()));
@@ skipping 166 matching lines @@
     paint.setAlpha(128);
     paint.setStrokeWidth(paint.getStrokeWidth() * 0.5f);
     drawFocusRingPrimitive(primitive, canvas, paint, cornerRadius);
 #endif
 }
 
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkRect>(const SkRect&, SkCanvas*, SkColor, int width);
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkPath>(const SkPath&, SkCanvas*, SkColor, int width);
 
 }  // namespace blink