Replace factory generation of TextContexts with persistent objects.

src/gpu/SkGpuDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "effects/GrBicubicEffect.h"
@@ skipping 183 matching lines @@
 
 void SkGpuDevice::initFromRenderTarget(GrContext* context,
                                        GrRenderTarget* renderTarget,
                                        bool cached) {
     fDrawProcs = NULL;
 
     fContext = context;
     fContext->ref();
 
 #if SK_DISTANCEFIELD_FONTS
-    fTextContextManager = SkNEW(GrTTextContextManager<GrDistanceFieldTextContext>);
+    fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties));
+    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
 #else
-    fTextContextManager = SkNEW(GrTTextContextManager<GrBitmapTextContext>);
+    fMainTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
+    fFallbackTextContext = NULL;
 #endif
 
     fRenderTarget = NULL;
     fNeedClear = false;
 
     SkASSERT(NULL != renderTarget);
     fRenderTarget = renderTarget;
     fRenderTarget->ref();
 
     // Hold onto to the texture in the pixel ref (if there is one) because the texture holds a ref
@@ skipping 18 matching lines @@
                          int height,
                          int sampleCount)
     : SkBitmapDevice(make_bitmap(config, width, height, false /*isOpaque*/))
 {
     fDrawProcs = NULL;
 
     fContext = context;
     fContext->ref();
 
 #if SK_DISTANCEFIELD_FONTS
-    fTextContextManager = SkNEW(GrTTextContextManager<GrDistanceFieldTextContext>);
+    fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties));
+    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
 #else
-    fTextContextManager = SkNEW(GrTTextContextManager<GrBitmapTextContext>);
+    fMainTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
+    fFallbackTextContext = NULL;
 #endif
 
     fRenderTarget = NULL;
     fNeedClear = false;
 
     if (config != SkBitmap::kRGB_565_Config) {
         config = SkBitmap::kARGB_8888_Config;
     }
 
     GrTextureDesc desc;
@@ skipping 27 matching lines @@
                  width, height);
         SkASSERT(false);
     }
 }
 
 SkGpuDevice::~SkGpuDevice() {
     if (fDrawProcs) {
         delete fDrawProcs;
     }
 
-    delete fTextContextManager;
+    delete fMainTextContext;
+    delete fFallbackTextContext;
 
     // The GrContext takes a ref on the target. We don't want to cause the render
     // target to be unnecessarily kept alive.
     if (fContext->getRenderTarget() == fRenderTarget) {
         fContext->setRenderTarget(NULL);
     }
 
     if (fContext->getClip() == &fClipData) {
         fContext->setClip(NULL);
     }
@@ skipping 1465 matching lines @@
                            indexCount);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkGpuDevice::drawText(const SkDraw& draw, const void* text,
                           size_t byteLength, SkScalar x, SkScalar y,
                           const SkPaint& paint) {
     CHECK_SHOULD_DRAW(draw, false);
 
-    if (fTextContextManager->canDraw(paint, fContext->getMatrix())) {
+    if (fMainTextContext->canDraw(paint)) {
         GrPaint grPaint;
         if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) {
             return;
         }
 
         SkDEBUGCODE(this->validate();)
 
-        SkAutoTDelete<GrTextContext> ctx(fTextContextManager->create(this->context(),
-                                                                     grPaint, paint,
-                                                                     this->getDeviceProperties()));
-        ctx->drawText((const char *)text, byteLength, x, y);
-    } else if (GrBitmapTextContext::CanDraw(paint, fContext->getMatrix())) {
+        fMainTextContext->drawText(grPaint, paint, (const char *)text, byteLength, x, y);
+    } else if (fFallbackTextContext && fFallbackTextContext->canDraw(paint)) {
         GrPaint grPaint;
         if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) {
             return;
         }
 
         SkDEBUGCODE(this->validate();)
 
-        GrBitmapTextContext textContext(this->context(), grPaint, paint,
-                                        this->getDeviceProperties());
-        textContext.drawText((const char *)text, byteLength, x, y);
+        fFallbackTextContext->drawText(grPaint, paint, (const char *)text, byteLength, x, y);
     } else {
         // this guy will just call our drawPath()
         draw.drawText_asPaths((const char*)text, byteLength, x, y, paint);
     }
 }
 
 void SkGpuDevice::drawPosText(const SkDraw& draw, const void* text,
                              size_t byteLength, const SkScalar pos[],
                              SkScalar constY, int scalarsPerPos,
                              const SkPaint& paint) {
     CHECK_SHOULD_DRAW(draw, false);
 
-    if (fTextContextManager->canDraw(paint, fContext->getMatrix())) {
+    if (fMainTextContext->canDraw(paint)) {
         GrPaint grPaint;
         if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) {
             return;
         }
 
         SkDEBUGCODE(this->validate();)
 
-        SkAutoTDelete<GrTextContext> ctx(fTextContextManager->create(this->context(),
-                                                                     grPaint, paint,
-                                                                     this->getDeviceProperties()));
-        ctx->drawPosText((const char *)text, byteLength, pos, constY, scalarsPerPos);
-    } else if (GrBitmapTextContext::CanDraw(paint, fContext->getMatrix())) {
+        fMainTextContext->drawPosText(grPaint, paint, (const char *)text, byteLength, pos, 
+                                      constY, scalarsPerPos);
+    } else if (fFallbackTextContext && fFallbackTextContext->canDraw(paint)) {
         GrPaint grPaint;
         if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) {
             return;
         }
         
         SkDEBUGCODE(this->validate();)
         
-        GrBitmapTextContext textContext(this->context(), grPaint, paint,
-                                        this->getDeviceProperties());
-        textContext.drawPosText((const char *)text, byteLength, pos, constY, scalarsPerPos);
+        fFallbackTextContext->drawPosText(grPaint, paint, (const char *)text, byteLength, pos, 
+                                          constY, scalarsPerPos);
     } else {
         draw.drawPosText_asPaths((const char*)text, byteLength, pos, constY,
                                  scalarsPerPos, paint);
     }
 }
 
 void SkGpuDevice::drawTextOnPath(const SkDraw& draw, const void* text,
                                 size_t len, const SkPath& path,
                                 const SkMatrix* m, const SkPaint& paint) {
     CHECK_SHOULD_DRAW(draw, false);
@@ skipping 71 matching lines @@
                          GrTexture* texture,
                          bool needClear)
     : SkBitmapDevice(make_bitmap(context, texture->asRenderTarget())) {
 
     SkASSERT(texture && texture->asRenderTarget());
     // This constructor is called from onCreateCompatibleDevice. It has locked the RT in the texture
     // cache. We pass true for the third argument so that it will get unlocked.
     this->initFromRenderTarget(context, texture->asRenderTarget(), true);
     fNeedClear = needClear;
 }