Add GrResourceCache2.

include/gpu/GrContext.h

Index: include/gpu/GrContext.h
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index d6245100d6c947165dfe9b85b08ae14f0817b268..4f9b642b23d86d048ddb7e6101a9092a061494e8 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -35,6 +35,7 @@ class GrPath;
 class GrPathRenderer;
 class GrResourceEntry;
 class GrResourceCache;
+class GrResourceCache2;
 class GrStencilBuffer;
 class GrTestTarget;
 class GrTextContext;
@@ -926,6 +927,7 @@ public:
     GrDrawTarget* getTextTarget();
     const GrIndexBuffer* getQuadIndexBuffer() const;
     GrAARectRenderer* getAARectRenderer() { return fAARectRenderer; }
+    GrResourceCache2* getResourceCache2() { return fResourceCache2; }
 
     // Called by tests that draw directly to the context via GrDrawTarget
     void getTestTarget(GrTestTarget*);
@@ -973,6 +975,7 @@ private:
     GrDrawState*                    fDrawState;
 
     GrResourceCache*                fResourceCache;

[robertphillips, 2014/08/15 19:36:17]

SkAutoTDelete ?

[bsalomon, 2014/08/19 15:16:08]

I think we want to control the order these things are deleted in. If we use
AutoTDelete then we'll need to order the member list here.

+    GrResourceCache2*               fResourceCache2;
     GrFontCache*                    fFontCache;
     SkAutoTDelete<GrLayerCache>     fLayerCache;