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>

src/gpu/GrDistanceFieldGenFromVector.h

diff --git a/src/gpu/GrDistanceFieldGenFromVector.h b/src/gpu/GrDistanceFieldGenFromVector.h
index 0362166..8e8d1b3 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.h
+++ b/src/gpu/GrDistanceFieldGenFromVector.h
@@ -30,10 +30,10 @@
                                      const SkPath& path, const SkMatrix& viewMatrix,
                                      int width, int height, size_t rowBytes);
 
-inline bool IsDistanceFieldSupportedFillType(SkPathFillType fFillType)
+inline bool IsDistanceFieldSupportedFillType(SkPath::FillType fFillType)
 {
-    return (SkPathFillType::kEvenOdd == fFillType ||
-            SkPathFillType::kInverseEvenOdd == fFillType);
+    return (SkPath::kEvenOdd_FillType == fFillType ||
+            SkPath::kInverseEvenOdd_FillType == fFillType);
 }
 
 #endif