commit 374b2f7cea8b1117f0dd17cdecd2b3ec85b141d4
author joshualitt <joshualitt@chromium.org> Tue Jul 21 08:05:03 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 21 08:05:03 2015 -0700
tree 5bcf2e1b76742818dfaedc8da610b4b6eeeab949
parent 4ec1ac6a2dc7e43c4179638f3dd801be6f3b386e

rename BitmapTextBlob and move it to its own file

BUG=skia:

Review URL: https://codereview.chromium.org/1249663002

src/gpu/GrTextBlobCache.cpp

diff --git a/src/gpu/GrTextBlobCache.cpp b/src/gpu/GrTextBlobCache.cpp
index 6f17177..b1a13a8 100644
--- a/src/gpu/GrTextBlobCache.cpp
+++ b/src/gpu/GrTextBlobCache.cpp
@@ -13,26 +13,26 @@
     this->freeAll();
 }
 
-GrAtlasTextContext::BitmapTextBlob* GrTextBlobCache::createBlob(int glyphCount, int runCount,
+GrAtlasTextBlob* GrTextBlobCache::createBlob(int glyphCount, int runCount,
                                                                 size_t maxVASize) {
-    // We allocate size for the BitmapTextBlob itself, plus size for the vertices array,
+    // We allocate size for the GrAtlasTextBlob itself, plus size for the vertices array,
     // and size for the glyphIds array.
     size_t verticesCount = glyphCount * kVerticesPerGlyph * maxVASize;
-    size_t size = sizeof(BitmapTextBlob) +
+    size_t size = sizeof(GrAtlasTextBlob) +
                   verticesCount +
                   glyphCount * sizeof(GrGlyph**) +
-                  sizeof(BitmapTextBlob::Run) * runCount;
+                  sizeof(GrAtlasTextBlob::Run) * runCount;
 
-    BitmapTextBlob* cacheBlob = SkNEW_PLACEMENT(fPool.allocate(size), BitmapTextBlob);
+    GrAtlasTextBlob* cacheBlob = SkNEW_PLACEMENT(fPool.allocate(size), GrAtlasTextBlob);
 
     // setup offsets for vertices / glyphs
-    cacheBlob->fVertices = sizeof(BitmapTextBlob) + reinterpret_cast<unsigned char*>(cacheBlob);
+    cacheBlob->fVertices = sizeof(GrAtlasTextBlob) + reinterpret_cast<unsigned char*>(cacheBlob);
     cacheBlob->fGlyphs = reinterpret_cast<GrGlyph**>(cacheBlob->fVertices + verticesCount);
-    cacheBlob->fRuns = reinterpret_cast<BitmapTextBlob::Run*>(cacheBlob->fGlyphs + glyphCount);
+    cacheBlob->fRuns = reinterpret_cast<GrAtlasTextBlob::Run*>(cacheBlob->fGlyphs + glyphCount);
 
     // Initialize runs
     for (int i = 0; i < runCount; i++) {
-        SkNEW_PLACEMENT(&cacheBlob->fRuns[i], BitmapTextBlob::Run);
+        SkNEW_PLACEMENT(&cacheBlob->fRuns[i], GrAtlasTextBlob::Run);
     }
     cacheBlob->fRunCount = runCount;
     cacheBlob->fPool = &fPool;
@@ -40,9 +40,9 @@
 }
 
 void GrTextBlobCache::freeAll() {
-    SkTDynamicHash<BitmapTextBlob, BitmapTextBlob::Key>::Iter iter(&fCache);
+    SkTDynamicHash<GrAtlasTextBlob, GrAtlasTextBlob::Key>::Iter iter(&fCache);
     while (!iter.done()) {
-        BitmapTextBlob* blob = &(*iter);
+        GrAtlasTextBlob* blob = &(*iter);
         fBlobList.remove(blob);
         blob->unref();
         ++iter;