diff options
| author |  Brian Osman <brianosman@google.com> | 2016-11-08 17:08:54 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-09 01:05:07 +0000 |
| commit | 7b8400dad2f82dcc6ed3c7cc1707ebaf85f04840 (patch) | |
| tree | dc1e131776fb1922b113f1a5e723205d8c13ccfe /src/core/SkMipMap.cpp | |
| parent | c8b15684fe5b5b924b90091fedfbedf2806535e0 (diff) | |
Rename SkSourceGammaTreatment to SkDestinationSurfaceColorMode
This is much more explicit about what that type represents (are we in
legacy mode or not), which also makes it suitable for other (upcoming)
usage.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4529
Change-Id: Iacb397c34e7765f1ca86c0195bc622b2be4d9acf
Reviewed-on: https://skia-review.googlesource.com/4529
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/core/SkMipMap.cpp')
| -rw-r--r-- | src/core/SkMipMap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp index c5bd3ac3b7..ba3cb18749 100644 --- a/src/core/SkMipMap.cpp +++ b/src/core/SkMipMap.cpp @@ -306,7 +306,7 @@ size_t SkMipMap::AllocLevelsSize(int levelCount, size_t pixelSize) { return sk_64_asS32(size); } -SkMipMap* SkMipMap::Build(const SkPixmap& src, SkSourceGammaTreatment treatment, +SkMipMap* SkMipMap::Build(const SkPixmap& src, SkDestinationSurfaceColorMode colorMode, SkDiscardableFactoryProc fact) { typedef void FilterProc(void*, const void* srcPtr, size_t srcRB, int count); @@ -321,7 +321,7 @@ SkMipMap* SkMipMap::Build(const SkPixmap& src, SkSourceGammaTreatment treatment, const SkColorType ct = src.colorType(); const SkAlphaType at = src.alphaType(); - const bool srgbGamma = (SkSourceGammaTreatment::kRespect == treatment) + const bool srgbGamma = (SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware == colorMode) && src.info().gammaCloseToSRGB(); switch (ct) { @@ -601,7 +601,7 @@ bool SkMipMap::extractLevel(const SkSize& scaleSize, Level* levelPtr) const { // Helper which extracts a pixmap from the src bitmap // -SkMipMap* SkMipMap::Build(const SkBitmap& src, SkSourceGammaTreatment treatment, +SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDestinationSurfaceColorMode colorMode, SkDiscardableFactoryProc fact) { SkAutoPixmapUnlock srcUnlocker; if (!src.requestLock(&srcUnlocker)) { @@ -612,7 +612,7 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkSourceGammaTreatment treatment, if (nullptr == srcPixmap.addr()) { sk_throw(); } - return Build(srcPixmap, treatment, fact); + return Build(srcPixmap, colorMode, fact); } int SkMipMap::countLevels() const { |