commit 43e3e91883c8599f5e379d53da8b5895cc17c238
author Mike Reed <reed@google.com> Wed Aug 26 16:35:25 2020 +0000
committer Mike Reed <reed@google.com> Wed Aug 26 16:35:37 2020 +0000
tree 0f5c912c62a35b61f65885594f3378fcd3793d26
parent 10c4213c22af0e10f59a7b6e41ac8a1d491cba8e

Revert "use pathbuilder"

This reverts commit 4b25d41d96b344545161baf0e26c78d2b3742b00.

Reason for revert: grrrr, broke some layout test (a little)

https://test-results.appspot.com/data/layout_results/linux-blink-rel/40609/blink_web_tests%20%28with%20patch%29/layout-test-results/results.html

Original change's description:
> use pathbuilder
> 
> Change-Id: I4b7cd6aed0c8da44e6065bb171332e25988ec8cc
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313376
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=reed@google.com

Change-Id: I7a073aafcfddc398ab9a761719230f2427c987c6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313420
Reviewed-by: Mike Reed <reed@google.com>

gm/shadowutils.cpp

diff --git a/gm/shadowutils.cpp b/gm/shadowutils.cpp
index 9407dd3..3dc2b09 100644
--- a/gm/shadowutils.cpp
+++ b/gm/shadowutils.cpp
@@ -10,7 +10,7 @@
 #include "include/core/SkColor.h"
 #include "include/core/SkMatrix.h"
 #include "include/core/SkPaint.h"
-#include "include/core/SkPathBuilder.h"
+#include "include/core/SkPath.h"
 #include "include/core/SkPoint.h"
 #include "include/core/SkPoint3.h"
 #include "include/core/SkRRect.h"
@@ -47,14 +47,14 @@
 
 void draw_paths(SkCanvas* canvas, ShadowMode mode) {
     SkTArray<SkPath> paths;
-    paths.push_back(SkPath::RRect(SkRect::MakeWH(50, 50), 10, 10));
+    paths.push_back().addRoundRect(SkRect::MakeWH(50, 50), 10, 10);
     SkRRect oddRRect;
     oddRRect.setNinePatch(SkRect::MakeWH(50, 50), 9, 13, 6, 16);
-    paths.push_back(SkPath::RRect(oddRRect));
-    paths.push_back(SkPath::Rect(SkRect::MakeWH(50, 50)));
-    paths.push_back(SkPath::Circle(25, 25, 25));
-    paths.push_back(SkPathBuilder().cubicTo(100, 50, 20, 100, 0, 0).detach());
-    paths.push_back(SkPath::Oval(SkRect::MakeWH(20, 60)));
+    paths.push_back().addRRect(oddRRect);
+    paths.push_back().addRect(SkRect::MakeWH(50, 50));
+    paths.push_back().addCircle(25, 25, 25);
+    paths.push_back().cubicTo(100, 50, 20, 100, 0, 0);
+    paths.push_back().addOval(SkRect::MakeWH(20, 60));
 
     // star
     SkTArray<SkPath> concavePaths;