commit 683fd62a4c8cd1387397f5c291237090e14de2c4
author Mike Reed <reed@google.com> Sat Jun 12 18:41:42 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 15 16:41:48 2021 +0000
tree 211f64140b9b97d75159aeebc66d9e0815ff86db
parent 62214f779f38ca5909e29fee3c88cb888fee0791

Remove unneeded includes from pathops

Bug: skia:7951
Bug: skia:9734
Change-Id: I4280493a10d223133b8e53e8c7a65fb9f8eb2413
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418057
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Auto-Submit: Mike Reed <reed@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>

src/gpu/GrDistanceFieldGenFromVector.cpp

diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index fc8b892..a2178c5 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -10,7 +10,6 @@
 
 #include "include/core/SkMatrix.h"
 #include "include/gpu/GrConfig.h"
-#include "include/pathops/SkPathOps.h"
 #include "include/private/SkTPin.h"
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkGeometry.h"
@@ -18,7 +17,21 @@
 #include "src/core/SkRectPriv.h"
 #include "src/gpu/geometry/GrPathUtils.h"
 
-#include "src/pathops/SkPathOpsPoint.h"
+namespace {
+// TODO: should we make this real (i.e. src/core) and distinguish it from
+//       pathops SkDPoint?
+struct DPoint {
+    double fX, fY;
+
+    double distanceSquared(DPoint p) const {
+        double dx = fX - p.fX;
+        double dy = fY - p.fY;
+        return dx*dx + dy*dy;
+    }
+
+    double distance(DPoint p) const { return sqrt(this->distanceSquared(p)); }
+};
+}
 
 /**
  * If a scanline (a row of texel) cross from the kRight_SegSide
@@ -95,12 +108,12 @@
     // alias for reset()
     void setIdentity() { this->reset(); }
 
-    SkDPoint mapPoint(const SkPoint& src) const {
-        SkDPoint pt = {src.fX, src.fY};
+    DPoint mapPoint(const SkPoint& src) const {
+        DPoint pt = {src.fX, src.fY};
         return this->mapPoint(pt);
     }
 
-    SkDPoint mapPoint(const SkDPoint& src) const {
+    DPoint mapPoint(const DPoint& src) const {
         return { fMat[0] * src.fX + fMat[1] * src.fY + fMat[2],
                  fMat[3] * src.fX + fMat[4] * src.fY + fMat[5] };
     }
@@ -190,7 +203,7 @@
     // line uses 2 pts, quad uses 3 pts
     SkPoint fPts[3];
 
-    SkDPoint  fP0T, fP2T;
+    DPoint  fP0T, fP2T;
     DAffineMatrix fXformMatrix;  // transforms the segment into canonical space
     double fScalingFactor;
     double fScalingFactorSqd;
@@ -214,8 +227,8 @@
 typedef SkTArray<PathSegment, true> PathSegmentArray;
 
 void PathSegment::init() {
-    const SkDPoint p0 = { fPts[0].fX, fPts[0].fY };
-    const SkDPoint p2 = { this->endPt().fX, this->endPt().fY };
+    const DPoint p0 = { fPts[0].fX, fPts[0].fY };
+    const DPoint p2 = { this->endPt().fX, this->endPt().fY };
     const double p0x = p0.fX;
     const double p0y = p0.fY;
     const double p2x = p2.fX;
@@ -375,7 +388,7 @@
 
 static float calculate_nearest_point_for_quad(
                 const PathSegment& segment,
-                const SkDPoint &xFormPt) {
+                const DPoint &xFormPt) {
     static const float kThird = 0.33333333333f;
     static const float kTwentySeventh = 0.037037037f;
 
@@ -442,8 +455,8 @@
         return;
     }
 
-    const SkDPoint& xFormPtLeft = segment.fXformMatrix.mapPoint(pointLeft);
-    const SkDPoint& xFormPtRight = segment.fXformMatrix.mapPoint(pointRight);
+    const DPoint& xFormPtLeft = segment.fXformMatrix.mapPoint(pointLeft);
+    const DPoint& xFormPtRight = segment.fXformMatrix.mapPoint(pointRight);
 
     rowData->fQuadXDirection = (int)sign_of(segment.fP2T.fX - segment.fP0T.fX);
     rowData->fScanlineXDirection = (int)sign_of(xFormPtRight.fX - xFormPtLeft.fX);
@@ -492,7 +505,7 @@
 SegSide calculate_side_of_quad(
             const PathSegment& segment,
             const SkPoint& point,
-            const SkDPoint& xFormPt,
+            const DPoint& xFormPt,
             const RowData& rowData) {
     SegSide side = kNA_SegSide;
 
@@ -557,7 +570,7 @@
                                  SegSide* side) {
     SkASSERT(side);
 
-    const SkDPoint xformPt = segment.fXformMatrix.mapPoint(point);
+    const DPoint xformPt = segment.fXformMatrix.mapPoint(point);
 
     if (segment.fType == PathSegment::kLine) {
         float result = SK_DistanceFieldPad * SK_DistanceFieldPad;
@@ -586,7 +599,7 @@
         float dist;
 
         if (between_closed(nearestPoint, segment.fP0T.fX, segment.fP2T.fX)) {
-            SkDPoint x = { nearestPoint, nearestPoint * nearestPoint };
+            DPoint x = { nearestPoint, nearestPoint * nearestPoint };
             dist = (float)xformPt.distanceSquared(x);
         } else {
             const float distToB0T = (float)xformPt.distanceSquared(segment.fP0T);