diff options
Diffstat (limited to 'src/core/SkBitmapController.cpp')
-rw-r--r-- | src/core/SkBitmapController.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp index ffeb10c8af..435940b84c 100644 --- a/src/core/SkBitmapController.cpp +++ b/src/core/SkBitmapController.cpp @@ -45,12 +45,12 @@ SkBitmapController::State* SkBitmapController::requestBitmap(const SkBitmapProvi class SkDefaultBitmapControllerState : public SkBitmapController::State { public: SkDefaultBitmapControllerState(const SkBitmapProvider&, const SkMatrix& inv, SkFilterQuality, - SkSourceGammaTreatment); + SkDestinationSurfaceColorMode); private: - SkBitmap fResultBitmap; - SkSourceGammaTreatment fSrcGammaTreatment; - sk_sp<const SkMipMap> fCurrMip; + SkBitmap fResultBitmap; + SkDestinationSurfaceColorMode fColorMode; + sk_sp<const SkMipMap> fCurrMip; bool processHQRequest(const SkBitmapProvider&); bool processMediumRequest(const SkBitmapProvider&); @@ -166,13 +166,13 @@ bool SkDefaultBitmapControllerState::processMediumRequest(const SkBitmapProvider } if (invScaleSize.width() > SK_Scalar1 || invScaleSize.height() > SK_Scalar1) { - fCurrMip.reset(SkMipMapCache::FindAndRef(provider.makeCacheDesc(), fSrcGammaTreatment)); + fCurrMip.reset(SkMipMapCache::FindAndRef(provider.makeCacheDesc(), fColorMode)); if (nullptr == fCurrMip.get()) { SkBitmap orig; if (!provider.asBitmap(&orig)) { return false; } - fCurrMip.reset(SkMipMapCache::AddAndRef(orig, fSrcGammaTreatment)); + fCurrMip.reset(SkMipMapCache::AddAndRef(orig, fColorMode)); if (nullptr == fCurrMip.get()) { return false; } @@ -200,13 +200,14 @@ bool SkDefaultBitmapControllerState::processMediumRequest(const SkBitmapProvider return false; } -SkDefaultBitmapControllerState::SkDefaultBitmapControllerState(const SkBitmapProvider& provider, - const SkMatrix& inv, - SkFilterQuality qual, - SkSourceGammaTreatment treatment) { +SkDefaultBitmapControllerState::SkDefaultBitmapControllerState( + const SkBitmapProvider& provider, + const SkMatrix& inv, + SkFilterQuality qual, + SkDestinationSurfaceColorMode colorMode) { fInvMatrix = inv; fQuality = qual; - fSrcGammaTreatment = treatment; + fColorMode = colorMode; if (this->processHQRequest(provider) || this->processMediumRequest(provider)) { SkASSERT(fResultBitmap.getPixels()); @@ -228,5 +229,5 @@ SkBitmapController::State* SkDefaultBitmapController::onRequestBitmap(const SkBi SkFilterQuality quality, void* storage, size_t size) { return SkInPlaceNewCheck<SkDefaultBitmapControllerState>(storage, size, bm, inverse, quality, - fSrcGammaTreatment); + fColorMode); } |