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

src/fonts/SkTestScalerContext.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 165 matching lines @@
 SkTypeface::LocalizedStrings* SkTestTypeface::onCreateFamilyNameIterator() const {
     SkString familyName(fTestFont->fName);
     SkString language("und"); //undetermined
 SkASSERT(0);  // incomplete
     return nullptr;
 //     return new SkOTUtils::LocalizedStrings_SingleName(familyName, language);
 }
 
 class SkTestScalerContext : public SkScalerContext {
 public:
-    SkTestScalerContext(SkTestTypeface* face, const SkDescriptor* desc)
-        : SkScalerContext(face, desc)
+    SkTestScalerContext(SkTestTypeface* face, const SkScalerContextEffects& effects,
+                        const SkDescriptor* desc)
+        : SkScalerContext(face, effects, desc)
         , fFace(face)
     {
         fRec.getSingleMatrix(&fMatrix);
         this->forceGenerateImageFromPath();
     }
 
     virtual ~SkTestScalerContext() {
     }
 
 protected:
@@ skipping 78 matching lines @@
             metrics->fXMax = SkScalarMul(metrics->fXMax, scale);
             metrics->fXHeight = SkScalarMul(metrics->fXHeight, scale);
         }
     }
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
-SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
-    return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), desc);
+SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
+                                                       const SkDescriptor* desc) const {
+    return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), effects, desc);
 }