Use clipped bounds for reordering decisions

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 178 matching lines @@
             return dt->isSetFlag(GrDrawTarget::kTempMark_Flag);
         }
         static int NumDependencies(const GrDrawTarget* dt) {
             return dt->fDependencies.count();
         }
         static GrDrawTarget* Dependency(GrDrawTarget* dt, int index) {
             return dt->fDependencies[index];
         }
     };
 
-    void recordBatch(GrBatch*);
+    void recordBatch(GrBatch*, const SkRect& clippedBounds);
     void forwardCombine();
 
     // 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&,
                                  GrRenderTarget*,
                                  const GrClip&,
                                  const GrPipelineOptimizations& optimizations,
                                  GrXferProcessor::DstTexture*,
                                  const SkRect& batchBounds);
 
     void addDependency(GrDrawTarget* dependedOn);
 
     // Used only by drawContextPriv.
     void clearStencilClip(const SkIRect&, bool insideClip, GrRenderTarget*);
 
-    SkSTArray<256, SkAutoTUnref<GrBatch>, true>     fBatches;
+    struct RecordedBatch {
+        sk_sp<GrBatch> fBatch;
+        SkRect         fClippedBounds;
+    };
+    SkSTArray<256, RecordedBatch, true>             fRecordedBatches;
     // The context is only in service of the clip mask manager, remove once CMM doesn't need this.
     GrContext*                                      fContext;
     GrGpu*                                          fGpu;
     GrResourceProvider*                             fResourceProvider;
     GrAuditTrail*                                   fAuditTrail;
 
     SkDEBUGCODE(int                                 fDebugID;)
     uint32_t                                        fFlags;
 
     // 'this' drawTarget relies on the output of the drawTargets in 'fDependencies'
     SkTDArray<GrDrawTarget*>                        fDependencies;
     GrRenderTarget*                                 fRenderTarget;
 
     bool                                            fClipBatchToBounds;
     bool                                            fDrawBatchBounds;
     int                                             fMaxBatchLookback;
     int                                             fMaxBatchLookahead;
 
     SkAutoTDelete<gr_instanced::InstancedRendering> fInstancedRendering;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif