Revert of New GM that exercises gamma-correctness in various parts of the pipeline.

src/core/SkSpriteBlitter4f.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSpriteBlitter.h"
 #include "SkSpanProcs.h"
 #include "SkTemplates.h"
@@ skipping 64 matching lines @@
             return allocator->createT<Sprite_F16>(source, paint);
         default:
             return nullptr;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class Sprite_sRGB : public Sprite_4f {
 public:
-    Sprite_sRGB(const SkPixmap& src, const SkPaint& paint, SkColorProfileType dstPt)
-        : INHERITED(src, paint) {
-        uint32_t flags = 0;
-        if (kSRGB_SkColorProfileType == dstPt) {
-            flags |= SkXfermode::kDstIsSRGB_D32Flag;
-        }
+    Sprite_sRGB(const SkPixmap& src, const SkPaint& paint) : INHERITED(src, paint) {
+        uint32_t flags = SkXfermode::kDstIsSRGB_D32Flag;
         if (src.isOpaque()) {
             flags |= SkXfermode::kSrcIsOpaque_D32Flag;
         }
         fWriter = SkXfermode::GetD32Proc(fXfer, flags);
     }
     
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
         uint32_t* SK_RESTRICT dst = fDst.writable_addr32(x, y);
         size_t dstRB = fDst.rowBytes();
         
         for (int bottom = y + height; y < bottom; ++y) {
             fLoader(fSource, x - fLeft, y - fTop, fBuffer, width);
             fFilter(*fPaint, fBuffer, width);
             fWriter(fXfer, dst, fBuffer, width, nullptr);
             dst = (uint32_t* SK_RESTRICT)((char*)dst + dstRB);
         }
     }
     
 protected:
     SkXfermode::D32Proc fWriter;
     
 private:
     typedef Sprite_4f INHERITED;
 };
 
 
-SkSpriteBlitter* SkSpriteBlitter::ChooseNew32(const SkPixmap& source, const SkPaint& paint,
-                                              SkTBlitterAllocator* allocator,
-                                              SkColorProfileType dstPt) {
+SkSpriteBlitter* SkSpriteBlitter::ChooseS32(const SkPixmap& source, const SkPaint& paint,
+                                            SkTBlitterAllocator* allocator) {
     SkASSERT(allocator != nullptr);
     
     if (paint.getMaskFilter() != nullptr) {
         return nullptr;
     }
     
     switch (source.colorType()) {
         case kN32_SkColorType:
         case kRGBA_F16_SkColorType:
-            return allocator->createT<Sprite_sRGB>(source, paint, dstPt);
+            return allocator->createT<Sprite_sRGB>(source, paint);
         default:
             return nullptr;
     }
 }