Pass effects directly to fontcache

include/core/SkPaint.h

Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 57122550b3032df6afd74e1a82fb298a633ea6b7..8abcabbe72b846c0d1e24a4d6eb8f513a2089053 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -30,6 +30,7 @@ class SkPath;
 class SkPathEffect;
 struct SkPoint;
 class SkRasterizer;
+struct SkScalerContextEffects;
 class SkShader;
 class SkSurfaceProps;
 class SkTypeface;
@@ -1093,15 +1094,16 @@ private:
      * 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,
-                                    FakeGamma fakeGamma, const SkMatrix*) const;
+    void getScalerContextDescriptor(SkAutoDescriptor*, SkScalerContextEffects*,
+                                    const SkSurfaceProps&, FakeGamma, const SkMatrix*) const;
 
     SkGlyphCache* detachCache(const SkSurfaceProps* surfaceProps, FakeGamma fakeGamma,
                               const SkMatrix*) const;
 
     void descriptorProc(const SkSurfaceProps* surfaceProps, FakeGamma fakeGamma,
                         const SkMatrix* deviceMatrix,
-                        void (*proc)(SkTypeface*, const SkDescriptor*, void*),
+                        void (*proc)(SkTypeface*, const SkScalerContextEffects&,
+                                     const SkDescriptor*, void*),
                         void* context) const;
 
     /*