diff options
author | Mike Klein <mtklein@google.com> | 2017-12-14 12:10:05 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-14 12:10:12 +0000 |
commit | 63789ccc03f6e63caa3e6c74fee9ad18e073cecf (patch) | |
tree | fdfdf4e8627c10eb7d579ab41140a5c2e25026b3 /src/gpu | |
parent | 32af335e7abbf562dad8f1bd21bb013610b8b021 (diff) |
Revert "Remove SkColorSpace_Base::MakeNamed, along with most uses of Adobe RGB"
This reverts commit 411b8ea74d66d08252d9b617d7e7d458604dbc2e.
Reason for revert: a couple layout tests in the roll. :/
Original change's description:
> Remove SkColorSpace_Base::MakeNamed, along with most uses of Adobe RGB
>
> Bug: skia:
> Change-Id: If5935eac48184bc8cbe4db21dac4d6033a8704e6
> Reviewed-on: https://skia-review.googlesource.com/84200
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,brianosman@google.com
Change-Id: I6d2eb57b613035ec26da15218182c808bed364ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/84920
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu')
-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 4c35264643..bd190a42ee 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 color-spin sRGB + // sRGB or Adobe gColorSpaces[1] = SkColorSpace::MakeSRGB(); - gColorSpaces[2] = SkColorSpace::MakeSRGB()->makeColorSpin(); + gColorSpaces[2] = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); } 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> spin = SkColorSpace::MakeSRGB()->makeColorSpin(); + sk_sp<SkColorSpace> adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); // No gamut change gXforms[0] = nullptr; - // 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()); + // 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()); } return gXforms[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gXforms)))]; } |