Decouple contrast boost from fake gamma.

include/core/SkPaint.h

Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 57122550b3032df6afd74e1a82fb298a633ea6b7..ac7288de476ea2db0bd89af35b1e6cf711cceeb6 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -1085,8 +1085,13 @@ private:
     SkScalar measure_text(SkGlyphCache*, const char* text, size_t length,
                           int* count, SkRect* bounds) const;
 
-    enum class FakeGamma {
-        Off = 0, On
+    enum FontWeightFlags {

[bungeman-skia, 2016/04/07 18:35:09]

Eck... the name. I liked the term 'FakeGamma' because while this is used with
fonts, it could just as well be applied to any other drawing operation as well.
Indeed, if reed had more time for such things, this would be applied to
hairlines. In other words, attaching 'Font' to the name sees overly specific. I
liked my old 'leakyProperties' name because it better stated that these were all
things that the device was supposed to handle but wasn't going to, so try to do
the best one can to make up for it. So I think I would prefer the name to be
something like

enum ThingsTheBlitterShouldHandleButCant {
  Gamma,
  BoostedContrast,
}

In other words, I don't want anyone ever thinking that the scaler context / font
system *should* ever know any of this information; it very much should not, it's
completely a hack that it does.

Note that none of the above is quite right, I'll probably have to talk about it.

+        kNone_FontWeightFlag = 0,
+        kFakeGamma_FontWeightFlag = 1 << 0,
+        kBoostContrast_FontWeightFlag = 1 << 1,
+
+        kFakeGammaAndContrast_FontWeightFlag =

[bungeman-skia, 2016/04/07 18:35:09]

nit: the name says flag... but it isn't really a flag. Ick.

+            kFakeGamma_FontWeightFlag | kBoostContrast_FontWeightFlag,
     };
 
     /*
@@ -1094,12 +1099,12 @@ private:
      * SkData.  Caller is responsible for managing the lifetime of this object.
      */
     void getScalerContextDescriptor(SkAutoDescriptor*, const SkSurfaceProps& surfaceProps,
-                                    FakeGamma fakeGamma, const SkMatrix*) const;
+                                    uint32_t fontWeightFlags, const SkMatrix*) const;
 
-    SkGlyphCache* detachCache(const SkSurfaceProps* surfaceProps, FakeGamma fakeGamma,
+    SkGlyphCache* detachCache(const SkSurfaceProps* surfaceProps, uint32_t fontWeightFlags,
                               const SkMatrix*) const;
 
-    void descriptorProc(const SkSurfaceProps* surfaceProps, FakeGamma fakeGamma,
+    void descriptorProc(const SkSurfaceProps* surfaceProps, uint32_t fontWeightFlags,
                         const SkMatrix* deviceMatrix,
                         void (*proc)(SkTypeface*, const SkDescriptor*, void*),
                         void* context) const;