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

src/core/SkSpriteBlitter4f.cpp

Index: src/core/SkSpriteBlitter4f.cpp
diff --git a/src/core/SkSpriteBlitter4f.cpp b/src/core/SkSpriteBlitter4f.cpp
index 0079b2916034679937ae0c6d6a7c4bd7b93a0579..474bf4d0f606bb0681dc6dd748b747f7bce1692a 100644
--- a/src/core/SkSpriteBlitter4f.cpp
+++ b/src/core/SkSpriteBlitter4f.cpp
@@ -82,12 +82,8 @@
 
 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;
         }
@@ -115,9 +111,8 @@
 };
 
 
-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) {
@@ -127,7 +122,7 @@
     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;
     }