Revert "switch to new filltype for SkPath"
This reverts commit 3a50981a834b1502151038e3e511fe78805ab0e3.
Reason for revert: chrome win build found compile-problem in xpsdevice
Original change's description:
> switch to new filltype for SkPath
>
> Change-Id: I7793324a9acf4afb0eb38c1e20fbb38eac25d636
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256102
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=fmalita@chromium.org,reed@google.com
Change-Id: Iacb3566da61c2512b9bd6b7e42b592febc85e031
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256530
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/docs/examples/Canvas_clipPath.cpp b/docs/examples/Canvas_clipPath.cpp
index c87ccc1..3b6d43d8 100644
--- a/docs/examples/Canvas_clipPath.cpp
+++ b/docs/examples/Canvas_clipPath.cpp
@@ -8,13 +8,13 @@
paint.setAntiAlias(true);
SkPath path;
path.addRect({20, 30, 100, 110});
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
canvas->save();
canvas->clipPath(path, SkClipOp::kDifference, false);
canvas->drawCircle(70, 100, 60, paint);
canvas->restore();
canvas->translate(100, 100);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->clipPath(path, SkClipOp::kIntersect, false);
canvas->drawCircle(70, 100, 60, paint);
}
diff --git a/docs/examples/Canvas_clipPath_2.cpp b/docs/examples/Canvas_clipPath_2.cpp
index 1bea1e0..963c8d7 100644
--- a/docs/examples/Canvas_clipPath_2.cpp
+++ b/docs/examples/Canvas_clipPath_2.cpp
@@ -9,13 +9,13 @@
SkPath path;
path.addRect({20, 15, 100, 95});
path.addRect({50, 65, 130, 135});
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->save();
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(70, 85, 60, paint);
canvas->restore();
canvas->translate(100, 100);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(70, 85, 60, paint);
}
diff --git a/docs/examples/Canvas_clipPath_3.cpp b/docs/examples/Canvas_clipPath_3.cpp
index 3a1c516..9988a80 100644
--- a/docs/examples/Canvas_clipPath_3.cpp
+++ b/docs/examples/Canvas_clipPath_3.cpp
@@ -10,13 +10,13 @@
SkPoint poly[] = {{20, 20}, { 80, 20}, { 80, 80}, {40, 80},
{40, 40}, {100, 40}, {100, 100}, {20, 100}};
path.addPoly(poly, SK_ARRAY_COUNT(poly), true);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->save();
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(50, 50, 45, paint);
canvas->restore();
canvas->translate(100, 100);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(50, 50, 45, paint);
}
diff --git a/docs/examples/Canvas_drawPath.cpp b/docs/examples/Canvas_drawPath.cpp
index 2a5460b..d62374d 100644
--- a/docs/examples/Canvas_drawPath.cpp
+++ b/docs/examples/Canvas_drawPath.cpp
@@ -24,9 +24,9 @@
canvas->translate(-240, 60);
}
paint.setStyle(SkPaint::kFill_Style);
- for (auto fill : { SkPathFillType::kWinding,
- SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding } ) {
+ for (auto fill : { SkPath::kWinding_FillType,
+ SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType } ) {
path.setFillType(fill);
canvas->save();
canvas->clipRect({0, 10, 80, 70});
diff --git a/docs/examples/Path_ConvertToNonInverseFillType.cpp b/docs/examples/Path_ConvertToNonInverseFillType.cpp
index d60857f..12e2d1f 100644
--- a/docs/examples/Path_ConvertToNonInverseFillType.cpp
+++ b/docs/examples/Path_ConvertToNonInverseFillType.cpp
@@ -3,25 +3,25 @@
#include "tools/fiddle/examples.h"
// HASH=319f6b124458dcc0f9ce4d7bbde65810
REG_FIDDLE(Path_ConvertToNonInverseFillType, 256, 256, true, 0) {
-#define nameValue(fill) { SkPathFillType::fill, #fill }
+#define nameValue(fill) { SkPath::fill, #fill }
void draw(SkCanvas* canvas) {
struct {
- SkPathFillType fill;
+ SkPath::FillType fill;
const char* name;
} fills[] = {
- nameValue(kWinding),
- nameValue(kEvenOdd),
- nameValue(kInverseWinding),
- nameValue(kInverseEvenOdd),
+ nameValue(kWinding_FillType),
+ nameValue(kEvenOdd_FillType),
+ nameValue(kInverseWinding_FillType),
+ nameValue(kInverseEvenOdd_FillType),
};
for (unsigned i = 0; i < SK_ARRAY_COUNT(fills); ++i) {
- if (fills[i].fill != (SkPathFillType) i) {
+ if (fills[i].fill != (SkPath::FillType) i) {
SkDebugf("fills array order does not match FillType enum order");
break;
}
SkDebugf("ConvertToNonInverseFillType(%s) == %s\n", fills[i].name,
- fills[(int) SkPathFillType_ConvertToNonInverse(fills[i].fill)].name);
+ fills[(int) SkPath::ConvertToNonInverseFillType(fills[i].fill)].name);
}
}
} // END FIDDLE
diff --git a/docs/examples/Path_FillType_a.cpp b/docs/examples/Path_FillType_a.cpp
index d19c2c3..caed39a 100644
--- a/docs/examples/Path_FillType_a.cpp
+++ b/docs/examples/Path_FillType_a.cpp
@@ -14,8 +14,8 @@
SkRect clipRect = {0, 0, 51, 100};
canvas->drawPath(path, strokePaint);
SkPaint fillPaint;
- for (auto fillType : { SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd } ) {
+ for (auto fillType : { SkPath::kWinding_FillType, SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType, SkPath::kInverseEvenOdd_FillType } ) {
canvas->translate(51, 0);
canvas->save();
canvas->clipRect(clipRect);
diff --git a/docs/examples/Path_FillType_b.cpp b/docs/examples/Path_FillType_b.cpp
index 4c1b83c..110117e 100644
--- a/docs/examples/Path_FillType_b.cpp
+++ b/docs/examples/Path_FillType_b.cpp
@@ -22,8 +22,8 @@
canvas->scale(.5f, .5f);
canvas->drawString("inverse", 384, 150, textPaint);
SkPaint fillPaint;
- for (auto fillType : { SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd } ) {
+ for (auto fillType : { SkPath::kWinding_FillType, SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType, SkPath::kInverseEvenOdd_FillType } ) {
canvas->save();
canvas->clipRect(clipRect);
path.setFillType(fillType);
diff --git a/docs/examples/Path_IsInverseFillType.cpp b/docs/examples/Path_IsInverseFillType.cpp
index 3d2e5f0..1b2cb10 100644
--- a/docs/examples/Path_IsInverseFillType.cpp
+++ b/docs/examples/Path_IsInverseFillType.cpp
@@ -3,20 +3,20 @@
#include "tools/fiddle/examples.h"
// HASH=1453856a9d0c73e8192bf298c4143563
REG_FIDDLE(Path_IsInverseFillType, 256, 256, true, 0) {
-#define nameValue(fill) { SkPathFillType::fill, #fill }
+#define nameValue(fill) { SkPath::fill, #fill }
void draw(SkCanvas* canvas) {
struct {
- SkPathFillType fill;
+ SkPath::FillType fill;
const char* name;
} fills[] = {
- nameValue(kWinding),
- nameValue(kEvenOdd),
- nameValue(kInverseWinding),
- nameValue(kInverseEvenOdd),
+ nameValue(kWinding_FillType),
+ nameValue(kEvenOdd_FillType),
+ nameValue(kInverseWinding_FillType),
+ nameValue(kInverseEvenOdd_FillType),
};
for (auto fill: fills ) {
- SkDebugf("IsInverseFillType(%s) == %s\n", fill.name, SkPathFillType_IsInverse(fill.fill) ?
+ SkDebugf("IsInverseFillType(%s) == %s\n", fill.name, SkPath::IsInverseFillType(fill.fill) ?
"true" : "false");
}
}
diff --git a/docs/examples/Path_dumpHex.cpp b/docs/examples/Path_dumpHex.cpp
index 25af4cd..2578ab5 100644
--- a/docs/examples/Path_dumpHex.cpp
+++ b/docs/examples/Path_dumpHex.cpp
@@ -7,7 +7,7 @@
SkPath path, copy;
path.lineTo(6.f / 7, 2.f / 3);
path.dumpHex();
- copy.setFillType(SkPathFillType::kWinding);
+ copy.setFillType(SkPath::kWinding_FillType);
copy.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
copy.lineTo(SkBits2Float(0x3f5b6db7), SkBits2Float(0x3f2aaaab)); // 0.857143f, 0.666667f
SkDebugf("path is " "%s" "equal to copy\n", path == copy ? "" : "not ");
diff --git a/docs/examples/Path_dump_2.cpp b/docs/examples/Path_dump_2.cpp
index 7220d0c..37defe2 100644
--- a/docs/examples/Path_dump_2.cpp
+++ b/docs/examples/Path_dump_2.cpp
@@ -7,7 +7,7 @@
SkPath path, copy;
path.lineTo(6.f / 7, 2.f / 3);
path.dump();
- copy.setFillType(SkPathFillType::kWinding);
+ copy.setFillType(SkPath::kWinding_FillType);
copy.moveTo(0, 0);
copy.lineTo(0.857143f, 0.666667f);
SkDebugf("path is " "%s" "equal to copy\n", path == copy ? "" : "not ");
diff --git a/docs/examples/Path_getFillType.cpp b/docs/examples/Path_getFillType.cpp
index f4e1cc7..6ac58d1 100644
--- a/docs/examples/Path_getFillType.cpp
+++ b/docs/examples/Path_getFillType.cpp
@@ -6,9 +6,9 @@
void draw(SkCanvas* canvas) {
SkPath path;
SkDebugf("default path fill type is %s\n",
- path.getNewFillType() == SkPathFillType::kWinding ? "kWinding" :
- path.getNewFillType() == SkPathFillType::kEvenOdd ? "kEvenOdd" :
- path.getNewFillType() == SkPathFillType::kInverseWinding ? "kInverseWinding" :
- "kInverseEvenOdd");
+ path.getFillType() == SkPath::kWinding_FillType ? "kWinding_FillType" :
+ path.getFillType() == SkPath::kEvenOdd_FillType ? "kEvenOdd_FillType" :
+ path.getFillType() == SkPath::kInverseWinding_FillType ? "kInverseWinding_FillType" :
+ "kInverseEvenOdd_FillType");
}
} // END FIDDLE
diff --git a/docs/examples/Path_reset.cpp b/docs/examples/Path_reset.cpp
index b720d33..8448db1 100644
--- a/docs/examples/Path_reset.cpp
+++ b/docs/examples/Path_reset.cpp
@@ -5,7 +5,7 @@
REG_FIDDLE(Path_reset, 256, 256, true, 0) {
void draw(SkCanvas* canvas) {
SkPath path1, path2;
- path1.setFillType(SkPathFillType::kInverseWinding);
+ path1.setFillType(SkPath::kInverseWinding_FillType);
path1.addRect({10, 20, 30, 40});
SkDebugf("path1 %c= path2\n", path1 == path2 ? '=' : '!');
path1.reset();
diff --git a/docs/examples/Path_rewind.cpp b/docs/examples/Path_rewind.cpp
index 74a2683..6776191 100644
--- a/docs/examples/Path_rewind.cpp
+++ b/docs/examples/Path_rewind.cpp
@@ -5,7 +5,7 @@
REG_FIDDLE(Path_rewind, 256, 256, true, 0) {
void draw(SkCanvas* canvas) {
SkPath path1, path2;
- path1.setFillType(SkPathFillType::kInverseWinding);
+ path1.setFillType(SkPath::kInverseWinding_FillType);
path1.addRect({10, 20, 30, 40});
SkDebugf("path1 %c= path2\n", path1 == path2 ? '=' : '!');
path1.rewind();
diff --git a/docs/examples/Path_setFillType.cpp b/docs/examples/Path_setFillType.cpp
index 937fb69..0bed8a8 100644
--- a/docs/examples/Path_setFillType.cpp
+++ b/docs/examples/Path_setFillType.cpp
@@ -5,7 +5,7 @@
REG_FIDDLE(Path_setFillType, 256, 64, false, 0) {
void draw(SkCanvas* canvas) {
SkPath path;
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
SkPaint paint;
paint.setColor(SK_ColorBLUE);
canvas->drawPath(path, paint);
diff --git a/docs/examples/Region_op_6.cpp b/docs/examples/Region_op_6.cpp
index 9fbf850..13c9205 100644
--- a/docs/examples/Region_op_6.cpp
+++ b/docs/examples/Region_op_6.cpp
@@ -9,9 +9,9 @@
paint.setTextSize(128);
SkPath xPath, opPath;
paint.getTextPath("X", 1, 20, 110, &xPath);
- xPath.setFillType(SkPathFillType::kInverseWinding);
+ xPath.setFillType(SkPath::kInverseWinding_FillType);
opPath.addCircle(64, 64, frame * 64);
- opPath.setFillType(SkPathFillType::kInverseWinding);
+ opPath.setFillType(SkPath::kInverseWinding_FillType);
SkRegion xRegion, opRegion, rectRegion;
SkIRect drawBounds = {0, 0, 128, 128};
opRegion.setPath(opPath, SkRegion(drawBounds));