Revert "Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.chromium.org/1863013003/ )"

add SK_SUPPORT_NEW_ONCREATESCALERCONTEXT for chrome

this has now landed https://codereview.chromium.org/1878913002/
TBR=

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1880873002

Review URL: https://codereview.chromium.org/1880873002

1 files changed, 9 insertions, 4 deletions

diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp
index 0287eb08aa..a3bba4bc7f 100644
--- a/src/gpu/GrPathRendering.cpp
+++ b/src/gpu/GrPathRendering.cpp
@@ -14,8 +14,9 @@
 
 class GlyphGenerator : public GrPathRange::PathGenerator {
 public:
-    GlyphGenerator(const SkTypeface& typeface, const SkDescriptor& desc)
-        : fScalerContext(typeface.createScalerContext(&desc))
+    GlyphGenerator(const SkTypeface& typeface, const SkScalerContextEffects& effects,
+                   const SkDescriptor& desc)
+        : fScalerContext(typeface.createScalerContext(effects, &desc))
 #ifdef SK_DEBUG
         , fDesc(desc.copy())
 #endif
@@ -51,6 +52,7 @@ private:
 };
 
 GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface,
+                                           const SkScalerContextEffects& effects,
                                            const SkDescriptor* desc,
                                            const GrStrokeInfo& stroke) {
     if (nullptr == typeface) {
@@ -59,7 +61,7 @@ GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface,
     }
 
     if (desc) {
-        SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, *desc));
+        SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, effects, *desc));
         return this->createPathRange(generator, stroke);
     }
 
@@ -76,7 +78,10 @@ GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface,
     genericDesc->init();
     genericDesc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
     genericDesc->computeChecksum();
+    
+    // No effects, so we make a dummy struct
+    SkScalerContextEffects noEffects;
 
-    SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, *genericDesc));
+    SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, noEffects, *genericDesc));
     return this->createPathRange(generator, stroke);
 }