Move GrBatchFlushState from GrDrawTarget to GrDrawingManager

src/gpu/GrDrawingManager.h

Index: src/gpu/GrDrawingManager.h
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h
index c8b9a9b471405f2154d5474568d663c7ad4d3c6d..da7c999cc8487a5c67158a25e59c65720d339521 100644
--- a/src/gpu/GrDrawingManager.h
+++ b/src/gpu/GrDrawingManager.h
@@ -9,6 +9,7 @@
 #define GrDrawingManager_DEFINED
 
 #include "GrDrawTarget.h"
+#include "GrBatchFlushState.h"
 #include "GrPathRendererChain.h"
 #include "GrPathRenderer.h"
 #include "SkTDArray.h"
@@ -49,14 +50,16 @@ public:
                                     GrPathRendererChain::DrawType drawType,
                                     GrPathRenderer::StencilSupport* stencilSupport = NULL);
 
+    static bool ProgramUnitTest(GrContext* context, GrDrawTarget* drawTarget, int maxStages);
+
 private:
-    GrDrawingManager(GrContext* context, GrDrawTarget::Options options)
+    GrDrawingManager(GrContext* context)
         : fContext(context)
         , fAbandoned(false)
-        , fOptions(options)
         , fNVPRTextContext(nullptr)
         , fPathRendererChain(nullptr)
-        , fSoftwarePathRenderer(nullptr) {
+        , fSoftwarePathRenderer(nullptr)
+        , fFlushState(context->getGpu(), context->resourceProvider()) {
         sk_bzero(fTextContexts, sizeof(fTextContexts));
     }
 
@@ -74,13 +77,14 @@ private:
 
     bool                        fAbandoned;
     SkTDArray<GrDrawTarget*>    fDrawTargets;
-    GrDrawTarget::Options       fOptions;
 
     GrTextContext*              fNVPRTextContext;
     GrTextContext*              fTextContexts[kNumPixelGeometries][kNumDFTOptions];
 
     GrPathRendererChain*        fPathRendererChain;
     GrSoftwarePathRenderer*     fSoftwarePathRenderer;
+
+    GrBatchFlushState           fFlushState;
 };
 
 #endif