diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-14 10:27:21 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-14 16:11:31 +0000 |
| commit | 10b814260a59927aa209cbee7b47f43aa0142e41 (patch) | |
| tree | 099216a882e6e5ab41ec15f9c50e613406ae2c8b /src/gpu/GrTestUtils.cpp | |
| parent | c0cec873e6f9bae9c8c620c38db38b0b15532518 (diff) | |
Remove SkColorSpace_Base::MakeNamed, along with most uses of Adobe RGB
Bug: skia:
Change-Id: Ic914aacc4c47200714d66cf4487932bcb8a7693a
Reviewed-on: https://skia-review.googlesource.com/85040
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/gpu/GrTestUtils.cpp')
| -rw-r--r-- | src/gpu/GrTestUtils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp index bd190a42ee..4c35264643 100644 --- a/src/gpu/GrTestUtils.cpp +++ b/src/gpu/GrTestUtils.cpp @@ -309,9 +309,9 @@ sk_sp<SkColorSpace> TestColorSpace(SkRandom* random) { gOnce = true; // No color space (legacy mode) gColorSpaces[0] = nullptr; - // sRGB or Adobe + // sRGB or color-spin sRGB gColorSpaces[1] = SkColorSpace::MakeSRGB(); - gColorSpaces[2] = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); + gColorSpaces[2] = SkColorSpace::MakeSRGB()->makeColorSpin(); } return gColorSpaces[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gColorSpaces)))]; } @@ -322,13 +322,13 @@ sk_sp<GrColorSpaceXform> TestColorXform(SkRandom* random) { if (!gOnce) { gOnce = true; sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB(); - sk_sp<SkColorSpace> adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); + sk_sp<SkColorSpace> spin = SkColorSpace::MakeSRGB()->makeColorSpin(); // No gamut change gXforms[0] = nullptr; - // To larger gamut (with automatic transfer function) - gXforms[1] = GrColorSpaceXform::Make(srgb.get(), kSRGBA_8888_GrPixelConfig, adobe.get()); - // To smaller gamut (with manual transfer function) - gXforms[2] = GrColorSpaceXform::Make(adobe.get(), kRGBA_8888_GrPixelConfig, srgb.get()); + // To different gamut (with automatic transfer function) + gXforms[1] = GrColorSpaceXform::Make(srgb.get(), kSRGBA_8888_GrPixelConfig, spin.get()); + // To different gamut (with manual transfer function) + gXforms[2] = GrColorSpaceXform::Make(spin.get(), kRGBA_8888_GrPixelConfig, srgb.get()); } return gXforms[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gXforms)))]; } |