diff options
| author | Brian Osman <brianosman@google.com> | 2019-01-04 17:07:44 +0000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-04 17:07:48 +0000 |
| commit | d4c7458f64270d605c04aa24e2171209c00a2d32 (patch) | |
| tree | 7681c78cfa829800c9ec948a01091be073bdaa9d /tests/CanvasTest.cpp | |
| parent | 1cefc0990debd8bb523f4cba166f647e5ff17ce0 (diff) | |
| download | skqp-d4c7458f64270d605c04aa24e2171209c00a2d32.tar.gz | |
Revert "Add SkColorSpace factory from 3x3 row-major gamut and transfer function"
This reverts commit a9549ab31630fc244094e6f1692371cbaf87f666.
Reason for revert: SKPs changed?
Original change's description:
> Add SkColorSpace factory from 3x3 row-major gamut and transfer function
>
> Moved named common transfer functions and gamuts to constexpr values in
> SkColorSpace.h, in SkNamedTransferFn and SkNamedGamut namespaces.
>
> Converted nearly all SkColorSpace::MakeRGB calls within Skia to use the
> new factory with the named values. Multiple clients want a way to
> extract named transfer function and gamut - this still doesn't provide
> that, but this may be a better path forward for honestly advertising how
> SkColorSpace works internally.
>
> Bug: skia:
> Change-Id: I9296d67e8f0dab5ceb49869cb3ba24e98a05f3c4
> Reviewed-on: https://skia-review.googlesource.com/c/180360
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
TBR=mtklein@google.com,brianosman@google.com,reed@google.com
Change-Id: Ie888f877b3c1dba33e1a8c0f5fa92594628de7fb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/181300
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests/CanvasTest.cpp')
| -rw-r--r-- | tests/CanvasTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 8aeb0c4995..bf30dd9c55 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -813,8 +813,8 @@ DEF_TEST(CanvasClipType, r) { #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK DEF_TEST(Canvas_LegacyColorBehavior, r) { - sk_sp<SkColorSpace> cs = SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, - SkNamedGamut::kAdobeRGB); + sk_sp<SkColorSpace> cs = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, + SkColorSpace::kAdobeRGB_Gamut); // Make a Adobe RGB bitmap. SkBitmap bitmap; |