Revert of BitmapTextBatch and BitmapTextBlob

src/gpu/GrContext.cpp

Index: src/gpu/GrContext.cpp
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a1f1c253a7ce45c5c4f2918891a412d9797e371c..4c7f3eabe0e77116974e10160408ed7cb4c94dc8 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -10,9 +10,7 @@
 
 #include "GrAARectRenderer.h"
 #include "GrBatch.h"
-#include "GrBatchFontCache.h"
 #include "GrBatchTarget.h"
-#include "GrBitmapTextContext.h"
 #include "GrBufferAllocPool.h"
 #include "GrDefaultGeoProcFactory.h"
 #include "GrFontCache.h"
@@ -96,7 +94,6 @@
     fPathRendererChain = NULL;
     fSoftwarePathRenderer = NULL;
     fResourceCache = NULL;
-    fBatchFontCache = NULL;
     fFontCache = NULL;
     fDrawBuffer = NULL;
     fDrawBufferVBAllocPool = NULL;
@@ -132,10 +129,6 @@
     fDidTestPMConversions = false;
 
     this->setupDrawBuffer();
-
-    // GrBatchFontCache will eventually replace GrFontCache
-    fBatchFontCache = SkNEW(GrBatchFontCache);
-    fBatchFontCache->init(this);
 }
 
 GrContext::~GrContext() {
@@ -150,7 +143,6 @@
     }
 
     SkDELETE(fResourceCache);
-    SkDELETE(fBatchFontCache);
     SkDELETE(fFontCache);
     SkDELETE(fDrawBuffer);
     SkDELETE(fDrawBufferVBAllocPool);
@@ -188,7 +180,6 @@
     fAARectRenderer->reset();
     fOvalRenderer->reset();
 
-    fBatchFontCache->freeAll();
     fFontCache->freeAll();
     fLayerCache->freeAll();
 }
@@ -207,7 +198,6 @@
     fAARectRenderer->reset();
     fOvalRenderer->reset();
 
-    fBatchFontCache->freeAll();
     fFontCache->freeAll();
     fLayerCache->freeAll();
     // a path renderer may be holding onto resources
@@ -236,12 +226,8 @@
         }
     } 
 
-#ifdef USE_BITMAP_TEXTBLOBS
-    return GrBitmapTextContextB::Create(this, gpuDevice, leakyProperties);
-#else
     return GrDistanceFieldTextContext::Create(this, gpuDevice, leakyProperties,
                                               enableDistanceFieldFonts);
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////