diff options
| author |  Mike Reed <reed@google.com> | 2017-03-14 16:42:05 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-14 16:42:21 +0000 |
| commit | 8f7d9b9784fc22b809ef1d2fa301b7b95efd2a90 (patch) | |
| tree | 8bd9d3379cc4326ebefdf412e0b2648307f24e14 /src/image/SkImage_Base.h | |
| parent | 73e627074839bc00569117235eb4e7d4fc3cc39f (diff) | |
Revert "Begin implementation of SkImage_Base::makeColorSpace"
This reverts commit 98629efdde9236e444d7b3fa644eaab3a1301566.
Reason for revert: unittest failures
Failures:
../../../tests/ImageTest.cpp:1099 0x28 == SkGetPackedR32(*p3Bitmap.getAddr32(0, 0))
../../../tests/ImageTest.cpp:1100 0x40 == SkGetPackedG32(*p3Bitmap.getAddr32(0, 0))
../../../tests/ImageTest.cpp:1101 0x5E == SkGetPackedB32(*p3Bitmap.getAddr32(0, 0))
Original change's description:
> Begin implementation of SkImage_Base::makeColorSpace
>
> BUG=skia:
>
> Change-Id: Idf946faa64dad32a28070a430926a8225dbf6e5a
> Reviewed-on: https://skia-review.googlesource.com/9622
> Commit-Queue: Matt Sarett <msarett@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
>
TBR=mtklein@google.com,msarett@google.com,brianosman@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I6ce2a28ca581f7d01322588c2435133d8c6a2435
Reviewed-on: https://skia-review.googlesource.com/9649
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/image/SkImage_Base.h')
| -rw-r--r-- | src/image/SkImage_Base.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index 284af0d1a6..e08d7610f7 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -81,18 +81,14 @@ public: fAddedToCache.store(true); } - // Transforms image into the input color space. - sk_sp<SkImage> makeColorSpace(sk_sp<SkColorSpace> target) const; + virtual sk_sp<SkImage> onMakeColorSpace(sk_sp<SkColorSpace>) { + // TODO: Implement this. + return sk_ref_sp(this); + } virtual bool onPinAsTexture(GrContext*) const { return false; } virtual void onUnpinAsTexture(GrContext*) const {} -protected: - virtual sk_sp<SkImage> onMakeColorSpace(sk_sp<SkColorSpace>) const { - // TODO: Make this pure virtual. - return sk_ref_sp(const_cast<SkImage_Base*>(this)); - } - private: // Set true by caches when they cache content that's derived from the current pixels. mutable SkAtomic<bool> fAddedToCache; |