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

tests/FontMgrTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkTypeface.h"
@@ skipping 107 matching lines @@
 
 static void test_matchStyleCSS3(skiatest::Reporter* reporter) {
     static const SkFontID invalidFontID = std::numeric_limits<SkFontID>::max();
     static const SkFontStyle invalidFontStyle(101, SkFontStyle::kNormal_Width, SkFontStyle::kUpright_Slant);
 
     class TestTypeface : public SkTypeface {
     public:
         TestTypeface(const SkFontStyle& fontStyle, SkFontID id) : SkTypeface(fontStyle, id, false){}
     protected:
         SkStreamAsset* onOpenStream(int* ttcIndex) const override { return nullptr; }
-        SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override {
+        SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
+                                               const SkDescriptor*) const override {
             return nullptr;
         }
         void onFilterRec(SkScalerContextRec*) const override { }
         virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
             PerGlyphInfo,
             const uint32_t*, uint32_t) const override { return nullptr; }
         void onGetFontDescriptor(SkFontDescriptor*, bool*) const override { }
         virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
             uint16_t glyphs[], int glyphCount) const override {
             if (glyphs && glyphCount > 0) {
@@ skipping 501 matching lines @@
 }
 
 DEFINE_bool(verboseFontMgr, false, "run verbose fontmgr tests.");
 
 DEF_TEST(FontMgr, reporter) {
     test_matchStyleCSS3(reporter);
     test_fontiter(reporter, FLAGS_verboseFontMgr);
     test_alias_names(reporter);
     test_font(reporter);
 }