diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-12 14:09:31 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-12 19:34:29 +0000 |
| commit | 36703d9d368050a20764b5336534bd718fd00a6e (patch) | |
| tree | c452daef0a4d61f6550741cf79d2ee4c755750c2 /tests/ColorSpaceTest.cpp | |
| parent | 09757b29feeb1e7a4bc73dcf07c960e06f20cd66 (diff) | |
Push much of the SkColorSpace_Base interface up to SkColorSpace
Some pieces still remain, but the next step looks less mechanical,
so I wanted to land this piece independently.
Bug: skia:
Change-Id: Ie63afcfa08af2f6e4996911fa2225c43441dbfb2
Reviewed-on: https://skia-review.googlesource.com/84120
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests/ColorSpaceTest.cpp')
| -rw-r--r-- | tests/ColorSpaceTest.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index d180cda425..5aa9f17e94 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -24,11 +24,9 @@ static void test_space(skiatest::Reporter* r, SkColorSpace* space, const SkGammaNamed expectedGamma) { REPORTER_ASSERT(r, nullptr != space); - SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(space)->type()); - SkColorSpace_XYZ* csXYZ = static_cast<SkColorSpace_XYZ*>(space); - REPORTER_ASSERT(r, expectedGamma == csXYZ->gammaNamed()); + REPORTER_ASSERT(r, expectedGamma == space->gammaNamed()); - const SkMatrix44& mat = *csXYZ->toXYZD50(); + const SkMatrix44& mat = *space->toXYZD50(); const float src[] = { 1, 0, 0, 1, 0, 1, 0, 1, @@ -211,9 +209,7 @@ DEF_TEST(ColorSpace_Named, r) { auto cs = SkColorSpace_Base::MakeNamed(rec.fNamed); REPORTER_ASSERT(r, cs); if (cs) { - SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(cs)->type()); - SkColorSpace_XYZ* csXYZ = static_cast<SkColorSpace_XYZ*>(cs.get()); - REPORTER_ASSERT(r, rec.fExpectedGamma == csXYZ->gammaNamed()); + REPORTER_ASSERT(r, rec.fExpectedGamma == cs->gammaNamed()); } } @@ -477,8 +473,8 @@ DEF_TEST(ColorSpace_MatrixHash, r) { srgbMat.set3x3RowMajorf(gSRGB_toXYZD50); sk_sp<SkColorSpace> strange = SkColorSpace::MakeRGB(fn, srgbMat); - REPORTER_ASSERT(r, *as_CSB(srgb)->toXYZD50() == *as_CSB(strange)->toXYZD50()); - REPORTER_ASSERT(r, as_CSB(srgb)->toXYZD50Hash() == as_CSB(strange)->toXYZD50Hash()); + REPORTER_ASSERT(r, *srgb->toXYZD50() == *strange->toXYZD50()); + REPORTER_ASSERT(r, srgb->toXYZD50Hash() == strange->toXYZD50Hash()); } DEF_TEST(ColorSpace_IsSRGB, r) { |