commit 2d70dcbe5cf4b1d26bb03070d4f8cffd756dd509
author robertphillips <robertphillips@google.com> Tue Oct 06 07:38:23 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 06 07:38:23 2015 -0700
tree 0350c5d1e7d441337489a6cbbeb1f6ecd55dc540
parent b0cd8b714629352638f17154cfc05ade03fff8f5

Dynamically allocate the GrDrawContexts

This CL moves the allocation and storage of the GrTextContexts into the DrawingManager. The GrDrawContexts now just get their GrTextContext from the DrawingManager.

Review URL: https://codereview.chromium.org/1375153007

include/gpu/GrContext.h

diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 59ce867..51879e0 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -183,6 +183,10 @@
         return fDrawingMgr.drawContext(surfaceProps);
     }
 
+    GrTextContext* textContext(const SkSurfaceProps& surfaceProps, GrRenderTarget* rt) {
+        return fDrawingMgr.textContext(surfaceProps, rt);
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // Misc.
 
@@ -410,17 +414,19 @@
     GrContext(); // init must be called after the constructor.
     bool init(GrBackend, GrBackendContext, const GrContextOptions& options);
 
-    // Currently the DrawingMgr stores a separate GrDrawContext for each
+    // Currently the DrawingMgr creates a separate GrTextContext for each
     // combination of text drawing options (pixel geometry x DFT use)
-    // and hands the appropriate one back given the user's request.
-    // All of the GrDrawContexts still land in the same GrDrawTarget!
+    // and hands the appropriate one back given the DrawContext's request.
+    //
+    // It allocates a new GrDrawContext for each GrRenderTarget
+    // but all of them still land in the same GrDrawTarget!
     //
     // In the future this class will allocate a new GrDrawContext for
     // each GrRenderTarget/GrDrawTarget and manage the DAG.
     class DrawingMgr {
     public:
-        DrawingMgr() : fDrawTarget(NULL) {
-            sk_bzero(fDrawContext, sizeof(fDrawContext));
+        DrawingMgr() : fDrawTarget(nullptr), fNVPRTextContext(nullptr) {
+            sk_bzero(fTextContexts, sizeof(fTextContexts));
         }
 
         ~DrawingMgr();
@@ -433,10 +439,12 @@
         void reset();
         void flush();
 
-        // Callers should take a ref if they rely on the GrDrawContext sticking around.
+        // Callers assume the creation ref of the drawContext!
         // NULL will be returned if the context has been abandoned.
         GrDrawContext* drawContext(const SkSurfaceProps* surfaceProps);
 
+        GrTextContext* textContext(const SkSurfaceProps& props, GrRenderTarget* rt);
+
     private:
         void cleanup();
 
@@ -448,7 +456,8 @@
         GrContext*        fContext;
         GrDrawTarget*     fDrawTarget;
 
-        GrDrawContext*    fDrawContext[kNumPixelGeometries][kNumDFTOptions];
+        GrTextContext*    fNVPRTextContext;
+        GrTextContext*    fTextContexts[kNumPixelGeometries][kNumDFTOptions];
     };
 
     DrawingMgr                      fDrawingMgr;