Move appending of large glyphs into GrAtlasTextBlob

src/gpu/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 262 matching lines @@
 
     void push_back_run(int currRun) {
         SkASSERT(currRun < fRunCount);
         if (currRun > 0) {
             Run::SubRunInfo& newRun = fRuns[currRun].fSubRunInfo.back();
             Run::SubRunInfo& lastRun = fRuns[currRun - 1].fSubRunInfo.back();
             newRun.setAsSuccessor(lastRun);
         }
     }
 
+    // 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);
+                     GrGlyph* glyph,
+                     GrFontScaler* scaler, const SkGlyph& skGlyph,
+                     SkScalar x, SkScalar y, SkScalar scale, bool applyVM);
+
+    void appendLargeGlyph(GrGlyph* glyph, GrFontScaler* scaler, const SkGlyph& skGlyph,

[bsalomon, 2015/12/09 20:49:41]

can this be private? otherwise lgtm

+                          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;
         }
     }
 
     bool mustRegenerate(SkScalar* outTransX, SkScalar* outTransY, const SkPaint& paint,
                         GrColor color, const SkMaskFilter::BlurRec& blurRec,
                         const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
 
     // position + local coord
     static const size_t kColorTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
     static const size_t kGrayTextVASize = sizeof(SkPoint) + sizeof(GrColor) + sizeof(SkIPoint16);
     static const size_t kLCDTextVASize = kGrayTextVASize;
     static const int kVerticesPerGlyph = 4;
 
 #ifdef CACHE_SANITY_CHECK
     static void AssertEqual(const GrAtlasTextBlob&, const GrAtlasTextBlob&);
     size_t fSize;
 #endif
 };
 
 #endif