diff options
| author | Brian Osman <brianosman@google.com> | 2018-09-21 15:48:44 +0000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-09-21 15:48:51 +0000 |
| commit | 0d08b3e4b112fb10a07d223a48fa0a40091f88b1 (patch) | |
| tree | 0b67b9457450ccf22c36efd690024b34022d3b8b /src/effects | |
| parent | 81cbd03a24e19f611341b0cae68201aaab882d3c (diff) | |
| download | skqp-0d08b3e4b112fb10a07d223a48fa0a40091f88b1.tar.gz | |
Revert "Preserve colorType and alphaType in SkImage::makeColorSpace"
This reverts commit d842557c07246546ff15aede9d3b4e078c62b7e4.
Reason for revert: Chrome roll failing CanvasAsyncBlobCreatorTest.ColorManagedConvertToBlob test.
Original change's description:
> Preserve colorType and alphaType in SkImage::makeColorSpace
>
> Raster images were always converting to N32, and GPU images were
> always converting to premul. These were unexpected and inconsistent.
>
> Bug: skia:8382
> Change-Id: I78fe6cff1208eef077a71d08e676cf8f8d5fed9a
> Reviewed-on: https://skia-review.googlesource.com/156142
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,brianosman@google.com
Change-Id: I366b097644ac1fa920fc9addcad3e09c2a0a63cc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:8382
Reviewed-on: https://skia-review.googlesource.com/156184
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkToSRGBColorFilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/effects/SkToSRGBColorFilter.cpp b/src/effects/SkToSRGBColorFilter.cpp index b24ca8dcc8..4b5558da76 100644 --- a/src/effects/SkToSRGBColorFilter.cpp +++ b/src/effects/SkToSRGBColorFilter.cpp @@ -53,6 +53,6 @@ void SkToSRGBColorFilter::flatten(SkWriteBuffer& buffer) const { std::unique_ptr<GrFragmentProcessor> SkToSRGBColorFilter::asFragmentProcessor( GrContext*, const GrColorSpaceInfo&) const { return GrColorSpaceXformEffect::Make(fSrcColorSpace.get(), kPremul_SkAlphaType, - sk_srgb_singleton(), kPremul_SkAlphaType); + sk_srgb_singleton()); } #endif |