Revert of More removal of SkColorProfileType...

gm/SkLinearBitmapPipelineGM.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 "gm.h"
 #include "SkBlitter.h"
 #include "SkCanvas.h"
@@ skipping 37 matching lines @@
 
     SkPixmap pmsrc;
     bmsrc.peekPixels(&pmsrc);
 
     SkBitmap bmdst;
     bmdst.allocN32Pixels(ir.width(), ir.height());
     bmdst.eraseColor(0xFFFFFFFF);
     SkPixmap pmdst;
     bmdst.peekPixels(&pmdst);
 
-    SkImageInfo info = SkImageInfo::MakeN32Premul(ir.width(), ir.height());
+    SkImageInfo info = SkImageInfo::MakeN32Premul(ir.width(), ir.height(), kLinear_SkColorProfileType);
 
     sk_sp<SkImage> image(SkImage::MakeRasterCopy(SkPixmap(info, pmsrc.addr32(), pmsrc.rowBytes())));
     SkPaint paint;
     int32_t storage[kSkBlitterContextSize];
 
     sk_sp<SkShader> shader = image->makeShader(SkShader::kRepeat_TileMode,
                                                SkShader::kRepeat_TileMode);
 
     if (useBilerp) {
         paint.setFilterQuality(SkFilterQuality::kLow_SkFilterQuality);
@@ skipping 37 matching lines @@
     sk_ignore_unused_variable(trash);
 
     SkFilterQuality filterQuality;
     if (useBilerp) {
         filterQuality = SkFilterQuality::kLow_SkFilterQuality;
     } else {
         filterQuality = SkFilterQuality::kNone_SkFilterQuality;
     }
 
     uint32_t flags = 0;
+    //if (kSRGB_SkColorProfileType == profile) {
+        //flags |= SkXfermode::kDstIsSRGB_PM4fFlag;
+    //}
     auto procN = SkXfermode::GetD32Proc(nullptr, flags);
 
     SkLinearBitmapPipeline pipeline{
             inv, filterQuality,
             SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, SK_ColorBLACK, pmsrc};
 
     for (int y = 0; y < ir.height(); y++) {
         pipeline.shadeSpan4f(0, y, dstBits, ir.width());
         procN(nullptr, pmdst.writable_addr32(0, y), dstBits, ir.width(), nullptr);
     }
@@ skipping 66 matching lines @@
             }
             canvas->restore();
             canvas->translate(0, H + 20);
         }
         canvas->restore();
         canvas->translate(0, (H + 20) * SK_ARRAY_COUNT(mats));
         if (useBilerp) break;
         useBilerp = true;
     }
 }