Make GrTextContext be owned by the GrDrawContext

src/gpu/GrContext.cpp

Index: src/gpu/GrContext.cpp
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index ca98ffb416a7f6fec0364cedbc38b8abcda5c6f5..aaf0a017009df37c02ffcad744fd3f53c8bd0932 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -9,7 +9,6 @@
 #include "GrContext.h"
 
 #include "GrAARectRenderer.h"
-#include "GrAtlasTextContext.h"
 #include "GrBatch.h"
 #include "GrBatchFontCache.h"
 #include "GrBatchTarget.h"
@@ -32,7 +31,6 @@
 #include "GrResourceCache.h"
 #include "GrResourceProvider.h"
 #include "GrSoftwarePathRenderer.h"
-#include "GrStencilAndCoverTextContext.h"
 #include "GrStrokeInfo.h"
 #include "GrSurfacePriv.h"
 #include "GrTextBlobCache.h"
@@ -62,24 +60,33 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrContext::DrawingMgr::init(GrContext* context) {
+    fContext = context;
+
 #ifdef IMMEDIATE_MODE
     fDrawTarget = SkNEW_ARGS(GrImmediateDrawTarget, (context));
 #else
     fDrawTarget = SkNEW_ARGS(GrInOrderDrawBuffer, (context));
 #endif    
-
-    fDrawContext = SkNEW_ARGS(GrDrawContext, (context, fDrawTarget));
 }
 
 GrContext::DrawingMgr::~DrawingMgr() {
     SkSafeUnref(fDrawTarget);
-    SkSafeUnref(fDrawContext);
+    for (int i = 0; i < kNumContextFlavors; ++i) {
+        SkSafeUnref(fDrawContext[i][0]);
+        SkSafeUnref(fDrawContext[i][1]);
+    }
 }
 
 void GrContext::DrawingMgr::abandon() {
     SkSafeSetNull(fDrawTarget);
-    SkSafeSetNull(fDrawContext->fDrawTarget);
-    SkSafeSetNull(fDrawContext);
+    for (int i = 0; i < kNumContextFlavors; ++i) {
+        for (int j = 0; j < 2; ++j) {

[joshualitt, 2015/06/09 17:10:02]

magic numbers :(

[robertphillips, 2015/06/09 17:26:40]

Done.

+            if (fDrawContext[i][j]) {
+                SkSafeSetNull(fDrawContext[i][j]->fDrawTarget);
+                SkSafeSetNull(fDrawContext[i][j]);
+            }
+        }
+    }
 }
 
 void GrContext::DrawingMgr::purgeResources() {
@@ -100,11 +107,29 @@ void GrContext::DrawingMgr::flush() {
     }
 }
 
-GrDrawContext* GrContext::DrawingMgr::drawContext() { 
+GrDrawContext* GrContext::DrawingMgr::drawContext(const SkDeviceProperties* devProps, bool useDFT) { 
     if (this->abandoned()) {
         return NULL;
     }
-    return fDrawContext; 
+
+    const SkDeviceProperties defProps;
+    if (!devProps) {
+        devProps = &defProps;
+    }
+
+    SkASSERT(devProps->pixelGeometry() < kNumContextFlavors);
+    if (!fDrawContext[devProps->pixelGeometry()][useDFT]) {
+        fDrawContext[devProps->pixelGeometry()][useDFT] =
+                SkNEW_ARGS(GrDrawContext, (fContext, fDrawTarget, *devProps, useDFT));
+    }
+
+    SkASSERT(fDrawContext[devProps->pixelGeometry()][useDFT]->fDevProps->pixelGeometry() ==
+             devProps->pixelGeometry());
+    SkASSERT(fDrawContext[devProps->pixelGeometry()][useDFT]->fDevProps->gamma() == 
+             devProps->gamma());
+    SkASSERT(fDrawContext[devProps->pixelGeometry()][useDFT]->fUseDFT == useDFT);
+
+    return fDrawContext[devProps->pixelGeometry()][useDFT]; 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -246,20 +271,6 @@ void GrContext::getResourceCacheUsage(int* resourceCount, size_t* resourceBytes)
     }
 }
 
-GrTextContext* GrContext::createTextContext(GrRenderTarget* renderTarget,
-                                            const SkDeviceProperties&
-                                            leakyProperties,
-                                            bool enableDistanceFieldFonts) {
-    if (fGpu->caps()->shaderCaps()->pathRenderingSupport() && renderTarget->isMultisampled()) {
-        GrStencilAttachment* sb = renderTarget->renderTargetPriv().attachStencilAttachment();
-        if (sb) {
-            return GrStencilAndCoverTextContext::Create(this, leakyProperties);
-        }
-    } 
-
-    return GrAtlasTextContext::Create(this, leakyProperties, enableDistanceFieldFonts);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrContext::OverBudgetCB(void* data) {