diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-07 17:06:09 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:06:24 +0000 |
| commit | 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 (patch) | |
| tree | e97779c04ea0d2059cbd6291de3cbfbf27c1cc61 /src/effects/gradients | |
| parent | ecaaf6f1c156e5690200322fc2636380c1f63dd8 (diff) | |
Revert "SkColorSpace: remove named API, add gamut API"
This reverts commit ecaaf6f1c156e5690200322fc2636380c1f63dd8.
Reason for revert: Breaks everything
Original change's description:
> SkColorSpace: remove named API, add gamut API
>
> BUG=skia:
>
> Change-Id: I01c5e1874c9a034febc64e25b3aaafb5050393a6
> Reviewed-on: https://skia-review.googlesource.com/8021
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ief5a0a4eeabe75a21f7512e23fc15309151066c4
Reviewed-on: https://skia-review.googlesource.com/8127
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/effects/gradients')
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index f50311b97e..03a2db0995 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -217,7 +217,7 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatri if (!desc.fColorSpace) { // This happens if we were constructed from SkColors, so our colors are really sRGB - fColorSpace = SkColorSpace::MakeSRGBLinear(); + fColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); } else { // The color space refers to the float colors, so it must be linear gamma SkASSERT(desc.fColorSpace->gammaIsLinear()); @@ -740,12 +740,12 @@ void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap, case GradientBitmapType::kSRGB: info = SkImageInfo::Make(kCache32Count, 1, kRGBA_8888_SkColorType, kPremul_SkAlphaType, - SkColorSpace::MakeSRGB()); + SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)); break; case GradientBitmapType::kHalfFloat: info = SkImageInfo::Make( kCache32Count, 1, kRGBA_F16_SkColorType, kPremul_SkAlphaType, - SkColorSpace::MakeSRGBLinear()); + SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named)); break; default: SkFAIL("Unexpected bitmap type"); |