Decouple contrast boost from fake gamma.

include/core/SkDraw.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkDraw_DEFINED
@@ skipping 121 matching lines @@
      *  Return the current clip bounds, in local coordinates, with slop to account
      *  for antialiasing or hairlines (i.e. device-bounds outset by 1, and then
      *  run through the inverse of the matrix).
      *
      *  If the matrix cannot be inverted, or the current clip is empty, return
      *  false and ignore bounds parameter.
      */
     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 scalerContextFlags() const;
 
 public:
     SkPixmap        fDst;
     const SkMatrix* fMatrix;        // required
     const SkRegion* fClip;          // DEPRECATED
     const SkRasterClip* fRC;        // required
 
     const SkClipStack* fClipStack;  // optional
     SkBaseDevice*   fDevice;        // optional
 
 #ifdef SK_DEBUG
     void validate() const;
 #else
     void validate() const {}
 #endif
 };
 
 #endif