BitmapTextBatch and BitmapTextBlob

include/gpu/GrContext.h

Index: include/gpu/GrContext.h
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 335b4169cceb944c475a0d964d618c68d8a69ce8..f631f56baa1e4325a4beb2747f4894887439d99e 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -19,6 +19,7 @@
 #include "SkTypes.h"
 
 class GrAARectRenderer;
+class GrBatchFontCache;
 class GrDrawTarget;
 class GrFontCache;
 class GrFragmentProcessor;
@@ -654,6 +655,7 @@ public:
     // Functions intended for internal use only.
     GrGpu* getGpu() { return fGpu; }
     const GrGpu* getGpu() const { return fGpu; }
+    GrBatchFontCache* getBatchFontCache() { return fBatchFontCache; }
     GrFontCache* getFontCache() { return fFontCache; }
     GrLayerCache* getLayerCache() { return fLayerCache.get(); }
     GrDrawTarget* getTextTarget();
@@ -695,6 +697,7 @@ private:
     GrGpu*                          fGpu;
 
     GrResourceCache*                fResourceCache;
+    GrBatchFontCache*               fBatchFontCache;

[bsalomon, 2015/03/24 16:27:53]

Is this what gets replaced by skresourcecache?

[joshualitt, 2015/03/25 14:13:37]

This cache replaces fFontCache.  SkResourceCache replaces the hashmap on
GrBitmapTextContext

[bsalomon, 2015/03/25 14:19:15]

Ah, ok. Haven't looked at this yet.

     GrFontCache*                    fFontCache;
     SkAutoTDelete<GrLayerCache>     fLayerCache;