Decouple contrast boost from fake gamma.

src/gpu/text/GrAtlasTextContext.h

Index: src/gpu/text/GrAtlasTextContext.h
diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h
index a784acb72cdccaa1d29d1f7e7786bc09371c48b4..a47bb66b396bb3253f371209b0ce5e2f87fba38f 100644
--- a/src/gpu/text/GrAtlasTextContext.h
+++ b/src/gpu/text/GrAtlasTextContext.h
@@ -52,12 +52,13 @@ private:
 
     // sets up the descriptor on the blob and returns a detached cache.  Client must attach
     inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd);
-    // Determines if we need to use FakeGamma:
-    inline static SkPaint::FakeGamma ComputeFakeGamma(GrDrawContext*, const GrPaint&);
+    // Determines if we need to use fake gamma (and contrast boost):
+    inline static uint32_t ComputeFontWeightFlags(GrDrawContext*, const GrPaint&);
     static void RegenerateTextBlob(GrAtlasTextBlob* bmp,
                                    GrBatchFontCache*,
                                    const GrShaderCaps&,
-                                   const SkPaint& skPaint, GrColor, SkPaint::FakeGamma,
+                                   const SkPaint& skPaint, GrColor,
+                                   uint32_t fontWeightFlags,
                                    const SkMatrix& viewMatrix,
                                    const SkSurfaceProps&,
                                    const SkTextBlob* blob, SkScalar x, SkScalar y,
@@ -67,7 +68,8 @@ private:
     static inline GrAtlasTextBlob* CreateDrawTextBlob(GrTextBlobCache*,
                                                       GrBatchFontCache*, const GrShaderCaps&,
                                                       const GrPaint&,
-                                                      const SkPaint&, SkPaint::FakeGamma,
+                                                      const SkPaint&,
+                                                      uint32_t fontWeightFlags,
                                                       const SkMatrix& viewMatrix,
                                                       const SkSurfaceProps&,
                                                       const char text[], size_t byteLength,
@@ -75,7 +77,8 @@ private:
     static inline GrAtlasTextBlob* CreateDrawPosTextBlob(GrTextBlobCache*, GrBatchFontCache*,
                                                          const GrShaderCaps&,
                                                          const GrPaint&,
-                                                         const SkPaint&, SkPaint::FakeGamma,
+                                                         const SkPaint&,
+                                                         uint32_t fontWeightFlags,
                                                          const SkMatrix& viewMatrix,
                                                          const SkSurfaceProps&,
                                                          const char text[], size_t byteLength,
@@ -87,7 +90,8 @@ private:
     SkAutoTUnref<const GrDistanceFieldAdjustTable> fDistanceAdjustTable;
 
 #ifdef GR_TEST_UTILS
-    static const SkPaint::FakeGamma kTextBlobBatchFakeGamma = SkPaint::FakeGamma::On;
+    static const uint32_t kTextBlobBatchFontWeightFlags =
+        SkPaint::kFakeGammaAndContrast_FontWeightFlag;
     DRAW_BATCH_TEST_FRIEND(TextBlobBatch);
 #endif
 };