Use per-typeface sets of glyphs for nvpr text

src/gpu/GrStencilAndCoverTextContext.h

Index: src/gpu/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
index 08d7526b7e390d20e70ef86a75645abad70da2f8..caf4fa4d08f9997602d216770716372372d9f2aa 100644
--- a/src/gpu/GrStencilAndCoverTextContext.h
+++ b/src/gpu/GrStencilAndCoverTextContext.h
@@ -15,6 +15,7 @@
 
 class GrTextStrike;
 class GrPath;
+class GrPathRange;
 
 /*
  * This class implements text rendering using stencil and cover path rendering
@@ -37,7 +38,6 @@ public:
     virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
 
 private:
-    class GlyphPathRange;
     static const int kGlyphBufferSize = 1024;
 
     enum DeviceSpaceGlyphsBehavior {
@@ -55,9 +55,8 @@ private:
     GrDrawState::AutoRestoreEffects fStateRestore;
     SkScalar fTextRatio;
     float fTextInverseRatio;
-    SkStrokeRec fStroke;
     SkGlyphCache* fGlyphCache;
-    GlyphPathRange* fGlyphs;
+    GrPathRange* fGlyphs;
     uint32_t fIndexBuffer[kGlyphBufferSize];
     float fTransformBuffer[2 * kGlyphBufferSize];
     GrDrawTarget::PathTransformType fTransformType;