commit 7b8400dad2f82dcc6ed3c7cc1707ebaf85f04840
author Brian Osman <brianosman@google.com> Tue Nov 08 17:08:54 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 09 01:05:07 2016 +0000
tree dc1e131776fb1922b113f1a5e723205d8c13ccfe
parent c8b15684fe5b5b924b90091fedfbedf2806535e0

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>

src/core/SkBitmapCache.cpp

diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp
index e6a664b..0751089 100644
--- a/src/core/SkBitmapCache.cpp
+++ b/src/core/SkBitmapCache.cpp
@@ -208,21 +208,21 @@
 
 struct MipMapKey : public SkResourceCache::Key {
 public:
-    MipMapKey(uint32_t genID, SkSourceGammaTreatment treatment, const SkIRect& bounds)
-        : fGenID(genID), fSrcGammaTreatment(static_cast<uint32_t>(treatment)), fBounds(bounds)
+    MipMapKey(uint32_t genID, SkDestinationSurfaceColorMode colorMode, const SkIRect& bounds)
+        : fGenID(genID), fColorMode(static_cast<uint32_t>(colorMode)), fBounds(bounds)
     {
         this->init(&gMipMapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(genID),
-                   sizeof(fGenID) + sizeof(fSrcGammaTreatment) + sizeof(fBounds));
+                   sizeof(fGenID) + sizeof(fColorMode) + sizeof(fBounds));
     }
 
     uint32_t    fGenID;
-    uint32_t    fSrcGammaTreatment;
+    uint32_t    fColorMode;
     SkIRect     fBounds;
 };
 
 struct MipMapRec : public SkResourceCache::Rec {
-    MipMapRec(const SkBitmap& src, SkSourceGammaTreatment treatment, const SkMipMap* result)
-        : fKey(src.getGenerationID(), treatment, get_bounds_from_bitmap(src))
+    MipMapRec(const SkBitmap& src, SkDestinationSurfaceColorMode colorMode, const SkMipMap* result)
+        : fKey(src.getGenerationID(), colorMode, get_bounds_from_bitmap(src))
         , fMipMap(result)
     {
         fMipMap->attachToCacheAndRef();
@@ -260,10 +260,10 @@
 }
 
 const SkMipMap* SkMipMapCache::FindAndRef(const SkBitmapCacheDesc& desc,
-                                          SkSourceGammaTreatment treatment,
+                                          SkDestinationSurfaceColorMode colorMode,
                                           SkResourceCache* localCache) {
     // Note: we ignore width/height from desc, just need id and bounds
-    MipMapKey key(desc.fImageID, treatment, desc.fBounds);
+    MipMapKey key(desc.fImageID, colorMode, desc.fBounds);
     const SkMipMap* result;
 
     if (!CHECK_LOCAL(localCache, find, Find, key, MipMapRec::Finder, &result)) {
@@ -277,11 +277,12 @@
                       : SkResourceCache::GetDiscardableFactory();
 }
 
-const SkMipMap* SkMipMapCache::AddAndRef(const SkBitmap& src, SkSourceGammaTreatment treatment,
+const SkMipMap* SkMipMapCache::AddAndRef(const SkBitmap& src,
+                                         SkDestinationSurfaceColorMode colorMode,
                                          SkResourceCache* localCache) {
-    SkMipMap* mipmap = SkMipMap::Build(src, treatment, get_fact(localCache));
+    SkMipMap* mipmap = SkMipMap::Build(src, colorMode, get_fact(localCache));
     if (mipmap) {
-        MipMapRec* rec = new MipMapRec(src, treatment, mipmap);
+        MipMapRec* rec = new MipMapRec(src, colorMode, mipmap);
         CHECK_LOCAL(localCache, add, Add, rec);
         src.pixelRef()->notifyAddedToCache();
     }