commit 6da4a8b5c310ed2c71bff826c7d57ef349f75053
author Michael Reed <mike@reedtribe.org> Mon Sep 15 15:42:15 2025 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Sep 16 10:59:20 2025 -0700
tree 46412e044c1089df4f0ccbca8f46cd25b9a88a3b
parent 37252404fa56f65e0d4325dbf35e2604bc8ec064

Convert gm to use pathbuilder

https://issues.skia.org/issues/445202439

Change-Id: Ic901a2481bab7530a88d9ec8c50cfa75abf59a35
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1055736
Reviewed-by: Kaylee Lubick <kjlubick@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Mike Reed <mike@reedtribe.org>

gm/mandoline.cpp

diff --git a/gm/mandoline.cpp b/gm/mandoline.cpp
index 7bcc9bc..7356c20 100644
--- a/gm/mandoline.cpp
+++ b/gm/mandoline.cpp
@@ -10,6 +10,7 @@
 #include "include/core/SkColor.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
+#include "include/core/SkPathBuilder.h"
 #include "include/core/SkPoint.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
@@ -28,22 +29,24 @@
     inline static constexpr int kDefaultSubdivisions = 10;
 
     MandolineSlicer(SkPoint anchorPt) {
-        fPath.setFillType(SkPathFillType::kEvenOdd);
-        fPath.setIsVolatile(true);
         this->reset(anchorPt);
     }
 
     void reset(SkPoint anchorPt) {
-        fPath.reset();
+        fBuilder.reset();
+
+        // see https://skia-review.googlesource.com/c/skia/+/1055736
+        fBuilder.setIsVolatile(true);
+
         fLastPt = fAnchorPt = anchorPt;
     }
 
     void sliceLine(SkPoint pt, int numSubdivisions = kDefaultSubdivisions) {
         if (numSubdivisions <= 0) {
-            fPath.moveTo(fAnchorPt);
-            fPath.lineTo(fLastPt);
-            fPath.lineTo(pt);
-            fPath.close();
+            fBuilder.moveTo(fAnchorPt);
+            fBuilder.lineTo(fLastPt);
+            fBuilder.lineTo(pt);
+            fBuilder.close();
             fLastPt = pt;
             return;
         }
@@ -58,10 +61,10 @@
 
     void sliceQuadratic(SkPoint p1, SkPoint p2, int numSubdivisions = kDefaultSubdivisions) {
         if (numSubdivisions <= 0) {
-            fPath.moveTo(fAnchorPt);
-            fPath.lineTo(fLastPt);
-            fPath.quadTo(p1, p2);
-            fPath.close();
+            fBuilder.moveTo(fAnchorPt);
+            fBuilder.lineTo(fLastPt);
+            fBuilder.quadTo(p1, p2);
+            fBuilder.close();
             fLastPt = p2;
             return;
         }
@@ -78,10 +81,10 @@
     void sliceCubic(SkPoint p1, SkPoint p2, SkPoint p3,
                     int numSubdivisions = kDefaultSubdivisions) {
         if (numSubdivisions <= 0) {
-            fPath.moveTo(fAnchorPt);
-            fPath.lineTo(fLastPt);
-            fPath.cubicTo(p1, p2, p3);
-            fPath.close();
+            fBuilder.moveTo(fAnchorPt);
+            fBuilder.lineTo(fLastPt);
+            fBuilder.cubicTo(p1, p2, p3);
+            fBuilder.close();
             fLastPt = p3;
             return;
         }
@@ -97,10 +100,10 @@
 
     void sliceConic(SkPoint p1, SkPoint p2, float w, int numSubdivisions = kDefaultSubdivisions) {
         if (numSubdivisions <= 0) {
-            fPath.moveTo(fAnchorPt);
-            fPath.lineTo(fLastPt);
-            fPath.conicTo(p1, p2, w);
-            fPath.close();
+            fBuilder.moveTo(fAnchorPt);
+            fBuilder.lineTo(fLastPt);
+            fBuilder.conicTo(p1, p2, w);
+            fBuilder.close();
             fLastPt = p2;
             return;
         }
@@ -116,7 +119,7 @@
         this->sliceConic(halves[1].fPts[1], halves[1].fPts[2], halves[1].fW, numSubdivisions - 1);
     }
 
-    const SkPath& path() const { return fPath; }
+    SkPath path() { return fBuilder.snapshot(); }
 
 private:
     float chooseChopT(int numSubdivisions) {
@@ -130,7 +133,7 @@
     }
 
     SkRandom fRand;
-    SkPath fPath;
+    SkPathBuilder fBuilder;
     SkPoint fAnchorPt;
     SkPoint fLastPt;
 };