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/TestConfigParsing.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/TestConfigParsing.cpp')
| -rw-r--r-- | tests/TestConfigParsing.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp index be149d64e9..747ad10194 100644 --- a/tests/TestConfigParsing.cpp +++ b/tests/TestConfigParsing.cpp @@ -158,10 +158,9 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorSpace()); REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorSpace()->gammaIsLinear()); - const SkMatrix44* srgbXYZ = as_CSB(srgbColorSpace)->toXYZD50(); + const SkMatrix44* srgbXYZ = srgbColorSpace->toXYZD50(); SkASSERT(srgbXYZ); - const SkMatrix44* config25XYZ = - as_CSB(configs[24]->asConfigGpu()->getColorSpace())->toXYZD50(); + const SkMatrix44* config25XYZ = configs[24]->asConfigGpu()->getColorSpace()->toXYZD50(); SkASSERT(config25XYZ); REPORTER_ASSERT(reporter, *config25XYZ == *srgbXYZ); REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType); @@ -169,15 +168,14 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorSpace()); REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorSpace()->gammaIsLinear()); - const SkMatrix44* config41XYZ = - as_CSB(configs[32]->asConfigGpu()->getColorSpace())->toXYZD50(); + const SkMatrix44* config41XYZ = configs[32]->asConfigGpu()->getColorSpace()->toXYZD50(); SkASSERT(config41XYZ); REPORTER_ASSERT(reporter, *config41XYZ != *srgbXYZ); REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorSpace()); REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorSpace()->gammaIsLinear()); - REPORTER_ASSERT(reporter, *as_CSB(configs[33]->asConfigGpu()->getColorSpace())->toXYZD50() != - *as_CSB(srgbColorSpace)->toXYZD50()); + REPORTER_ASSERT(reporter, *configs[33]->asConfigGpu()->getColorSpace()->toXYZD50() != + *srgbColorSpace->toXYZD50()); REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getContextType() == GrContextFactory::kGL_ContextType); REPORTER_ASSERT(reporter, SkToBool(configs[34]->asConfigGpu()->getContextOverrides() & |