respect srgb gamma when building mips

src/gpu/SkGr.cpp

Index: src/gpu/SkGr.cpp
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index fb2916daff117fe697aa4633b5b50f70e2779272..0bb02691a58dd92820cdc2381d001341aa58430b 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -345,11 +345,10 @@ GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& b
         return texture.release();
     }
 
-    // SkMipMap::Build doesn't handle sRGB data correctly (yet).
-    // Failover to the GL code-path for now.
-    if (kLinear_SkColorProfileType != bitmap.profileType()) {
-        return nullptr;
-    }
+    /*
+     *  TODO: determine when we want respect -vs- (compatible) ignore

[Brian Osman, 2016/06/07 16:10:30]

gammaTreatment is now passed into this function, so you can just use
gammaTreatment.

[reed1, 2016/06/07 19:43:37]

Doh!

+     */
+    SkSourceGammaTreatment treatment = SkSourceGammaTreatment::kIgnore;
 
     SkASSERT(sizeof(int) <= sizeof(uint32_t));
     if (bitmap.width() < 0 || bitmap.height() < 0) {
@@ -366,7 +365,7 @@ GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& b
         sk_throw();
     }
 
-    SkAutoTDelete<SkMipMap> mipmaps(SkMipMap::Build(pixmap, nullptr));
+    SkAutoTDelete<SkMipMap> mipmaps(SkMipMap::Build(pixmap, treatment, nullptr));
     if (!mipmaps) {
         return nullptr;
     }