Revert of sRGB support in Ganesh. Several pieces:

src/gpu/SkGr.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkGr.h"
 #include "SkGrPriv.h"
@@ skipping 25 matching lines @@
 #include "effects/GrDitherEffect.h"
 #include "effects/GrPorterDuffXferProcessor.h"
 #include "effects/GrXfermodeFragmentProcessor.h"
 #include "effects/GrYUVEffect.h"
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 #  include "ktx.h"
 #  include "etc1.h"
 #endif
 
-GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo& info, const GrCaps& caps) {
+GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo& info) {
     GrSurfaceDesc desc;
     desc.fFlags = kNone_GrSurfaceFlags;
     desc.fWidth = info.width();
     desc.fHeight = info.height();
-    desc.fConfig = SkImageInfo2GrPixelConfig(info, caps);
+    desc.fConfig = SkImageInfo2GrPixelConfig(info);
     desc.fSampleCnt = 0;
     return desc;
 }
 
 void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& imageBounds) {
     SkASSERT(key);
     SkASSERT(imageID);
     SkASSERT(!imageBounds.isEmpty());
     static const GrUniqueKey::Domain kImageIDDomain = GrUniqueKey::GenerateDomain();
     GrUniqueKey::Builder builder(key, kImageIDDomain, 5);
@@ skipping 144 matching lines @@
     desc.fConfig = GrIsCompressedTextureDataSupported(ctx, data, bm.width(), bm.height(),
                                                       &startOfTexData);
     if (kUnknown_GrPixelConfig == desc.fConfig) {
         return nullptr;
     }
 
     return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, startOfTexData, 0);
 }
 
 GrTexture* GrUploadBitmapToTexture(GrContext* ctx, const SkBitmap& bitmap) {
-    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap.info(), *ctx->caps());
+    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap.info());
     if (GrTexture *texture = load_etc1_texture(ctx, bitmap, desc)) {
         return texture;
     }
 
     if (GrTexture* texture = create_texture_from_yuv(ctx, bitmap, desc)) {
         return texture;
     }
 
     SkAutoLockPixels alp(bitmap);
     if (!bitmap.readyToDraw()) {
         return nullptr;
     }
     SkPixmap pixmap;
     if (!bitmap.peekPixels(&pixmap)) {
         return nullptr;
     }
     return GrUploadPixmapToTexture(ctx, pixmap);
 }
 
 GrTexture* GrUploadPixmapToTexture(GrContext* ctx, const SkPixmap& pixmap) {
     const SkPixmap* pmap = &pixmap;
     SkPixmap tmpPixmap;
     SkBitmap tmpBitmap;
 
+    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(pixmap.info());
     const GrCaps* caps = ctx->caps();
-    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(pixmap.info(), *caps);
 
     if (kIndex_8_SkColorType == pixmap.colorType()) {
         if (caps->isConfigTexturable(kIndex_8_GrPixelConfig)) {
             size_t imageSize = GrCompressedFormatDataSize(kIndex_8_GrPixelConfig,
                                                           pixmap.width(), pixmap.height());
             SkAutoMalloc storage(imageSize);
             build_index8_data(storage.get(), pixmap);
 
             // our compressed data will be trimmed, so pass width() for its
             // "rowBytes", since they are the same now.
             return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, storage.get(),
                                                          pixmap.width());
         } else {
             SkImageInfo info = SkImageInfo::MakeN32Premul(pixmap.width(), pixmap.height());
             tmpBitmap.allocPixels(info);
             if (!pixmap.readPixels(info, tmpBitmap.getPixels(), tmpBitmap.rowBytes())) {
                 return nullptr;
             }
             if (!tmpBitmap.peekPixels(&tmpPixmap)) {
                 return nullptr;
             }
             pmap = &tmpPixmap;
             // must rebuild desc, since we've forced the info to be N32
-            desc = GrImageInfoToSurfaceDesc(pmap->info(), *caps);
+            desc = GrImageInfoToSurfaceDesc(pmap->info());
         }
     }
 
     return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, pmap->addr(),
                                                  pmap->rowBytes());
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrInstallBitmapUniqueKeyInvalidator(const GrUniqueKey& key, SkPixelRef* pixelRef) {
     class Invalidator : public SkPixelRef::GenIDChangeListener {
     public:
         explicit Invalidator(const GrUniqueKey& key) : fMsg(key) {}
     private:
         GrUniqueKeyInvalidatedMessage fMsg;
 
         void onChange() override { SkMessageBus<GrUniqueKeyInvalidatedMessage>::Post(fMsg); }
     };
 
     pixelRef->addGenIDChangeListener(new Invalidator(key));
 }
 
 GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& bitmap)
 {
-    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap.info(), *ctx->caps());
+    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap.info());
     if (kIndex_8_SkColorType != bitmap.colorType() && !bitmap.readyToDraw()) {
         GrTexture* texture = load_etc1_texture(ctx, bitmap, desc);
         if (texture) {
             return texture;
         }
     }
 
     GrTexture* texture = create_texture_from_yuv(ctx, bitmap, desc);
     if (texture) {
         return texture;
@@ skipping 48 matching lines @@
     if (bitmap.getTexture()) {
         return GrBitmapTextureAdjuster(&bitmap).refTextureSafeForParams(params, nullptr);
     }
     return GrBitmapTextureMaker(ctx, bitmap).refTextureForParams(params);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass
 // alpha info, that will be considered.
-GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProfileType pt,
-                                        const GrCaps& caps) {
-    if (kSRGB_SkColorProfileType == pt && caps.srgbSupport()) {
-        switch (ct) {
-            case kRGBA_8888_SkColorType:
-                return kSRGBA_8888_GrPixelConfig;
-            case kBGRA_8888_SkColorType:
-                return kSBGRA_8888_GrPixelConfig;
-            default:
-                break;
-        }
-    } else {
-        switch (ct) {
-            case kUnknown_SkColorType:
-                return kUnknown_GrPixelConfig;
-            case kAlpha_8_SkColorType:
-                return kAlpha_8_GrPixelConfig;
-            case kRGB_565_SkColorType:
-                return kRGB_565_GrPixelConfig;
-            case kARGB_4444_SkColorType:
-                return kRGBA_4444_GrPixelConfig;
-            case kRGBA_8888_SkColorType:
-                return kRGBA_8888_GrPixelConfig;
-            case kBGRA_8888_SkColorType:
-                return kBGRA_8888_GrPixelConfig;
-            case kIndex_8_SkColorType:
-                return kIndex_8_GrPixelConfig;
-            case kGray_8_SkColorType:
-                return kAlpha_8_GrPixelConfig; // TODO: gray8 support on gpu
-            case kRGBA_F16_SkColorType:
-                return kRGBA_half_GrPixelConfig;
-        }
+GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProfileType pt) {
+    switch (ct) {
+        case kUnknown_SkColorType:
+            return kUnknown_GrPixelConfig;
+        case kAlpha_8_SkColorType:
+            return kAlpha_8_GrPixelConfig;
+        case kRGB_565_SkColorType:
+            return kRGB_565_GrPixelConfig;
+        case kARGB_4444_SkColorType:
+            return kRGBA_4444_GrPixelConfig;
+        case kRGBA_8888_SkColorType:
+            //if (kSRGB_SkColorProfileType == pt) {
+            //    return kSRGBA_8888_GrPixelConfig;
+            //}
+            return kRGBA_8888_GrPixelConfig;
+        case kBGRA_8888_SkColorType:
+            return kBGRA_8888_GrPixelConfig;
+        case kIndex_8_SkColorType:
+            return kIndex_8_GrPixelConfig;
+        case kGray_8_SkColorType:
+            return kAlpha_8_GrPixelConfig; // TODO: gray8 support on gpu
+        case kRGBA_F16_SkColorType:
+            return kRGBA_half_GrPixelConfig;
     }
     SkASSERT(0);    // shouldn't get here
     return kUnknown_GrPixelConfig;
 }
 
 bool GrPixelConfig2ColorAndProfileType(GrPixelConfig config, SkColorType* ctOut,
                                        SkColorProfileType* ptOut) {
     SkColorType ct;
     SkColorProfileType pt = kLinear_SkColorProfileType;
     switch (config) {
@@ skipping 12 matching lines @@
         case kRGBA_8888_GrPixelConfig:
             ct = kRGBA_8888_SkColorType;
             break;
         case kBGRA_8888_GrPixelConfig:
             ct = kBGRA_8888_SkColorType;
             break;
         case kSRGBA_8888_GrPixelConfig:
             ct = kRGBA_8888_SkColorType;
             pt = kSRGB_SkColorProfileType;
             break;
-        case kSBGRA_8888_GrPixelConfig:
-            ct = kBGRA_8888_SkColorType;
-            pt = kSRGB_SkColorProfileType;
-            break;
         default:
             return false;
     }
     if (ctOut) {
         *ctOut = ct;
     }
     if (ptOut) {
         *ptOut = pt;
     }
     return true;
@@ skipping 269 matching lines @@
             SkErrorInternals::SetError( kInvalidPaint_SkError,
                                         "Sorry, I don't understand the filtering "
                                         "mode you asked for.  Falling back to "
                                         "MIPMaps.");
             textureFilterMode = GrTextureParams::kMipMap_FilterMode;
             break;
 
     }
     return textureFilterMode;
 }