diff options
| author |  Mike Klein <mtklein@google.com> | 2018-06-12 21:07:48 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 21:07:54 +0000 |
| commit | 2652223767c00c8b4ff5d805fd015a9b43910014 (patch) | |
| tree | 5de0554a4d38bf1db95f5d812adb99104543f2d8 /tests/FitsInTest.cpp | |
| parent | 8523b6bd0d22083266d990191764a0460885fd6e (diff) | |
Revert "simplify SkTFitsIn"
This reverts commit b82c3d6ff2ac62c8a14b38b0d658a51e7d8cf81e.
Reason for revert: SkTFitsIn makes its way into public headers via SkTo<T>, so it cannot use C++14isms.
Original change's description:
> simplify SkTFitsIn
>
> Now that we're C++14, a constexpr SkTFitsIn() is a lot easier.
> All the old tests still pass, and one new added.
>
> Updated the comments a bit for correctness and readability.
>
> Change-Id: I0f60e32e545fe4f2fb14e66a2bf25d562dbd680f
> Reviewed-on: https://skia-review.googlesource.com/133831
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,halcanary@google.com,bungeman@google.com
Change-Id: Icfb19c77b450cf3525d11225d4237f9bfa68c7fc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/134440
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'tests/FitsInTest.cpp')
| -rw-r--r-- | tests/FitsInTest.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp index 5d21b8d347..6a46b67bed 100644 --- a/tests/FitsInTest.cpp +++ b/tests/FitsInTest.cpp @@ -14,8 +14,6 @@ #define TEST(S, s, D, expected) REPORTER_ASSERT(reporter, (SkTFitsIn<D>((S)(s)) == (expected))) DEF_TEST(FitsIn, reporter) { - TEST(uint16_t, 257, int8_t, false); - TEST(int32_t, 1, int8_t, true); TEST(int32_t, -1, int8_t, true); TEST(int32_t, (int32_t)(std::numeric_limits<int8_t>::max)(), int8_t, true); |