respect srgb gamma when building mips

tests/SkResourceCacheTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkBitmapCache.h"
 #include "SkCanvas.h"
@@ skipping 78 matching lines @@
     REPORTER_ASSERT(reporter, isLocked == (lockedState == kLocked));
 }
 
 static void test_mipmapcache(skiatest::Reporter* reporter, SkResourceCache* cache) {
     cache->purgeAll();
 
     SkBitmap src;
     src.allocN32Pixels(5, 5);
     src.setImmutable();
 
-    const SkMipMap* mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src), cache);
+    const SkMipMap::SrcGammaMode mode = SkMipMap::kIgnore_SrcGammaMode;
+
+    const SkMipMap* mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src), mode, cache);
     REPORTER_ASSERT(reporter, nullptr == mipmap);
 
-    mipmap = SkMipMapCache::AddAndRef(src, cache);
+    mipmap = SkMipMapCache::AddAndRef(src, mode, cache);
     REPORTER_ASSERT(reporter, mipmap);
 
     {
-        const SkMipMap* mm = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src), cache);
+        const SkMipMap* mm = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src), mode, cache);
         REPORTER_ASSERT(reporter, mm);
         REPORTER_ASSERT(reporter, mm == mipmap);
         mm->unref();
     }
 
     check_data(reporter, mipmap, 2, kInCache, kLocked);
 
     mipmap->unref();
     // tricky, since technically after this I'm no longer an owner, but since the cache is
     // local, I know it won't get purged behind my back
     check_data(reporter, mipmap, 1, kInCache, kNotLocked);
 
     // find us again
-    mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src), cache);
+    mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src), mode, cache);
     check_data(reporter, mipmap, 2, kInCache, kLocked);
 
     cache->purgeAll();
     check_data(reporter, mipmap, 1, kNotInCache, kLocked);
 
     mipmap->unref();
 }
 
 static void test_mipmap_notify(skiatest::Reporter* reporter, SkResourceCache* cache) {
+    const SkMipMap::SrcGammaMode mode = SkMipMap::kIgnore_SrcGammaMode;
     const int N = 3;
+
     SkBitmap src[N];
     for (int i = 0; i < N; ++i) {
         src[i].allocN32Pixels(5, 5);
         src[i].setImmutable();
-        SkMipMapCache::AddAndRef(src[i], cache)->unref();
+        SkMipMapCache::AddAndRef(src[i], mode, cache)->unref();
     }
 
     for (int i = 0; i < N; ++i) {
-        const SkMipMap* mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src[i]), cache);
+        const SkMipMap* mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src[i]), mode, cache);

[msarett, 2016/06/03 16:54:17]

nit: 100 chars

[reed1, 2016/06/07 16:01:10]

Done.

         if (cache) {
             // if cache is null, we're working on the global cache, and other threads might purge
             // it, making this check fragile.
             REPORTER_ASSERT(reporter, mipmap);
         }
         SkSafeUnref(mipmap);
 
         src[i].reset(); // delete the underlying pixelref, which *should* remove us from the cache
 
-        mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src[i]), cache);
+        mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src[i]), mode, cache);
         REPORTER_ASSERT(reporter, !mipmap);
     }
 }
 
 static void test_bitmap_notify(skiatest::Reporter* reporter, SkResourceCache* cache) {
     const SkIRect subset = SkIRect::MakeWH(5, 5);
     const int N = 3;
     SkBitmap src[N], dst[N];
     for (int i = 0; i < N; ++i) {
         src[i].allocN32Pixels(5, 5);
@@ skipping 160 matching lines @@
 
         test_discarded_image(reporter, xforms[i], []() {
             SkPictureRecorder recorder;
             SkCanvas* canvas = recorder.beginRecording(10, 10);
             canvas->clear(SK_ColorCYAN);
             return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
                                             SkISize::Make(10, 10), nullptr, nullptr);
         });
     }
 }