Improve nvpr glyph batching

src/gpu/GrStencilAndCoverTextContext.h

Index: src/gpu/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
index 7716c784052a9ef4e01b2a928537e02dd6a8a9ba..dab71e057859f798ca3258ce390055d1aee57fad 100644
--- a/src/gpu/GrStencilAndCoverTextContext.h
+++ b/src/gpu/GrStencilAndCoverTextContext.h
@@ -14,11 +14,11 @@
 #include "SkTHash.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
+#include "batches/GrDrawPathBatch.h"
 
 class GrTextStrike;
 class GrPath;
 class SkSurfaceProps;
-class GrPathRangeDraw;
 
 /*
  * This class implements text rendering using stencil and cover path rendering
@@ -75,6 +75,8 @@ private:
         size_t computeSizeInCache() const;
 
     private:
+        typedef GrDrawPathRangeBatch::InstanceData InstanceData;
+
         SkGlyphCache* getGlyphCache() const;
         GrPathRange* createGlyphs(GrContext*) const;
         void appendGlyph(const SkGlyph&, const SkPoint&, FallbackBlobBuilder*);
@@ -86,11 +88,11 @@ private:
         bool                             fUsingRawGlyphPaths;
         GrUniqueKey                      fGlyphPathsKey;
         int                              fTotalGlyphCount;
-        SkAutoTUnref<GrPathRangeDraw>    fDraw;
+        SkAutoTUnref<InstanceData>       fInstanceData;
+        int                              fFallbackGlyphCount;
         SkAutoTUnref<const SkTextBlob>   fFallbackTextBlob;
         mutable SkGlyphCache*            fDetachedGlyphCache;
         mutable uint32_t                 fLastDrawnGlyphsID;
-        mutable SkMatrix                 fLocalMatrixTemplate;
     };
 
     // Text blobs/caches.