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

src/gpu/GrTextStrike.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 GrTextStrike_DEFINED
 #define GrTextStrike_DEFINED
 
 #include "GrAllocPool.h"
 #include "GrFontScaler.h"
 #include "GrTHashCache.h"
 #include "GrPoint.h"
 #include "GrGlyph.h"
+#include "GrDrawTarget.h"
 
 class GrAtlasMgr;
 class GrFontCache;
 class GrGpu;
 class GrFontPurgeListener;
 
 /**
  *  The textcache maps a hostfontscaler instance to a dictionary of
  *  glyphid->strike
  */
 class GrTextStrike {
 public:
     GrTextStrike(GrFontCache*, const GrKey* fontScalerKey, GrMaskFormat,
                  GrAtlasMgr*);
     ~GrTextStrike();
 
     const GrKey* getFontScalerKey() const { return fFontScalerKey; }
     GrFontCache* getFontCache() const { return fFontCache; }
     GrMaskFormat getMaskFormat() const { return fMaskFormat; }
 
     inline GrGlyph* getGlyph(GrGlyph::PackedID, GrFontScaler*);
-    bool getGlyphAtlas(GrGlyph*, GrFontScaler*);
+    bool getGlyphAtlas(GrGlyph*, GrFontScaler*, GrDrawTarget::DrawToken currentDrawToken);
 
     // testing
     int countGlyphs() const { return fCache.getArray().count(); }
     const GrGlyph* glyphAt(int index) const {
         return fCache.getArray()[index];
     }
     GrAtlas* getAtlas() const { return fAtlas; }
 
     // returns true if an atlas was removed
     bool removeUnusedAtlases();
@@ skipping 60 matching lines @@
 
     GrGpu*      fGpu;
     GrAtlasMgr* fAtlasMgr;
 
 
     GrTextStrike* generateStrike(GrFontScaler*, const Key&);
     inline void detachStrikeFromList(GrTextStrike*);
 };
 
 #endif