hide complex versions of isOval and isRRect
Bug: skia:
Change-Id: I9fa899d409470f424fdfbef5b0c3bb528bcce40e
Reviewed-on: https://skia-review.googlesource.com/108660
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 2db7d81..3b497e5 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -2508,14 +2508,16 @@
SkPath::Direction dir0, dir1;
unsigned start0, start1;
REPORTER_ASSERT(reporter, readBack.isOval(nullptr) == p.isOval(nullptr));
- if (p.isOval(&oval0, &dir0, &start0) && readBack.isOval(&oval1, &dir1, &start1)) {
+ if (SkPathPriv::IsOval(p, &oval0, &dir0, &start0) &&
+ SkPathPriv::IsOval(readBack, &oval1, &dir1, &start1)) {
REPORTER_ASSERT(reporter, oval0 == oval1);
REPORTER_ASSERT(reporter, dir0 == dir1);
REPORTER_ASSERT(reporter, start0 == start1);
}
REPORTER_ASSERT(reporter, readBack.isRRect(nullptr) == p.isRRect(nullptr));
SkRRect rrect0, rrect1;
- if (p.isRRect(&rrect0, &dir0, &start0) && readBack.isRRect(&rrect1, &dir1, &start1)) {
+ if (SkPathPriv::IsRRect(p, &rrect0, &dir0, &start0) &&
+ SkPathPriv::IsRRect(readBack, &rrect1, &dir1, &start1)) {
REPORTER_ASSERT(reporter, rrect0 == rrect1);
REPORTER_ASSERT(reporter, dir0 == dir1);
REPORTER_ASSERT(reporter, start0 == start1);
@@ -3291,7 +3293,7 @@
REPORTER_ASSERT(reporter, path.isOval(&rect) == expectedCircle);
SkPath::Direction isOvalDir;
unsigned isOvalStart;
- if (path.isOval(&rect, &isOvalDir, &isOvalStart)) {
+ if (SkPathPriv::IsOval(path, &rect, &isOvalDir, &isOvalStart)) {
REPORTER_ASSERT(reporter, rect.height() == rect.width());
REPORTER_ASSERT(reporter, SkPathPriv::AsFirstDirection(isOvalDir) == expectedDir);
SkPath tmpPath;
@@ -3534,7 +3536,7 @@
path.transform(m, &tmp);
// an oval rotated 90 degrees is still an oval. The start index changes from 1 to 2. Direction
// is unchanged.
- REPORTER_ASSERT(reporter, tmp.isOval(nullptr, &dir, &start));
+ REPORTER_ASSERT(reporter, SkPathPriv::IsOval(tmp, nullptr, &dir, &start));
REPORTER_ASSERT(reporter, 2 == start);
REPORTER_ASSERT(reporter, SkPath::kCW_Direction == dir);
@@ -3574,7 +3576,7 @@
tmp.reset();
tmp.addOval(rect);
path = tmp;
- REPORTER_ASSERT(reporter, path.isOval(nullptr, &dir, &start));
+ REPORTER_ASSERT(reporter, SkPathPriv::IsOval(path, nullptr, &dir, &start));
REPORTER_ASSERT(reporter, SkPath::kCW_Direction == dir);
REPORTER_ASSERT(reporter, 1 == start);
}
@@ -3739,7 +3741,7 @@
SkRect r = SkRect::MakeEmpty();
SkPath::Direction d = SkPath::kCCW_Direction;
unsigned s = ~0U;
- bool isOval = path.isOval(&r, &d, &s);
+ bool isOval = SkPathPriv::IsOval(path, &r, &d, &s);
REPORTER_ASSERT(reporter, isOval);
SkPath recreatedPath;
recreatedPath.addOval(r, d, s);