Revert "Revert "switch to new filltype for SkPath""
This reverts commit 3e7af41224eecf8393f3cdc08c4c9800b2321c20.
Change-Id: Id4f66b3956f4bdbe690db20fc478b7365ee89717
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256676
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index e733528..f96d049 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -197,7 +197,7 @@
void drawPath(SkPath& path, SkCanvas* canvas, SkColor color,
const SkRect& clip, SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPath::FillType fill,
+ SkPaint::Style style, SkPathFillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -261,14 +261,14 @@
};
struct FillAndName {
- SkPath::FillType fFill;
+ SkPathFillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPath::kWinding_FillType, "Winding"},
- {SkPath::kEvenOdd_FillType, "Even / Odd"},
- {SkPath::kInverseWinding_FillType, "Inverse Winding"},
- {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"}
+ {SkPathFillType::kWinding, "Winding"},
+ {SkPathFillType::kEvenOdd, "Even / Odd"},
+ {SkPathFillType::kInverseWinding, "Inverse Winding"},
+ {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"}
};
struct StyleAndName {
SkPaint::Style fStyle;