Revert of Add factory class for generating various flavors of GrTextContext.

src/gpu/GrBitmapTextContext.cpp

Index: src/gpu/GrBitmapTextContext.cpp
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 6e33d90d07fb53f0af25139664a20fb7dbffbf87..a43c4a28746be3551b07d9dd9e68ca97df4293ed 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -24,9 +24,11 @@
                 "Dump the contents of the font cache before every purge.");
 
 GrBitmapTextContext::GrBitmapTextContext(GrContext* context, const GrPaint& paint,
-                                         const SkPaint& skPaint) :
-                                         GrTextContext(context, paint, skPaint) {
+                                         SkColor color) :
+                                         GrTextContext(context, paint) {
     fAutoMatrix.setIdentity(fContext, &fPaint);
+
+    fSkPaintColor = color;
 
     fStrike = NULL;
 
@@ -81,11 +83,11 @@
             // alpha. Instead we feed in a non-premultiplied color, and multiply its alpha by
             // the mask texture color. The end result is that we get
             //            mask*paintAlpha*paintColor + (1-mask*paintAlpha)*dstColor
-            int a = SkColorGetA(fSkPaint.getColor());
+            int a = SkColorGetA(fSkPaintColor);
             // paintAlpha
             drawState->setColor(SkColorSetARGB(a, a, a, a));
             // paintColor
-            drawState->setBlendConstant(skcolor_to_grcolor_nopremultiply(fSkPaint.getColor()));
+            drawState->setBlendConstant(skcolor_to_grcolor_nopremultiply(fSkPaintColor));
             drawState->setBlendFunc(kConstC_GrBlendCoeff, kISC_GrBlendCoeff);
         } else {
             // set back to normal in case we took LCD path previously.