diff options
| author |  Mike Reed <reed@google.com> | 2018-01-17 12:20:04 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-17 17:38:57 +0000 |
| commit | 8008df1080f5623bf1cf13c713082c2b732d4eb2 (patch) | |
| tree | 2c0914aa9f49f5e97c68325f58d2eebe7a41faf3 /tests | |
| parent | 33a86560ce12b549c2d69e3f891e0cae3173aed9 (diff) | |
handle large rects, rename helper
To fix gm/bigrect, needed to do adjust "largest" rect so it doesn't become empty when round-tripping with SkRect/SkIRect.
I renamed it after this.
Bug: skia:
Change-Id: I747782c8456da603cf298275d2300ea1996e7629
Reviewed-on: https://skia-review.googlesource.com/95563
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RectTest.cpp | 4 | ||||
| -rw-r--r-- | tests/SGTest.cpp | 4 | ||||
| -rw-r--r-- | tests/WindowRectanglesTest.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/RectTest.cpp b/tests/RectTest.cpp index 39ba073725..6a588b7b6c 100644 --- a/tests/RectTest.cpp +++ b/tests/RectTest.cpp @@ -96,11 +96,11 @@ DEF_TEST(Rect_grow, reporter) { } DEF_TEST(Rect_largest, reporter) { - REPORTER_ASSERT(reporter, !SkRectPriv::MakeILargest().isEmpty()); + REPORTER_ASSERT(reporter, !SkRectPriv::MakeILarge().isEmpty()); REPORTER_ASSERT(reporter, SkRectPriv::MakeILargestInverted().isEmpty()); REPORTER_ASSERT(reporter, !SkRectPriv::MakeLargest().isEmpty()); - REPORTER_ASSERT(reporter, !SkRectPriv::MakeLargestS32().isEmpty()); + REPORTER_ASSERT(reporter, !SkRectPriv::MakeLargeS32().isEmpty()); REPORTER_ASSERT(reporter, SkRectPriv::MakeLargestInverted().isEmpty()); } diff --git a/tests/SGTest.cpp b/tests/SGTest.cpp index b0101bc034..1228e666e7 100644 --- a/tests/SGTest.cpp +++ b/tests/SGTest.cpp @@ -68,7 +68,7 @@ static void inval_test1(skiatest::Reporter* reporter) { // Initial revalidation. check_inval(reporter, root, SkRect::MakeWH(100, 100), - SkRectPriv::MakeLargestS32(), + SkRectPriv::MakeLargeS32(), nullptr); } @@ -138,7 +138,7 @@ static void inval_test2(skiatest::Reporter* reporter) { // Initial revalidation. check_inval(reporter, root, SkRect::MakeWH(100, 100), - SkRectPriv::MakeLargestS32(), + SkRectPriv::MakeLargeS32(), nullptr); } diff --git a/tests/WindowRectanglesTest.cpp b/tests/WindowRectanglesTest.cpp index 84fdca2237..d6c4756168 100644 --- a/tests/WindowRectanglesTest.cpp +++ b/tests/WindowRectanglesTest.cpp @@ -48,7 +48,7 @@ DEF_TEST(WindowRectangles, reporter) { REPORTER_ASSERT(reporter, B.data() != A.data()); REPORTER_ASSERT(reporter, B != A); - B.addWindow(SkRectPriv::MakeILargest()); + B.addWindow(SkRectPriv::MakeILarge()); REPORTER_ASSERT(reporter, B != A); REPORTER_ASSERT(reporter, !memcmp(A.data(), windowData, @@ -56,7 +56,7 @@ DEF_TEST(WindowRectangles, reporter) { REPORTER_ASSERT(reporter, !memcmp(B.data(), windowData, (GrWindowRectangles::kMaxWindows - 1) * sizeof(SkIRect))); REPORTER_ASSERT(reporter, - B.data()[GrWindowRectangles::kMaxWindows - 1] == SkRectPriv::MakeILargest()); + B.data()[GrWindowRectangles::kMaxWindows - 1] == SkRectPriv::MakeILarge()); } { GrWindowRectangles A(wr), B(wr); |