Decouple contrast boost from fake gamma.

src/gpu/text/GrAtlasTextBlob.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlasTextBlob_DEFINED
 #define GrAtlasTextBlob_DEFINED
 
@@ skipping 130 matching lines @@
     // descriptor
     void initOverride(int runIndex) {
         Run& run = fRuns[runIndex];
         // Push back a new subrun to fill and set the override descriptor
         run.push_back();
         run.fOverrideDescriptor.reset(new SkAutoDescriptor);
     }
 
     SkGlyphCache* setupCache(int runIndex,
                              const SkSurfaceProps& props,
-                             SkPaint::FakeGamma fakeGamma,
+                             uint32_t scalerContextFlags,
                              const SkPaint& skPaint,
                              const SkMatrix* viewMatrix);
 
     // Appends a glyph to the blob.  If the glyph is too large, the glyph will be appended
     // as a path.
     void appendGlyph(int runIndex,
                      const SkRect& positions,
                      GrColor color,
                      GrBatchTextStrike* strike,
                      GrGlyph* glyph,
@@ skipping 385 matching lines @@
     // We can reuse distance field text, but only if the new viewmatrix would not result in
     // a mip change.  Because there can be multiple runs in a blob, we track the overall
     // maximum minimum scale, and minimum maximum scale, we can support before we need to regen
     SkScalar fMaxMinScale;
     SkScalar fMinMaxScale;
     int fRunCount;
     uint8_t fTextType;
 };
 
 #endif