commit cc40f06db77a3a27f3d685c222086d245399bc0a
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 24 14:38:27 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 24 14:38:27 2014 +0000
tree bdde781340379b0307e2129c5694919f203e8c73
parent 83d81c96de34950bdd84dc575997a250b685a3d6

Add factory class for generating various flavors of GrTextContext.

This is the first pass of making Gr*TextContext more generic and easily
subclassed. The next stage will be making GrBitmapTextContext and
GrDistanceFieldTextContext more similar by moving the SkDraw loop into
each subclass.

BUG=skia:2018

Committed: http://code.google.com/p/skia/source/detail?r=13142

R=bsalomon@google.com, reed@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13165 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 5ba174c..0e91182 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -200,6 +200,12 @@
     fContext = context;
     fContext->ref();
 
+#if SK_DISTANCEFIELD_FONTS
+    fTextContextManager = SkNEW(GrTTextContextManager<GrDistanceFieldTextContext>);
+#else
+    fTextContextManager = SkNEW(GrTTextContextManager<GrBitmapTextContext>);
+#endif
+
     fRenderTarget = NULL;
     fNeedClear = false;
 
@@ -235,6 +241,12 @@
     fContext = context;
     fContext->ref();
 
+#if SK_DISTANCEFIELD_FONTS
+    fTextContextManager = SkNEW(GrTTextContextManager<GrDistanceFieldTextContext>);
+#else
+    fTextContextManager = SkNEW(GrTTextContextManager<GrBitmapTextContext>);
+#endif
+
     fRenderTarget = NULL;
     fNeedClear = false;
 
@@ -279,6 +291,8 @@
     if (fDrawProcs) {
         delete fDrawProcs;
     }
+    
+    delete fTextContextManager;
 
     // The GrContext takes a ref on the target. We don't want to cause the render
     // target to be unnecessarily kept alive.
@@ -1820,13 +1834,15 @@
 
         SkDEBUGCODE(this->validate();)
 
-        GrDistanceFieldTextContext context(fContext, grPaint, paint);
+        SkAutoTDelete<GrTextContext> context(fTextContextManager->create(fContext, grPaint, paint));
+        GrDistanceFieldTextContext* dfContext =
+                                            static_cast<GrDistanceFieldTextContext*>(context.get());
 
-        SkAutoGlyphCache    autoCache(context.getSkPaint(), &this->fLeakyProperties, NULL);
+        SkAutoGlyphCache    autoCache(dfContext->getSkPaint(), &this->fLeakyProperties, NULL);
         SkGlyphCache*       cache = autoCache.getCache();
         GrFontScaler*       fontScaler = get_gr_font_scaler(cache);
 
-        context.drawText((const char *)text, byteLength, x, y, cache, fontScaler);
+        dfContext->drawText((const char *)text, byteLength, x, y, cache, fontScaler);
 #endif
     } else {
         SkDraw myDraw(draw);
@@ -1836,8 +1852,8 @@
             return;
         }
 
-        GrBitmapTextContext context(fContext, grPaint, paint.getColor());
-        myDraw.fProcs = this->initDrawForText(&context);
+        SkAutoTDelete<GrTextContext> context(fTextContextManager->create(fContext, grPaint, paint));
+        myDraw.fProcs = this->initDrawForText(context.get());
         this->INHERITED::drawText(myDraw, text, byteLength, x, y, paint);
     }
 }
@@ -1861,13 +1877,15 @@
 
         SkDEBUGCODE(this->validate();)
 
-        GrDistanceFieldTextContext context(fContext, grPaint, paint);
-
-        SkAutoGlyphCache    autoCache(context.getSkPaint(), &this->fLeakyProperties, NULL);
+        SkAutoTDelete<GrTextContext> context(fTextContextManager->create(fContext, grPaint, paint));
+        GrDistanceFieldTextContext* dfContext =
+                                            static_cast<GrDistanceFieldTextContext*>(context.get());
+        
+        SkAutoGlyphCache    autoCache(dfContext->getSkPaint(), &this->fLeakyProperties, NULL);
         SkGlyphCache*       cache = autoCache.getCache();
         GrFontScaler*       fontScaler = get_gr_font_scaler(cache);
-
-        context.drawPosText((const char *)text, byteLength, pos, constY, scalarsPerPos,
+        
+        dfContext->drawPosText((const char *)text, byteLength, pos, constY, scalarsPerPos,
                             cache, fontScaler);
 #endif
     } else {
@@ -1877,8 +1895,9 @@
         if (!skPaint2GrPaintShader(this, paint, true, &grPaint)) {
             return;
         }
-        GrBitmapTextContext context(fContext, grPaint, paint.getColor());
-        myDraw.fProcs = this->initDrawForText(&context);
+
+        SkAutoTDelete<GrTextContext> context(fTextContextManager->create(fContext, grPaint, paint));
+        myDraw.fProcs = this->initDrawForText(context.get());
         this->INHERITED::drawPosText(myDraw, text, byteLength, pos, constY,
                                         scalarsPerPos, paint);
     }