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

include/core/SkTypeface.h

Index: include/core/SkTypeface.h
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index 0b1ca6a4bdaf02c231fa61fe2e62a68f24b94672..f8cd4d1090923a6160b602836bb37aeba7f2a713 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkTypeface_DEFINED
 #define SkTypeface_DEFINED
 
@@ -16,11 +14,14 @@
 #include "SkRect.h"
 #include "SkString.h"
 
+#define SK_SUPPORT_NEW_ONCREATESCALERCONTEXT
+
 class SkDescriptor;
 class SkFontData;
 class SkFontDescriptor;
 class SkScalerContext;
 struct SkScalerContextRec;
+struct SkScalerContextEffects;
 class SkStream;
 class SkStreamAsset;
 class SkAdvancedTypefaceMetrics;
@@ -295,7 +296,7 @@ public:
      *  if allowFailure is true, this returns NULL, else it returns a
      *  dummy scalercontext that will not crash, but will draw nothing.
      */
-    SkScalerContext* createScalerContext(const SkDescriptor*,
+    SkScalerContext* createScalerContext(const SkScalerContextEffects&, const SkDescriptor*,
                                          bool allowFailure = false) const;
 
     /**
@@ -336,7 +337,8 @@ protected:
     friend class SkScalerContext;
     static SkTypeface* GetDefaultTypeface(Style style = SkTypeface::kNormal);
 
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0;
+    virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
+                                                   const SkDescriptor*) const = 0;
     virtual void onFilterRec(SkScalerContextRec*) const = 0;
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
                         PerGlyphInfo,