Rename lots of things from 'sRGB' to 'GammaCorrect', where appropriate

include/gpu/GrPaint.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrPaint_DEFINED
@@ skipping 52 matching lines @@
     void setDisableOutputConversionToSRGB(bool srgb) { fDisableOutputConversionToSRGB = srgb; }
     bool getDisableOutputConversionToSRGB() const { return fDisableOutputConversionToSRGB; }
 
     /**
      * Should sRGB inputs be allowed to perform sRGB to linear conversion. With this flag
      * set to false, sRGB textures will be treated as linear (including filtering).
      */
     void setAllowSRGBInputs(bool allowSRGBInputs) { fAllowSRGBInputs = allowSRGBInputs; }
     bool getAllowSRGBInputs() const { return fAllowSRGBInputs; }
 
+    /**
+     * Should rendering be gamma-correct. Causes sRGB inputs to perform conversion to linear,
+     * and outputs to be converted from linear to sRGB (if the destination is sRGB).
+     */
+    void setGammaCorrect(bool gammaCorrect) {

[Brian Osman, 2016/04/13 19:54:52]

Added this helper method in this change to make calling code look "more
correct". Paint (+ pipeline) still needs the two separate flags, but in the 99%
case, you want both flags set according to the results of this one function, so
this simplifies things.

[bsalomon, 2016/04/13 20:03:38]

sgtm

+        setDisableOutputConversionToSRGB(!gammaCorrect);
+        setAllowSRGBInputs(gammaCorrect);
+    }
+
     const GrXPFactory* setXPFactory(const GrXPFactory* xpFactory) {
         fXPFactory.reset(SkSafeRef(xpFactory));
         return xpFactory;
     }
 
     void setPorterDuffXPFactory(SkXfermode::Mode mode) {
         fXPFactory.reset(GrPorterDuffXPFactory::Create(mode));
     }
 
     void setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage = false); 
@@ skipping 87 matching lines @@
     SkSTArray<2, const GrFragmentProcessor*, true>  fCoverageFragmentProcessors;
 
     bool                                            fAntiAlias;
     bool                                            fDisableOutputConversionToSRGB;
     bool                                            fAllowSRGBInputs;
 
     GrColor                                         fColor;
 };
 
 #endif