Move GrAtlasTextContext to GrDrawingManager, so we only have one.

src/gpu/GrDrawingManager.h

Index: src/gpu/GrDrawingManager.h
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h
index 99fc087fd127bf1b4a45077203cfe50f8e3b61d4..3e9f95699414770ac67b30b604a962182fd3a143 100644
--- a/src/gpu/GrDrawingManager.h
+++ b/src/gpu/GrDrawingManager.h
@@ -8,6 +8,7 @@
 #ifndef GrDrawingManager_DEFINED
 #define GrDrawingManager_DEFINED
 
+#include "text/GrAtlasTextContext.h"
 #include "GrDrawTarget.h"
 #include "GrBatchFlushState.h"
 #include "GrPathRendererChain.h"
@@ -41,6 +42,8 @@ public:
 
     GrContext* getContext() { return fContext; }
 
+    GrAtlasTextContext* getAtlasTextContext();
+
     GrPathRenderer* getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
                                     bool allowSW,
                                     GrPathRendererChain::DrawType drawType,
@@ -55,6 +58,7 @@ private:
         , fOptionsForDrawTargets(optionsForDrawTargets)
         , fSingleOwner(singleOwner)
         , fAbandoned(false)
+        , fAtlasTextContext(nullptr)
         , fPathRendererChain(nullptr)
         , fSoftwarePathRenderer(nullptr)
         , fFlushState(context->getGpu(), context->resourceProvider())
@@ -71,20 +75,22 @@ private:
     static const int kNumPixelGeometries = 5; // The different pixel geometries
     static const int kNumDFTOptions = 2;      // DFT or no DFT
 
-    GrContext*                  fContext;
-    GrDrawTarget::Options       fOptionsForDrawTargets;
+    GrContext*                        fContext;
+    GrDrawTarget::Options             fOptionsForDrawTargets;
 
     // In debug builds we guard against improper thread handling
-    GrSingleOwner*              fSingleOwner;
+    GrSingleOwner*                    fSingleOwner;
+
+    bool                              fAbandoned;
+    SkTDArray<GrDrawTarget*>          fDrawTargets;
 
-    bool                        fAbandoned;
-    SkTDArray<GrDrawTarget*>    fDrawTargets;
+    SkAutoTDelete<GrAtlasTextContext> fAtlasTextContext;
 
-    GrPathRendererChain*        fPathRendererChain;
-    GrSoftwarePathRenderer*     fSoftwarePathRenderer;
+    GrPathRendererChain*              fPathRendererChain;
+    GrSoftwarePathRenderer*           fSoftwarePathRenderer;
 
-    GrBatchFlushState           fFlushState;
-    bool                        fFlushing;
+    GrBatchFlushState                 fFlushState;
+    bool                              fFlushing;
 };
 
 #endif