Clean up the GrTHashTable API.

src/gpu/GrTextStrike.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlas.h"
 #include "GrGpu.h"
 #include "GrRectanizer.h"
@@ skipping 72 matching lines @@
 void GrFontCache::freeAll() {
     fCache.deleteAll();
     for (int i = 0; i < kMaskFormatCount; ++i) {
         delete fAtlasMgr[i];
         fAtlasMgr[i] = NULL;
     }
     fHead = NULL;
     fTail = NULL;
 }
 
+void GrFontCache::purgeStrike(GrTextStrike* strike) {
+    const GrFontCache::Key key(strike->fFontScalerKey);
+    fCache.remove(key, strike);
+    this->detachStrikeFromList(strike);
+    delete strike;
+}
+
 void GrFontCache::purgeExceptFor(GrTextStrike* preserveStrike) {
     SkASSERT(NULL != preserveStrike);
     GrTextStrike* strike = fTail;
     bool purge = true;
     GrMaskFormat maskFormat = preserveStrike->fMaskFormat;
     while (strike) {
         if (strike == preserveStrike || maskFormat != strike->fMaskFormat) {
             strike = strike->fPrev;
             continue;
         }
         GrTextStrike* strikeToPurge = strike;
         strike = strikeToPurge->fPrev;
         if (purge) {
             // keep purging if we won't free up any atlases with this strike.
             purge = strikeToPurge->fAtlas.isEmpty();
-            int index = fCache.slowFindIndex(strikeToPurge);
-            SkASSERT(index >= 0);
-            fCache.removeAt(index, strikeToPurge->fFontScalerKey->getHash());
-            this->detachStrikeFromList(strikeToPurge);
-            delete strikeToPurge;
+            this->purgeStrike(strikeToPurge);
         }
     }
 #if FONT_CACHE_STATS
     ++g_PurgeCount;
 #endif
 }
 
 void GrFontCache::freePlotExceptFor(GrTextStrike* preserveStrike) {
     SkASSERT(NULL != preserveStrike);
     GrTextStrike* strike = fTail;
     GrMaskFormat maskFormat = preserveStrike->fMaskFormat;
     while (strike) {
         if (strike == preserveStrike || maskFormat != strike->fMaskFormat) {
             strike = strike->fPrev;
             continue;
         }
         GrTextStrike* strikeToPurge = strike;
         strike = strikeToPurge->fPrev;
         if (strikeToPurge->removeUnusedPlots()) {
             if (strikeToPurge->fAtlas.isEmpty()) {
-                int index = fCache.slowFindIndex(strikeToPurge);
-                SkASSERT(index >= 0);
-                fCache.removeAt(index, strikeToPurge->fFontScalerKey->getHash());
-                this->detachStrikeFromList(strikeToPurge);
-                delete strikeToPurge;
+                this->purgeStrike(strikeToPurge);
             }
             break;
         }
     }
 }
 
 #ifdef SK_DEBUG
 void GrFontCache::validate() const {
     int count = fCache.count();
     if (0 == count) {
@@ skipping 135 matching lines @@
     GrPlot* plot = fAtlasMgr->addToAtlas(&fAtlas, glyph->width(),
                                          glyph->height(), storage.get(),
                                          &glyph->fAtlasLocation);
     if (NULL == plot) {
         return false;
     }
 
     glyph->fPlot = plot;
     return true;
 }