Change Atlas recycling to track current flush count and recycle if Atlas not used in current flush.

src/gpu/GrInOrderDrawBuffer.h

Index: src/gpu/GrInOrderDrawBuffer.h
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index 6512dccf0d702fbbdb08ac2680c83b9021b50c9d..64e4ab29ed35ca00ce8b90b5025d3d03187a4dc9 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -66,6 +66,10 @@ public:
      */
     void flush();
 
+    // tracking for flush tokens
+    virtual FlushToken getCurrentFlushToken() { return FlushToken(this, fFlushID); }
+    virtual bool       isCurrentFlush(uint32_t flushID) { return flushID == fFlushID; }

[bsalomon, 2013/08/14 19:04:27]

shouldn't this be private?

[jvanverth1, 2013/08/15 14:49:58]

Done.

+
     // overrides from GrDrawTarget
     virtual bool geometryHints(int* vertexCount,
                                int* indexCount) const SK_OVERRIDE;
@@ -75,7 +79,6 @@ public:
 
     virtual void initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) SK_OVERRIDE;
 
-
 protected:
     virtual void clipWillBeSet(const GrClipData* newClip) SK_OVERRIDE;
 
@@ -223,6 +226,7 @@ private:
     SkSTArray<kGeoPoolStatePreAllocCnt, GeometryPoolState> fGeoPoolStateStack;
 
     bool                            fFlushing;
+    uint32_t                        fFlushID;
 
     typedef GrDrawTarget INHERITED;
 };