Move GrAtlasTextContext to GrDrawingManager, so we only have one.

src/gpu/GrDrawingManager.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawingManager_DEFINED
 #define GrDrawingManager_DEFINED
 
+#include "text/GrAtlasTextContext.h"
 #include "GrDrawTarget.h"
 #include "GrBatchFlushState.h"
 #include "GrPathRendererChain.h"
 #include "GrPathRenderer.h"
 #include "SkTDArray.h"
 
 class GrContext;
 class GrDrawContext;
 class GrSingleOWner;
 class GrSoftwarePathRenderer;
@@ skipping 13 matching lines @@
     sk_sp<GrDrawContext> makeDrawContext(sk_sp<GrRenderTarget> rt,
                                          sk_sp<SkColorSpace>,
                                          const SkSurfaceProps*);
 
     // The caller automatically gets a ref on the returned drawTarget. It must
     // be balanced by an unref call.
     GrDrawTarget* newDrawTarget(GrRenderTarget* rt);
 
     GrContext* getContext() { return fContext; }
 
+    GrAtlasTextContext* getAtlasTextContext();
+
     GrPathRenderer* getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
                                     bool allowSW,
                                     GrPathRendererChain::DrawType drawType,
                                     GrPathRenderer::StencilSupport* stencilSupport = NULL);
 
     static bool ProgramUnitTest(GrContext* context, int maxStages);
 
 private:
     GrDrawingManager(GrContext* context, const GrDrawTarget::Options& optionsForDrawTargets,
                      GrSingleOwner* singleOwner)
         : fContext(context)
         , fOptionsForDrawTargets(optionsForDrawTargets)
         , fSingleOwner(singleOwner)
         , fAbandoned(false)
+        , fAtlasTextContext(nullptr)
         , fPathRendererChain(nullptr)
         , fSoftwarePathRenderer(nullptr)
         , fFlushState(context->getGpu(), context->resourceProvider())
         , fFlushing(false) {
     }
 
     void abandon();
     void cleanup();
     void reset();
     void flush();
 
     friend class GrContext;  // for access to: ctor, abandon, reset & flush
 
     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;
 
-    GrPathRendererChain*        fPathRendererChain;
-    GrSoftwarePathRenderer*     fSoftwarePathRenderer;
+    SkAutoTDelete<GrAtlasTextContext> fAtlasTextContext;
 
-    GrBatchFlushState           fFlushState;
-    bool                        fFlushing;
+    GrPathRendererChain*              fPathRendererChain;
+    GrSoftwarePathRenderer*           fSoftwarePathRenderer;
+
+    GrBatchFlushState                 fFlushState;
+    bool                              fFlushing;
 };
 
 #endif