Remove DrawingMgr shims from GrContext

include/gpu/GrDrawContext.h

Index: include/gpu/GrDrawContext.h
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
index 86a0efe0ac258070752de71eca1fdedeba89c19d..edb9f59c216f4d3b25c5b3f6f43795c851da7def 100644
--- a/include/gpu/GrDrawContext.h
+++ b/include/gpu/GrDrawContext.h
@@ -9,6 +9,7 @@
 #define GrDrawContext_DEFINED
 
 #include "GrColor.h"
+#include "GrContext.h"
 #include "SkRefCnt.h"
 #include "SkSurfaceProps.h"
 
@@ -256,7 +257,7 @@ private:
 
     SkDEBUGCODE(void validate() const;)
 
-    GrDrawContext(GrContext*, GrRenderTarget*, const SkSurfaceProps* surfaceProps);
+    GrDrawContext(GrContext::DrawingMgr*, GrRenderTarget*, const SkSurfaceProps* surfaceProps);
 
     void internalDrawPath(GrDrawTarget*,
                           GrPipelineBuilder*,
@@ -272,15 +273,15 @@ private:
 
     GrDrawTarget* getDrawTarget();
 
-    GrContext*          fContext;     // owning context -> no ref
-    GrRenderTarget*     fRenderTarget;
+    GrContext::DrawingMgr* fDrawingMgr;
+    GrRenderTarget*        fRenderTarget;
 
     // In MDB-mode the drawTarget can be closed by some other drawContext that has picked
     // it up. For this reason, the drawTarget should only ever be accessed via 'getDrawTarget'.
-    GrDrawTarget*       fDrawTarget;
-    GrTextContext*      fTextContext; // lazily gotten from GrContext::DrawingMgr
+    GrDrawTarget*          fDrawTarget;
+    GrTextContext*         fTextContext; // lazily gotten from GrContext::DrawingMgr
 
-    SkSurfaceProps      fSurfaceProps;
+    SkSurfaceProps         fSurfaceProps;
 };
 
 #endif