Gamma-correctness pushed into Skia, top-down.

gm/textblobmixedsizes.cpp

 /*
  * Copyright 2015 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 "Resources.h"
@@ skipping 85 matching lines @@
         return SkISize::Make(kWidth, kHeight);
     }
 
     void onDraw(SkCanvas* inputCanvas) override {
         SkCanvas* canvas = inputCanvas;
         sk_sp<SkSurface> surface;
         if (fUseDFT) {
 #if SK_SUPPORT_GPU
             // Create a new Canvas to enable DFT
             GrContext* ctx = inputCanvas->getGrContext();
-            SkImageInfo info = SkImageInfo::MakeN32Premul(onISize());
-            SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag,
+            SkImageInfo info = SkImageInfo::MakeN32Premul(onISize(),
+                                                          inputCanvas->imageInfo().profileType());
+            SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
+            uint32_t allowSRGBInputs = inputCanvas->getProps(&canvasProps)
+                ? canvasProps.flags() & SkSurfaceProps::kAllowSRGBInputs_Flag : 0;
+            SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag | allowSRGBInputs,
                                  SkSurfaceProps::kLegacyFontHost_InitType);
             surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props);
             canvas = surface.get() ? surface->getCanvas() : inputCanvas;
             // init our new canvas with the old canvas's matrix
             canvas->setMatrix(inputCanvas->getTotalMatrix());
 #endif
         }
         canvas->drawColor(sk_tool_utils::color_to_565(SK_ColorWHITE));
 
         SkRect bounds = fBlob->bounds();
@@ skipping 67 matching lines @@
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TextBlobMixedSizes(false); )
 #if SK_SUPPORT_GPU
 DEF_GM( return new TextBlobMixedSizes(true); )
 #endif
 }