commit 4241f5e0a8ac1b64f03972d90d5082b15e138c64
author Mike Reed <reed@google.com> Sat Sep 14 19:13:23 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Sep 14 19:13:44 2019 +0000
tree 43cc13b7505dd26d2003cf8b8cdb316b46d2d58f
parent e1af44498b6e40c448811e6efc4412272cc10ca7

Revert "add guard to switch to SkPathTypes"

This reverts commit e1af44498b6e40c448811e6efc4412272cc10ca7.

Reason for revert: breaking google3?

Original change's description:
> add guard to switch to SkPathTypes
> 
> Change-Id: I44d8b5ae8a5172d11a6d4cd9d994373dd3816d6f
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241278
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=robertphillips@google.com,kjlubick@google.com,fmalita@chromium.org,reed@google.com

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

samplecode/SampleStrokePath.cpp

diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index b22ba8d..4963f97 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp
@@ -112,8 +112,8 @@
             "Z";
         SkParsePath::FromSVGString(str, &fPath);
 #else
-        fPath.addCircle(0, 0, SkIntToScalar(50), SkPathDirection::kCW);
-        fPath.addCircle(0, SkIntToScalar(-50), SkIntToScalar(30), SkPathDirection::kCW);
+        fPath.addCircle(0, 0, SkIntToScalar(50), SkPath::kCW_Direction);
+        fPath.addCircle(0, SkIntToScalar(-50), SkIntToScalar(30), SkPath::kCW_Direction);
 #endif
 
         scale_to_width(&fPath, fWidth);
@@ -192,11 +192,11 @@
         fPath.offset(100, 0);
 #endif
 
-        fPath.setFillType(SkPathFillType::kWinding);
+        fPath.setFillType(SkPath::kWinding_FillType);
         drawSet(canvas, &paint);
 
         canvas->translate(0, fPath.getBounds().height() * 5 / 4);
-        fPath.setFillType(SkPathFillType::kEvenOdd);
+        fPath.setFillType(SkPath::kEvenOdd_FillType);
         drawSet(canvas, &paint);
     }