Remove GrFontScaler class

src/gpu/text/GrAtlasTextBlob.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlasTextBlob_DEFINED
 #define GrAtlasTextBlob_DEFINED
 
@@ skipping 142 matching lines @@
                              const SkPaint& skPaint,
                              const SkMatrix* viewMatrix);
 
     // Appends a glyph to the blob.  If the glyph is too large, the glyph will be appended
     // as a path.
     void appendGlyph(int runIndex,
                      const SkRect& positions,
                      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) {
         switch (maskFormat) {
             case kA8_GrMaskFormat:
                 return kGrayTextVASize;
             case kARGB_GrMaskFormat:
                 return kColorTextVASize;
             default:
                 return kLCDTextVASize;
@@ skipping 77 matching lines @@
         fPaintColor = color;
         this->setupViewMatrix(viewMatrix, x, y);
     }
 
     void initThrowawayBlob(const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
         this->setupViewMatrix(viewMatrix, x, y);
     }
 
     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);
 
     const Key& key() const { return fKey; }
 
     ~GrAtlasTextBlob() {
         for (int i = 0; i < fRunCount; i++) {
             fRuns[i].~Run();
         }
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     // Internal test methods
     GrDrawBatch* test_createBatch(int glyphCount, int run, int subRun,
                                   const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color,
                                   const SkPaint& skPaint, const SkSurfaceProps& props,
                                   const GrDistanceFieldAdjustTable* distanceAdjustTable,
                                   GrBatchFontCache* cache);
 
 private:
     GrAtlasTextBlob()
         : fMaxMinScale(-SK_ScalarMax)
         , 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&,
                          int run, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color,
                          const SkPaint& skPaint, const SkSurfaceProps& props,
                          const GrDistanceFieldAdjustTable* distanceAdjustTable,
                          GrBatchFontCache* cache);
 
     void flushBigGlyphs(GrContext* context, GrDrawContext* dc,
                         const GrClip& clip, const SkPaint& skPaint,
@@ skipping 184 matching lines @@
         SkAutoTDelete<SkAutoDescriptor> fOverrideDescriptor; // df properties
         bool fInitialized;
         bool fDrawAsPaths;
     };
 
     template <bool regenPos, bool regenCol, bool regenTexCoords, bool regenGlyphs>
     void regenInBatch(GrDrawBatch::Target* target,
                       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;
 
     inline GrDrawBatch* createBatch(const Run::SubRunInfo& info,
                                     int glyphCount, int run, int subRun,
                                     const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
                                     GrColor color,
                                     const SkPaint& skPaint, const SkSurfaceProps& props,
                                     const GrDistanceFieldAdjustTable* distanceAdjustTable,
@@ skipping 44 matching lines @@
     // We can reuse distance field text, but only if the new viewmatrix would not result in
     // a mip change.  Because there can be multiple runs in a blob, we track the overall
     // maximum minimum scale, and minimum maximum scale, we can support before we need to regen
     SkScalar fMaxMinScale;
     SkScalar fMinMaxScale;
     int fRunCount;
     uint8_t fTextType;
 };
 
 #endif