Add sanity check to GrAtlasTextBlob

src/gpu/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 20 matching lines @@
     // creates an uncached blob
     GrAtlasTextBlob* createBlob(int glyphCount, int runCount, size_t maxVASize);
     GrAtlasTextBlob* createBlob(const SkTextBlob* blob, size_t maxVAStride) {
         int glyphCount = 0;
         int runCount = 0;
         BlobGlyphCount(&glyphCount, &runCount, blob);
         GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
         return cacheBlob;
     }
 
-    GrAtlasTextBlob* createCachedBlob(const SkTextBlob* blob,
-                                     const GrAtlasTextBlob::Key& key,
-                                     const SkMaskFilter::BlurRec& blurRec,
-                                     const SkPaint& paint,
-                                     size_t maxVAStride) {
-        int glyphCount = 0;
-        int runCount = 0;
-        BlobGlyphCount(&glyphCount, &runCount, blob);
-        GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
+    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) {
+        int glyphCount = 0;
+        int runCount = 0;
+        BlobGlyphCount(&glyphCount, &runCount, blob);
+        GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
+        SetupCacheBlobKey(cacheBlob, 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);
@@ skipping 39 matching lines @@
         if (fBlobList.head() == blob) {
             return;
         }
 
         fBlobList.remove(blob);
         fBlobList.addToHead(blob);
     }
 
     void freeAll();
 
-private:
     // TODO move to SkTextBlob
-    void BlobGlyphCount(int* glyphCount, int* runCount, const SkTextBlob* blob) {
+    static void BlobGlyphCount(int* glyphCount, int* runCount, const SkTextBlob* blob) {
         SkTextBlob::RunIterator itCounter(blob);
         for (; !itCounter.done(); itCounter.next(), (*runCount)++) {
             *glyphCount += itCounter.glyphCount();
         }
     }
 
+private:
     typedef SkTInternalLList<GrAtlasTextBlob> BitmapBlobList;
 
     // Budget was chosen to be ~4 megabytes.  The min alloc and pre alloc sizes in the pool are
     // based off of the largest cached textblob I have seen in the skps(a couple of kilobytes).
     static const int kPreAllocSize = 1 << 17;
     static const int kMinGrowthSize = 1 << 17;
     static const int kBudget = 1 << 22;
     BitmapBlobList fBlobList;
     SkTDynamicHash<GrAtlasTextBlob, GrAtlasTextBlob::Key> fCache;
     GrMemoryPool fPool;
     PFOverBudgetCB fCallback;
     void* fData;
 };
 
 #endif