commit 92f6eb16023a9a39c8f2930587893508fc8ada8c
author Mike Reed <reed@google.com> Tue Aug 25 11:48:41 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 25 16:29:48 2020 +0000
tree a546d48eb857f6333b07e7d5d25654408f60095b
parent 8025507f746b2b95a840684ce6746aae55cecbfd

use pathbuilder

Change-Id: I2bca419a3273a9cc8a984b0f4159f518968c6652
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313077
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gm/nested.cpp

diff --git a/gm/nested.cpp b/gm/nested.cpp
index 81b92f2..67390ad 100644
--- a/gm/nested.cpp
+++ b/gm/nested.cpp
@@ -9,7 +9,7 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkPaint.h"
-#include "include/core/SkPath.h"
+#include "include/core/SkPathBuilder.h"
 #include "include/core/SkRRect.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkScalar.h"
@@ -53,19 +53,19 @@
         kShapeCount
     };
 
-    static void AddShape(SkPath* path, const SkRect& rect, Shapes shape, SkPathDirection dir) {
+    static void AddShape(SkPathBuilder* b, const SkRect& rect, Shapes shape, SkPathDirection dir) {
         switch (shape) {
             case kRect_Shape:
-                path->addRect(rect, dir);
+                b->addRect(rect, dir);
                 break;
             case kRRect_Shape: {
                 SkRRect rr;
                 rr.setRectXY(rect, 5, 5);
-                path->addRRect(rr, dir);
+                b->addRRect(rr, dir);
                 break;
                 }
             case kOval_Shape:
-                path->addOval(rect, dir);
+                b->addOval(rect, dir);
                 break;
             default:
                 break;
@@ -103,10 +103,10 @@
         for (int outerShape = 0; outerShape < kShapeCount; ++outerShape) {
             for (int innerShape = 0; innerShape < kShapeCount; ++innerShape) {
                 for (size_t innerRect = 0; innerRect < SK_ARRAY_COUNT(innerRects); ++innerRect) {
-                    SkPath path;
+                    SkPathBuilder builder;
 
-                    AddShape(&path, outerRect, (Shapes) outerShape, SkPathDirection::kCW);
-                    AddShape(&path, innerRects[innerRect], (Shapes) innerShape,
+                    AddShape(&builder, outerRect, (Shapes) outerShape, SkPathDirection::kCW);
+                    AddShape(&builder, innerRects[innerRect], (Shapes) innerShape,
                              SkPathDirection::kCCW);
 
                     canvas->save();
@@ -117,7 +117,7 @@
                         canvas->translate(xOff, yOff);
                     }
 
-                    canvas->drawPath(path, shapePaint);
+                    canvas->drawPath(builder.detach(), shapePaint);
                     canvas->restore();
 
                     xOff += 45;