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>
diff --git a/gm/arcto.cpp b/gm/arcto.cpp
index ba0207c..f28d86c 100644
--- a/gm/arcto.cpp
+++ b/gm/arcto.cpp
@@ -79,13 +79,13 @@
SkScalar ovalHeight = oval.height() / oHeight;
svgArc.moveTo(oval.fLeft, oval.fTop);
svgArc.arcTo(oval.width() / 2, ovalHeight, SkIntToScalar(angle), SkPath::kSmall_ArcSize,
- SkPathDirection::kCW, oval.right(), oval.bottom());
+ SkPath::kCW_Direction, oval.right(), oval.bottom());
canvas->drawPath(svgArc, paint);
svgArc.reset();
svgArc.moveTo(oval.fLeft + 100, oval.fTop + 100);
svgArc.arcTo(oval.width() / 2, ovalHeight, SkIntToScalar(angle), SkPath::kLarge_ArcSize,
- SkPathDirection::kCCW, oval.right(), oval.bottom() + 100);
+ SkPath::kCCW_Direction, oval.right(), oval.bottom() + 100);
canvas->drawPath(svgArc, paint);
oval.offset(50, 0);
svgArc.reset();
diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp
index b213838..025b693 100644
--- a/gm/circularclips.cpp
+++ b/gm/circularclips.cpp
@@ -28,8 +28,8 @@
fY = 50;
fR = 40;
- fCircle1.addCircle(fX1, fY, fR, SkPathDirection::kCW);
- fCircle2.addCircle(fX2, fY, fR, SkPathDirection::kCW);
+ fCircle1.addCircle(fX1, fY, fR, SkPath::kCW_Direction);
+ fCircle2.addCircle(fX2, fY, fR, SkPath::kCW_Direction);
}
diff --git a/gm/collapsepaths.cpp b/gm/collapsepaths.cpp
index 82233c9..7335171 100644
--- a/gm/collapsepaths.cpp
+++ b/gm/collapsepaths.cpp
@@ -21,7 +21,7 @@
path.moveTo( 370.50653076171875, 73.684051513671875);
path.lineTo( 525.02093505859375, 208.6413726806640625);
path.lineTo( 478.403564453125, 213.5998992919921875);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -70,7 +70,7 @@
path.moveTo(154.6182708740234375, 188.230926513671875);
path.lineTo( 430.242095947265625, 546.76605224609375);
path.lineTo( 373.1005859375, 559.0906982421875);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -83,7 +83,7 @@
path.moveTo(39.09362030029296875, 47.59223175048828125);
path.lineTo(108.7822418212890625, 138.244110107421875);
path.lineTo(94.33460235595703125, 141.360260009765625);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -96,7 +96,7 @@
path.moveTo(40.33458709716796875, 49.10297393798828125);
path.lineTo(112.2353668212890625, 142.6324462890625);
path.lineTo(97.32910919189453125, 145.8475189208984375);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -109,7 +109,7 @@
path.moveTo( 34.50, 42.00);
path.lineTo( 96.00, 122.00);
path.lineTo( 83.25, 124.75);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -125,7 +125,7 @@
path.lineTo(SkDoubleToScalar(100.167), SkDoubleToScalar(140.096));
path.lineTo(SkDoubleToScalar( 99.0364), SkDoubleToScalar(140.364));
path.lineTo(SkDoubleToScalar( 94.25), SkDoubleToScalar(141.50));
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index 340d62b..46e2aad 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -67,27 +67,27 @@
fRects[0].setLTRB(xB, yB, xE, yE);
fRRects[0].setRectXY(fRects[0], 7, 7);
- fPaths[0].addRRect(SkRRect::MakeRectXY(fRects[0], 5, 5));
+ fPaths[0].addRoundRect(fRects[0], 5, 5);
fRectColors[0] = SK_ColorRED;
fRects[1].setLTRB(xA, yA, xD, yD);
fRRects[1].setRectXY(fRects[1], 7, 7);
- fPaths[1].addRRect(SkRRect::MakeRectXY(fRects[1], 5, 5));
+ fPaths[1].addRoundRect(fRects[1], 5, 5);
fRectColors[1] = SK_ColorGREEN;
fRects[2].setLTRB(xC, yA, xF, yD);
fRRects[2].setRectXY(fRects[2], 7, 7);
- fPaths[2].addRRect(SkRRect::MakeRectXY(fRects[2], 5, 5));
+ fPaths[2].addRoundRect(fRects[2], 5, 5);
fRectColors[2] = SK_ColorBLUE;
fRects[3].setLTRB(xA, yC, xD, yF);
fRRects[3].setRectXY(fRects[3], 7, 7);
- fPaths[3].addRRect(SkRRect::MakeRectXY(fRects[3], 5, 5));
+ fPaths[3].addRoundRect(fRects[3], 5, 5);
fRectColors[3] = SK_ColorYELLOW;
fRects[4].setLTRB(xC, yC, xF, yF);
fRRects[4].setRectXY(fRects[4], 7, 7);
- fPaths[4].addRRect(SkRRect::MakeRectXY(fRects[4], 5, 5));
+ fPaths[4].addRoundRect(fRects[4], 5, 5);
fRectColors[4] = SK_ColorCYAN;
const SkClipOp ops[] = {
diff --git a/gm/convex_all_line_paths.cpp b/gm/convex_all_line_paths.cpp
index 1936dfc..2fa2adf 100644
--- a/gm/convex_all_line_paths.cpp
+++ b/gm/convex_all_line_paths.cpp
@@ -183,7 +183,7 @@
SkISize onISize() override { return SkISize::Make(kGMWidth, kGMHeight); }
bool runAsBench() const override { return true; }
- static SkPath GetPath(int index, SkPathDirection dir) {
+ static SkPath GetPath(int index, SkPath::Direction dir) {
std::unique_ptr<SkPoint[]> data(nullptr);
const SkPoint* points;
int numPts;
@@ -238,7 +238,7 @@
SkPath path;
- if (SkPathDirection::kCW == dir) {
+ if (SkPath::kCW_Direction == dir) {
path.moveTo(points[0]);
for (int i = 1; i < numPts; ++i) {
path.lineTo(points[i]);
@@ -273,7 +273,7 @@
SkPoint center;
{
- SkPath path = GetPath(index, SkPathDirection::kCW);
+ SkPath path = GetPath(index, SkPath::kCW_Direction);
if (offset->fX+path.getBounds().width() > kGMWidth) {
offset->fX = 0;
offset->fY += kMaxPathHeight;
@@ -290,7 +290,7 @@
}
const SkColor colors[2] = { SK_ColorBLACK, SK_ColorWHITE };
- const SkPathDirection dirs[2] = { SkPathDirection::kCW, SkPathDirection::kCCW };
+ const SkPath::Direction dirs[2] = { SkPath::kCW_Direction, SkPath::kCCW_Direction };
const float scales[] = { 1.0f, 0.75f, 0.5f, 0.25f, 0.1f, 0.01f, 0.001f };
const SkPaint::Join joins[3] = { SkPaint::kRound_Join,
SkPaint::kBevel_Join,
diff --git a/gm/crbug_908646.cpp b/gm/crbug_908646.cpp
index 3d11276..843799e 100644
--- a/gm/crbug_908646.cpp
+++ b/gm/crbug_908646.cpp
@@ -14,7 +14,7 @@
SkPaint paint;
paint.setAntiAlias(true);
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(50, 50);
path.lineTo(50, 300);
path.lineTo(250, 300);
diff --git a/gm/distantclip.cpp b/gm/distantclip.cpp
index a213a2a..b0da264 100644
--- a/gm/distantclip.cpp
+++ b/gm/distantclip.cpp
@@ -38,7 +38,7 @@
rec->save();
SkRect r = SkRect::MakeXYWH(-kExtents, kOffset - kExtents, 2 * kExtents, 2 * kExtents);
SkPath p;
- p.addRRect(SkRRect::MakeRectXY(r, 5, 5));
+ p.addRoundRect(r, 5, 5);
rec->clipPath(p, true);
rec->drawColor(SK_ColorGREEN);
rec->restore();
diff --git a/gm/inversepaths.cpp b/gm/inversepaths.cpp
index 7ddf088..0726983 100644
--- a/gm/inversepaths.cpp
+++ b/gm/inversepaths.cpp
@@ -34,7 +34,7 @@
static SkPath generate_circle(SkScalar cx, SkScalar cy, SkScalar d) {
SkPath path;
- path.addCircle(cx, cy, d/2, SkPathDirection::kCW);
+ path.addCircle(cx, cy, d/2, SkPath::kCW_Direction);
return path;
}
diff --git a/gm/nested.cpp b/gm/nested.cpp
index 9c1370c..859077f 100644
--- a/gm/nested.cpp
+++ b/gm/nested.cpp
@@ -53,7 +53,7 @@
kShapeCount
};
- static void AddShape(SkPath* path, const SkRect& rect, Shapes shape, SkPathDirection dir) {
+ static void AddShape(SkPath* path, const SkRect& rect, Shapes shape, SkPath::Direction dir) {
switch (shape) {
case kRect_Shape:
path->addRect(rect, dir);
@@ -105,9 +105,9 @@
for (size_t innerRect = 0; innerRect < SK_ARRAY_COUNT(innerRects); ++innerRect) {
SkPath path;
- AddShape(&path, outerRect, (Shapes) outerShape, SkPathDirection::kCW);
+ AddShape(&path, outerRect, (Shapes) outerShape, SkPath::kCW_Direction);
AddShape(&path, innerRects[innerRect], (Shapes) innerShape,
- SkPathDirection::kCCW);
+ SkPath::kCCW_Direction);
canvas->save();
if (fFlipped) {
diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp
index 37715f1..33a6841 100644
--- a/gm/patheffects.cpp
+++ b/gm/patheffects.cpp
@@ -148,9 +148,9 @@
path.reset();
SkRect r = { 0, 0, 250, 120 };
- path.addOval(r, SkPathDirection::kCW);
+ path.addOval(r, SkPath::kCW_Direction);
r.inset(50, 50);
- path.addRect(r, SkPathDirection::kCCW);
+ path.addRect(r, SkPath::kCCW_Direction);
canvas->translate(320, 20);
for (size_t i = 0; i < SK_ARRAY_COUNT(gPE2); i++) {
diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp
index 529bf72..6a00f39 100644
--- a/gm/pathfill.cpp
+++ b/gm/pathfill.cpp
@@ -21,7 +21,7 @@
static SkScalar make_frame(SkPath* path) {
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
SkIntToScalar(630), SkIntToScalar(470) };
- path->addRRect(SkRRect::MakeRectXY(r, 15, 15));
+ path->addRoundRect(r, SkIntToScalar(15), SkIntToScalar(15));
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
diff --git a/gm/pathopsskpclip.cpp b/gm/pathopsskpclip.cpp
index a2d7cee..75e7bd8 100644
--- a/gm/pathopsskpclip.cpp
+++ b/gm/pathopsskpclip.cpp
@@ -42,7 +42,7 @@
SkIntToScalar(400),
SkIntToScalar(700)
};
- p.addRRect(SkRRect::MakeRectXY(r, 50, 50));
+ p.addRoundRect(r, SkIntToScalar(50), SkIntToScalar(50));
rec->clipPath(p, true);
rec->translate(SkIntToScalar(250), SkIntToScalar(250));
rec->clipPath(p, true);