Reland "Reland "Reland "Preserve colorType and alphaType in SkImage::makeColorSpace"""
This reverts commit 7f3ceba5dc7f89d013f39da0b5ce14807588e121.
Reason for revert: Guarded for chrome pixel tests.
Original change's description:
> Revert "Reland "Reland "Preserve colorType and alphaType in SkImage::makeColorSpace"""
>
> This reverts commit 41576877bd1900e7c965b92c0acc439f335191c5.
>
> Reason for revert: best guess for pixel test failures
>
> Original change's description:
> > Reland "Reland "Preserve colorType and alphaType in SkImage::makeColorSpace""
> >
> > This reverts commit 11f4994b84e19512c11bb2c675bef5bd93ea5692.
> >
> > Reason for revert: Codec change should fix the layout test failures?
> >
> > Original change's description:
> > > Revert "Reland "Preserve colorType and alphaType in SkImage::makeColorSpace""
> > >
> > > This reverts commit 893052ea5191a73fd127bf8668ce54e8162b250a.
> > >
> > > Reason for revert: Chrome roll layout failures.
> > >
> > > Original change's description:
> > > > Reland "Preserve colorType and alphaType in SkImage::makeColorSpace"
> > > >
> > > > This reverts commit 0d08b3e4b112fb10a07d223a48fa0a40091f88b1.
> > > >
> > > > Reason for revert: Fixed Chrome test.
> > > >
> > > > Original change's description:
> > > > > 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>
> > > >
> > > > TBR=mtklein@google.com,brianosman@google.com
> > > >
> > > > Change-Id: I860f33a1d57e0e77ce63b78d66d49a1082d2b4dd
> > > > No-Presubmit: true
> > > > No-Tree-Checks: true
> > > > No-Try: true
> > > > Bug: skia:8382
> > > > Reviewed-on: https://skia-review.googlesource.com/156188
> > > > Reviewed-by: Brian Osman <brianosman@google.com>
> > > > Commit-Queue: Brian Osman <brianosman@google.com>
> > >
> > > TBR=mtklein@google.com,brianosman@google.com
> > >
> > > Change-Id: Ib53912d014916374e5d0ee3d224ba69d41a5018c
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: skia:8382
> > > Reviewed-on: https://skia-review.googlesource.com/156360
> > > Reviewed-by: Brian Osman <brianosman@google.com>
> > > Commit-Queue: Brian Osman <brianosman@google.com>
> >
> > TBR=mtklein@google.com,brianosman@google.com
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: skia:8382
> > Change-Id: I3bd7109dd380b6ef213883074c3b07d19ba6ca37
> > Reviewed-on: https://skia-review.googlesource.com/157743
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
>
> TBR=mtklein@google.com,brianosman@google.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: skia:8382
> Change-Id: I587820c6e6c981025f3a2a5a20d8ba4df4b65634
> Reviewed-on: https://skia-review.googlesource.com/158100
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,brianosman@google.com
Change-Id: I6e78537205812f2b38f348ced22fbb8d92d322cc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:8382
Reviewed-on: https://skia-review.googlesource.com/158344
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 4bc7b15..f20b64a 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -300,8 +300,7 @@
}
sk_sp<SkImage> SkImage::makeColorSpace(sk_sp<SkColorSpace> target) const {
- SkColorSpaceTransferFn fn;
- if (!target || !target->isNumericalTransferFn(&fn)) {
+ if (!target) {
return nullptr;
}
@@ -313,11 +312,8 @@
return sk_ref_sp(const_cast<SkImage*>(this));
}
- // TODO: Re-visit this! Keep existing color type?
- SkColorType targetColorType = kN32_SkColorType;
-
// TODO: We might consider making this a deferred conversion?
- return as_IB(this)->onMakeColorSpace(std::move(target), targetColorType);
+ return as_IB(this)->onMakeColorSpace(std::move(target));
}
sk_sp<SkImage> SkImage::makeNonTextureImage() const {