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..20a346a412ffeec4a731c441f9c7ab4f7958da04 100644
--- a/src/gpu/GrDrawingManager.h
+++ b/src/gpu/GrDrawingManager.h
@@ -8,6 +8,7 @@
 #ifndef GrDrawingManager_DEFINED
 #define GrDrawingManager_DEFINED
 

[robertphillips, 2016/08/11 18:33:08]

Can we predeclare this rather than include it?

[Brian Osman, 2016/08/11 18:37:14]

No, because of the smart pointer destructor. :(

+#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())
@@ -80,6 +84,8 @@ private:
     bool                        fAbandoned;
     SkTDArray<GrDrawTarget*>    fDrawTargets;
 

[robertphillips, 2016/08/11 18:33:08]

might as well sk_sp this

[bsalomon, 2016/08/11 18:34:44]

It's not ref-counted.

+    SkAutoTDelete<GrAtlasTextContext> fAtlasTextContext;

[bsalomon, 2016/08/11 18:33:45]

preserve alignment (or unalign everyone)?

+
     GrPathRendererChain*        fPathRendererChain;
     GrSoftwarePathRenderer*     fSoftwarePathRenderer;