Drop SkPathContainsPoint in favor of SkPath::contains

third_party/WebKit/Source/platform/graphics/Path.cpp

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *                     2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 56 matching lines @@
     return *this;
 }
 
 bool Path::operator==(const Path& other) const
 {
     return m_path == other.m_path;
 }
 
 bool Path::contains(const FloatPoint& point) const
 {
-    return SkPathContainsPoint(m_path, point, m_path.getFillType());
+    return m_path.contains(WebCoreFloatToSkScalar(point.x()), WebCoreFloatToSkScalar(point.y()));
 }
 
 bool Path::contains(const FloatPoint& point, WindRule rule) const
 {
-    return SkPathContainsPoint(m_path, point, WebCoreWindRuleToSkFillType(rule));
+    SkScalar x = WebCoreFloatToSkScalar(point.x());
+    SkScalar y = WebCoreFloatToSkScalar(point.y());
+    SkPath::FillType fillType = WebCoreWindRuleToSkFillType(rule);
+    if (m_path.getFillType() != fillType) {
+        SkPath tmp(m_path);
+        tmp.setFillType(fillType);
+        return tmp.contains(x, y);
+    }
+    return m_path.contains(x, y);
 }
 
 // FIXME: this method ignores the CTM and may yield inaccurate results for large scales.
 SkPath Path::strokePath(const StrokeData& strokeData) const
 {
     SkPaint paint;
     strokeData.setupPaint(&paint);
 
     // Skia stroke resolution scale. This is multiplied by 4 internally
     // (i.e. 1.0 corresponds to 1/4 pixel res).
     static const SkScalar kResScale = 0.3f;
 
     SkPath strokePath;
     paint.getFillPath(m_path, &strokePath, nullptr, kResScale);
 
     return strokePath;
 }
 
 bool Path::strokeContains(const FloatPoint& point, const StrokeData& strokeData) const
 {
-    return SkPathContainsPoint(strokePath(strokeData), point, SkPath::kWinding_FillType);
+    return strokePath(strokeData).contains(WebCoreFloatToSkScalar(point.x()), WebCoreFloatToSkScalar(point.y()));
 }
 
 FloatRect Path::boundingRect() const
 {
     return m_path.getBounds();
 }
 
 FloatRect Path::strokeBoundingRect(const StrokeData& strokeData) const
 {
     return strokePath(strokeData).getBounds();
@@ skipping 374 matching lines @@
 
 #if ENABLE(ASSERT)
 bool ellipseIsRenderable(float startAngle, float endAngle)
 {
     return (std::abs(endAngle - startAngle) < twoPiFloat)
         || WebCoreFloatNearlyEqual(std::abs(endAngle - startAngle), twoPiFloat);
 }
 #endif
 
 } // namespace blink