Decouple contrast boost from fake gamma.

include/core/SkDraw.h

Index: include/core/SkDraw.h
diff --git a/include/core/SkDraw.h b/include/core/SkDraw.h
index ea8638a9105b505176559a8177e6780ed72e232d..9727df54a8c5deaa4ca9efe17392bf82dc6d30ea 100644
--- a/include/core/SkDraw.h
+++ b/include/core/SkDraw.h
@@ -139,8 +139,8 @@ private:
     bool SK_WARN_UNUSED_RESULT
     computeConservativeLocalClipBounds(SkRect* bounds) const;
 
-    /** Returns the current setting for using fake gamma. */
-    SkPaint::FakeGamma SK_WARN_UNUSED_RESULT fakeGamma() const;
+    /** Returns the current setting for using fake gamma and contrast. */
+    uint32_t SK_WARN_UNUSED_RESULT fontWeightFlags() const;
 
 public:
     SkPixmap        fDst;