Remove GrTextBlobCache/GrAtlasTextBlob friendliness

src/gpu/text/GrTextBlobCache.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTextBlobCache_DEFINED
 #define GrTextBlobCache_DEFINED
 
@@ skipping 12 matching lines @@
     GrTextBlobCache(PFOverBudgetCB cb, void* data)
         : fPool(kPreAllocSize, kMinGrowthSize)
         , fCallback(cb)
         , fData(data)
         , fBudget(kDefaultBudget) {
         SkASSERT(cb && data);
     }
     ~GrTextBlobCache();
 
     // creates an uncached blob
-    GrAtlasTextBlob* createBlob(int glyphCount, int runCount, size_t maxVASize);
-    GrAtlasTextBlob* createBlob(const SkTextBlob* blob, size_t maxVAStride) {
+    GrAtlasTextBlob* createBlob(int glyphCount, int runCount) {
+        return GrAtlasTextBlob::Create(&fPool, glyphCount, runCount);
+    }
+    GrAtlasTextBlob* createBlob(const SkTextBlob* blob) {
         int glyphCount = 0;
         int runCount = 0;
         BlobGlyphCount(&glyphCount, &runCount, blob);
-        GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
+        GrAtlasTextBlob* cacheBlob = GrAtlasTextBlob::Create(&fPool, glyphCount, runCount);
         return cacheBlob;
     }
 
-    static void SetupCacheBlobKey(GrAtlasTextBlob* cacheBlob,
-                                  const GrAtlasTextBlob::Key& key,
-                                  const SkMaskFilter::BlurRec& blurRec,
-                                  const SkPaint& paint) {
-        cacheBlob->fKey = key;
-        if (key.fHasBlur) {
-            cacheBlob->fBlurRec = blurRec;
-        }
-        if (key.fStyle != SkPaint::kFill_Style) {
-            cacheBlob->fStrokeInfo.fFrameWidth = paint.getStrokeWidth();
-            cacheBlob->fStrokeInfo.fMiterLimit = paint.getStrokeMiter();
-            cacheBlob->fStrokeInfo.fJoin = paint.getStrokeJoin();
-        }
-    }
-
     GrAtlasTextBlob* createCachedBlob(const SkTextBlob* blob,
                                       const GrAtlasTextBlob::Key& key,
                                       const SkMaskFilter::BlurRec& blurRec,
-                                      const SkPaint& paint,
-                                      size_t maxVAStride) {
+                                      const SkPaint& paint) {
         int glyphCount = 0;
         int runCount = 0;
         BlobGlyphCount(&glyphCount, &runCount, blob);
-        GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
-        SetupCacheBlobKey(cacheBlob, key, blurRec, paint);
+        GrAtlasTextBlob* cacheBlob = GrAtlasTextBlob::Create(&fPool, glyphCount, runCount);
+        cacheBlob->setupKey(key, blurRec, paint);
         this->add(cacheBlob);
         return cacheBlob;
     }
 
     GrAtlasTextBlob* find(const GrAtlasTextBlob::Key& key) {
         return fCache.find(key);
     }
 
     void remove(GrAtlasTextBlob* blob) {
-        fCache.remove(blob->fKey);
+        fCache.remove(blob->key());
         fBlobList.remove(blob);
         blob->unref();
     }
 
     void add(GrAtlasTextBlob* blob) {
         fCache.add(blob);
         fBlobList.addToHead(blob);
 
         this->checkPurge(blob);
     }
@@ skipping 25 matching lines @@
 private:
     typedef SkTInternalLList<GrAtlasTextBlob> BitmapBlobList;
 
     void checkPurge(GrAtlasTextBlob* blob = nullptr) {
         // If we are overbudget, then unref until we are below budget again
         if (fPool.size() > fBudget) {
             BitmapBlobList::Iter iter;
             iter.init(fBlobList, BitmapBlobList::Iter::kTail_IterStart);
             GrAtlasTextBlob* lruBlob = nullptr;
             while (fPool.size() > fBudget && (lruBlob = iter.get()) && lruBlob != blob) {
-                fCache.remove(lruBlob->fKey);
+                fCache.remove(lruBlob->key());
 
                 // Backup the iterator before removing and unrefing the blob
                 iter.prev();
                 fBlobList.remove(lruBlob);
                 lruBlob->unref();
             }
 
             // If we break out of the loop with lruBlob == blob, then we haven't purged enough
             // use the call back and try to free some more.  If we are still overbudget after this,
             // then this single textblob is over our budget
@@ skipping 16 matching lines @@
     static const int kDefaultBudget = 1 << 22;
     BitmapBlobList fBlobList;
     SkTDynamicHash<GrAtlasTextBlob, GrAtlasTextBlob::Key> fCache;
     GrMemoryPool fPool;
     PFOverBudgetCB fCallback;
     void* fData;
     size_t fBudget;
 };
 
 #endif