Revert "Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.c…

include/core/SkPaint.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 SkPaint_DEFINED
 #define SkPaint_DEFINED
 
@@ skipping 12 matching lines @@
 class SkWriteBuffer;
 class SkGlyph;
 struct SkRect;
 class SkGlyphCache;
 class SkImageFilter;
 class SkMaskFilter;
 class SkPath;
 class SkPathEffect;
 struct SkPoint;
 class SkRasterizer;
+struct SkScalerContextEffects;
 class SkShader;
 class SkSurfaceProps;
 class SkTypeface;
 
 #define kBicubicFilterBitmap_Flag kHighQualityFilterBitmap_Flag
 
 /** \class SkPaint
 
     The SkPaint class holds the style and color information about how to draw
     geometries, text and bitmaps.
@@ skipping 1049 matching lines @@
         kBoostContrast_ScalerContextFlag = 1 << 1,
 
         kFakeGammaAndBoostContrast_ScalerContextFlags =
             kFakeGamma_ScalerContextFlag | kBoostContrast_ScalerContextFlag,
     };
 
     /*
      * Allocs an SkDescriptor on the heap and return it to the caller as a refcnted
      * SkData.  Caller is responsible for managing the lifetime of this object.
      */
-    void getScalerContextDescriptor(SkAutoDescriptor*, const SkSurfaceProps& surfaceProps,
+    void getScalerContextDescriptor(SkScalerContextEffects*, SkAutoDescriptor*,
+                                    const SkSurfaceProps& surfaceProps,
                                     uint32_t scalerContextFlags, const SkMatrix*) const;
 
     SkGlyphCache* detachCache(const SkSurfaceProps* surfaceProps, uint32_t scalerContextFlags,
                               const SkMatrix*) const;
 
     void descriptorProc(const SkSurfaceProps* surfaceProps, uint32_t scalerContextFlags,
                         const SkMatrix* deviceMatrix,
-                        void (*proc)(SkTypeface*, const SkDescriptor*, void*),
+                        void (*proc)(SkTypeface*, const SkScalerContextEffects&,
+                                     const SkDescriptor*, void*),
                         void* context) const;
 
     /*
      * The luminance color is used to determine which Gamma Canonical color to map to.  This is
      * really only used by backends which want to cache glyph masks, and need some way to know if
      * they need to generate new masks based off a given color.
      */
     SkColor computeLuminanceColor() const;
 
     enum {
@@ skipping 44 matching lines @@
     friend class GrStencilAndCoverTextContext;
     friend class GrPathRendering;
     friend class GrTextUtils;
     friend class GrGLPathRendering;
     friend class SkScalerContext;
     friend class SkTextBaseIter;
     friend class SkCanonicalizePaint;
 };
 
 #endif