From b109b8c5ec40a7dd85a0a2951a1f98fa63b805aa Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 16 Jun 2016 13:03:24 -0700 Subject: Lots of progress on switching to SkColorSpace rather than SkColorProfileType Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 Review-Url: https://codereview.chromium.org/2069173002 --- include/gpu/SkGr.h | 5 +++-- include/gpu/SkGrPixelRef.h | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include/gpu') diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index edfcd6d813..c5ba34403f 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -72,10 +72,11 @@ GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTexture SkSourceGammaTreatment); // TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses). -GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType, const GrCaps&); +GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, const SkColorSpace*, + const GrCaps&); static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info, const GrCaps& caps) { - return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType(), caps); + return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.colorSpace(), caps); } GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality, diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h index b4dbd9d73f..2bbe48fa09 100644 --- a/include/gpu/SkGrPixelRef.h +++ b/include/gpu/SkGrPixelRef.h @@ -50,8 +50,7 @@ public: protected: // overrides from SkPixelRef bool onReadPixels(SkBitmap* dst, SkColorType, const SkIRect* subset) override; - SkPixelRef* deepCopy(SkColorType, SkColorProfileType, - const SkIRect* subset) override; + SkPixelRef* deepCopy(SkColorType, SkColorSpace*, const SkIRect* subset) override; void onNotifyPixelsChanged() override; private: -- cgit v1.2.3