Cleanup GrDrawTarget now that all paths lead to GrBatch

src/gpu/GrDrawTarget.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
@@ skipping 21 matching lines @@
 class GrBatch;
 class GrClip;
 class GrCaps;
 class GrPath;
 class GrDrawBatch;
 class GrDrawPathBatchBase;
 class GrPathRangeDraw;
 
 class GrDrawTarget : public SkRefCnt {
 public:
-    
-
-    typedef GrPathRange::PathIndexType PathIndexType;
-    typedef GrPathRendering::PathTransformType PathTransformType;
-
-    ///////////////////////////////////////////////////////////////////////////
-
     // The context may not be fully constructed and should not be used during GrDrawTarget
     // construction.
     GrDrawTarget(GrGpu* gpu, GrResourceProvider*);
 
-    virtual ~GrDrawTarget();
+    ~GrDrawTarget() override;
 
     /**
      * Empties the draw buffer of any queued up draws.
      */
-    void reset() { this->onReset(); }
+    void reset();
 
     /**
      * This plays any queued up draws to its GrGpu target. It also resets this object (i.e. flushing
      * is destructive).
      */
     void flush();
 
     /**
      * Gets the capabilities of the draw target.
      */
@@ skipping 135 matching lines @@
 
     // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
     // but couldn't be made. Otherwise, returns true.  This method needs to be protected because it
     // needs to be accessed by GLPrograms to setup a correct drawstate
     bool setupDstReadIfNecessary(const GrPipelineBuilder&,
                                  const GrProcOptInfo& colorPOI,
                                  const GrProcOptInfo& coveragePOI,
                                  GrXferProcessor::DstTexture*,
                                  const SkRect* drawBounds);
 
-    virtual void onDrawBatch(GrBatch*) = 0;
+    void recordBatch(GrBatch*);
 
 private:
-    virtual void onReset() = 0;
-
-    virtual void onFlush() = 0;
+    SkSTArray<256, SkAutoTUnref<GrBatch>, true> fBatches;
 
     void drawPathBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawPathBatchBase* batch,
                        GrPathRendering::FillType fill);
     // Check to see if this set of draw commands has been sent out
     void getPathStencilSettingsForFilltype(GrPathRendering::FillType,
                                            const GrStencilAttachment*,
                                            GrStencilSettings*);
     virtual GrClipMaskManager* clipMaskManager() = 0;
     virtual bool setupClip(const GrPipelineBuilder&,
                            GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                            GrPipelineBuilder::AutoRestoreStencil*,
                            GrScissorState*,
                            const SkRect* devBounds) = 0;
 
     GrGpu*                  fGpu;
     const GrCaps*           fCaps;
     GrResourceProvider*     fResourceProvider;
     bool                    fFlushing;
+    GrBatchToken            fLastFlushToken;
 
     typedef SkRefCnt INHERITED;
 };
 
 /*
  * This class is JUST for clip mask manager.  Everyone else should just use draw target above.
  */
 class GrClipTarget : public GrDrawTarget {
 public:
     GrClipTarget(GrContext*);
@@ skipping 28 matching lines @@
     bool setupClip(const GrPipelineBuilder&,
                    GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                    GrPipelineBuilder::AutoRestoreStencil*,
                    GrScissorState* scissorState,
                    const SkRect* devBounds) override;
 
     typedef GrDrawTarget INHERITED;
 };
 
 #endif