Decouple contrast boost from fake gamma.

src/core/SkScalerContext.h

Index: src/core/SkScalerContext.h
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index f2df93cef31ad611c79fd8bf3f9c003778753829..96674cd5002a8934df2af4a9933834d7345bf1ad 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -68,13 +68,21 @@ struct SkScalerContextRec {
     }
 
     /**
-     *  Causes the luminance color and contrast to be ignored, and the
-     *  paint and device gamma to be effectively 1.0.
+     *  Causes the luminance color to be ignored, and the paint and device
+     *  gamma to be effectively 1.0
      */
-    void ignorePreBlend() {
+    void ignoreGamma() {
         setLuminanceColor(SK_ColorTRANSPARENT);
         setPaintGamma(SK_Scalar1);
         setDeviceGamma(SK_Scalar1);
+    }
+
+    /**
+     *  Causes the luminance color and contrast to be ignored, and the
+     *  paint and device gamma to be effectively 1.0.
+     */
+    void ignorePreBlend() {
+        ignoreGamma();
         setContrast(0);
     }