Remove SkSurfaceProps gamma-correctness flag entirely.

gm/surface.cpp

 /*
  * Copyright 2014 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 "SkGradientShader.h"
 #include "SkSurface.h"
 #include "SkSurfaceProps.h"
 
 #define W 200
 #define H 100
 
 static sk_sp<SkShader> make_shader() {
     int a = 0x99;
     int b = 0xBB;
     SkPoint pts[] = { { 0, 0 }, { W, H } };
     SkColor colors[] = { SkColorSetRGB(a, a, a), SkColorSetRGB(b, b, b) };
     return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
 }
 
 static sk_sp<SkSurface> make_surface(GrContext* ctx, const SkImageInfo& info, SkPixelGeometry geo,
-                                     int disallowAA, int disallowDither, bool gammaCorrect) {
+                                     int disallowAA, int disallowDither) {
     uint32_t flags = 0;
     if (disallowAA) {
         flags |= SkSurfaceProps::kDisallowAntiAlias_Flag;
     }
     if (disallowDither) {
         flags |= SkSurfaceProps::kDisallowDither_Flag;
     }
-    if (gammaCorrect) {
-        flags |= SkSurfaceProps::kGammaCorrect_Flag;
-    }
 
     SkSurfaceProps props(flags, geo);
     if (ctx) {
         return SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props);
     } else {
         return SkSurface::MakeRaster(info, &props);
     }
 }
 
 static void test_draw(SkCanvas* canvas, const char label[]) {
@@ skipping 26 matching lines @@
     SkISize onISize() override {
         return SkISize::Make(W * 4, H * 5);
     }
 
     void onDraw(SkCanvas* canvas) override {
         GrContext* ctx = canvas->getGrContext();
 
         // must be opaque to have a hope of testing LCD text
         const SkImageInfo info = SkImageInfo::MakeN32(W, H, kOpaque_SkAlphaType,
                                                       sk_ref_sp(canvas->imageInfo().colorSpace()));
-        SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
-        bool gammaCorrect = canvas->getProps(&canvasProps) && canvasProps.isGammaCorrect();
 
         const struct {
             SkPixelGeometry fGeo;
             const char*     fLabel;
         } recs[] = {
             { kUnknown_SkPixelGeometry, "Unknown" },
             { kRGB_H_SkPixelGeometry,   "RGB_H" },
             { kBGR_H_SkPixelGeometry,   "BGR_H" },
             { kRGB_V_SkPixelGeometry,   "RGB_V" },
             { kBGR_V_SkPixelGeometry,   "BGR_V" },
         };
 
         SkScalar x = 0;
         for (int disallowAA = 0; disallowAA <= 1; ++disallowAA) {
             for (int disallowDither = 0; disallowDither <= 1; ++disallowDither) {
                 SkScalar y = 0;
                 for (const auto& rec : recs) {
-                    auto surface(make_surface(ctx, info, rec.fGeo, disallowAA, disallowDither,
-                                              gammaCorrect));
+                    auto surface(make_surface(ctx, info, rec.fGeo, disallowAA, disallowDither));
                     if (!surface) {
                         SkDebugf("failed to create surface! label: %s AA: %s dither: %s\n",
                                  rec.fLabel, (disallowAA == 1 ? "disallowed" : "allowed"),
                                  (disallowDither == 1 ? "disallowed" : "allowed"));
                         continue;
                     }
                     test_draw(surface->getCanvas(), rec.fLabel);
                     surface->draw(canvas, x, y, nullptr);
                     y += H;
                 }
@@ skipping 49 matching lines @@
         SkASSERT(equal(surf->props(), surf2->props()));
 
         sk_sp<SkImage> image2(surf2->makeImageSnapshot());
         canvas->drawImage(image2.get(), 10 + SkIntToScalar(image->width()) + 10, 10, nullptr);
     }
 
 private:
     typedef GM INHERITED;
 };
 DEF_GM( return new NewSurfaceGM )