Remove GrFontScaler class

src/gpu/text/GrAtlasTextBlob.h

Index: src/gpu/text/GrAtlasTextBlob.h
diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h
index e0e9bb8bdf836eed1b66a69b9d8bfe869afaebe2..788eaba77bfb4ffffde2e84ddd994a5475acd4bf 100644
--- a/src/gpu/text/GrAtlasTextBlob.h
+++ b/src/gpu/text/GrAtlasTextBlob.h
@@ -160,7 +160,7 @@ public:
                      GrColor color,
                      GrBatchTextStrike* strike,
                      GrGlyph* glyph,
-                     GrFontScaler* scaler, const SkGlyph& skGlyph,
+                     SkGlyphCache*, const SkGlyph& skGlyph,
                      SkScalar x, SkScalar y, SkScalar scale, bool applyVM);
 
     static size_t GetVertexStride(GrMaskFormat maskFormat) {
@@ -258,8 +258,7 @@ public:
 
     void regenInBatch(GrDrawBatch::Target* target, GrBatchFontCache* fontCache,
                       GrBlobRegenHelper *helper, int run, int subRun, SkGlyphCache** cache,
-                      SkTypeface** typeface, GrFontScaler** scaler,
-                      const SkDescriptor** desc, size_t vertexStride,
+                      SkTypeface** typeface, const SkDescriptor** desc, size_t vertexStride,
                       const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
                       GrColor color,
                       void** vertices, size_t* byteCount, int* glyphCount);
@@ -286,7 +285,7 @@ private:
         , fMinMaxScale(SK_ScalarMax)
         , fTextType(0) {}
 
-    void appendLargeGlyph(GrGlyph* glyph, GrFontScaler* scaler, const SkGlyph& skGlyph,
+    void appendLargeGlyph(GrGlyph* glyph, SkGlyphCache* cache, const SkGlyph& skGlyph,
                           SkScalar x, SkScalar y, SkScalar scale, bool applyVM);
 
     inline void flushRun(GrDrawContext* dc, GrPipelineBuilder* pipelineBuilder, const GrClip&,
@@ -491,8 +490,7 @@ private:
                       GrBatchFontCache* fontCache,
                       GrBlobRegenHelper* helper,
                       Run* run, Run::SubRunInfo* info, SkGlyphCache** cache,
-                      SkTypeface** typeface, GrFontScaler** scaler,
-                      const SkDescriptor** desc,
+                      SkTypeface** typeface, const SkDescriptor** desc,
                       int glyphCount, size_t vertexStride,
                       GrColor color, SkScalar transX,
                       SkScalar transY) const;