Use SkTileMode instead of nested enum
Add guard to transition clients
Change-Id: Ia7a3e8f95722f91e84af262168dadf89a78707da
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205720
Reviewed-by: Mike Reed <[email protected]>
Commit-Queue: Mike Reed <[email protected]>
Auto-Submit: Mike Reed <[email protected]>
diff --git a/fuzz/FuzzGradients.cpp b/fuzz/FuzzGradients.cpp
index 35b623a..92ff366 100644
--- a/fuzz/FuzzGradients.cpp
+++ b/fuzz/FuzzGradients.cpp
@@ -26,7 +26,7 @@
}
void initGradientParams(Fuzz* fuzz, std::vector<SkColor>* colors,
- std::vector<SkScalar>* pos, SkShader::TileMode* mode) {
+ std::vector<SkScalar>* pos, SkTileMode* mode) {
int count;
fuzz->nextRange(&count, 0, MAX_COUNT);
@@ -34,7 +34,7 @@
// smaller, which leads to more efficient fuzzing.
uint8_t m;
fuzz->nextRange(&m, 0, 2);
- *mode = static_cast<SkShader::TileMode>(m);
+ *mode = static_cast<SkTileMode>(m);
colors->clear();
pos ->clear();
@@ -68,7 +68,7 @@
static void logLinearGradient(const SkPoint pts[2],
const std::vector<SkColor>& colors,
const std::vector<SkScalar> pos,
- SkShader::TileMode mode,
+ SkTileMode mode,
uint32_t flags,
const SkMatrix* localMatrix,
const SkMatrix* globalMatrix) {
@@ -96,10 +96,10 @@
SkDebugf("]\n");
static const char* gModeName[] = {
- "kClamp_TileMode", "kRepeat_TileMode", "kMirror_TileMode"
+ "kClamp_TileMode", "kRepeat_TileMode", "kMirror_TileMode", "kDecal_TileMode"
};
- SkASSERT(mode < SK_ARRAY_COUNT(gModeName));
- SkDebugf(" mode:\t\t%s\n", gModeName[mode]);
+ SkASSERT((unsigned)mode < SK_ARRAY_COUNT(gModeName));
+ SkDebugf(" mode:\t\t%s\n", gModeName[(unsigned)mode]);
SkDebugf(" flags:\t0x%x\n", flags);
logOptionalMatrix("local matrix", localMatrix);
logOptionalMatrix("global matrix", globalMatrix);
@@ -113,7 +113,7 @@
std::vector<SkColor> colors;
std::vector<SkScalar> pos;
- SkShader::TileMode mode;
+ SkTileMode mode;
initGradientParams(fuzz, &colors, &pos, &mode);
SkPaint p;
@@ -151,7 +151,7 @@
std::vector<SkColor> colors;
std::vector<SkScalar> pos;
- SkShader::TileMode mode;
+ SkTileMode mode;
initGradientParams(fuzz, &colors, &pos, &mode);
SkPaint p;
@@ -189,7 +189,7 @@
std::vector<SkColor> colors;
std::vector<SkScalar> pos;
- SkShader::TileMode mode;
+ SkTileMode mode;
initGradientParams(fuzz, &colors, &pos, &mode);
SkPaint p;
@@ -223,7 +223,7 @@
std::vector<SkColor> colors;
std::vector<SkScalar> pos;
- SkShader::TileMode mode;
+ SkTileMode mode;
initGradientParams(fuzz, &colors, &pos, &mode);
SkPaint p;
