Implement text rendering with NVPR

src/gpu/SkGpuDevice.cpp

Index: src/gpu/SkGpuDevice.cpp
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 2a1b980aa96d43c62a5b9df5cece0ebe2132b571..95bbde2f937468c0114ad56196ffba655b428cef 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -188,9 +188,6 @@ void SkGpuDevice::initFromRenderTarget(GrContext* context,
     fContext = context;
     fContext->ref();
 
-    fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties));
-    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
-
     fRenderTarget = NULL;
     fNeedClear = flags & kNeedClear_Flag;
 
@@ -212,6 +209,9 @@ void SkGpuDevice::initFromRenderTarget(GrContext* context,
     SkPixelRef* pr = SkNEW_ARGS(SkGrPixelRef, (info, surface, SkToBool(flags & kCached_Flag)));
 
     this->setPixelRef(pr)->unref();
+
+    fMainTextContext = fContext->createTextContext(fRenderTarget, fLeakyProperties);
+    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
 }
 
 SkGpuDevice* SkGpuDevice::Create(GrContext* context, const SkImageInfo& origInfo,
@@ -268,9 +268,6 @@ SkGpuDevice::SkGpuDevice(GrContext* context,
     fContext = context;
     fContext->ref();
 
-    fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties));
-    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
-
     fRenderTarget = NULL;
     fNeedClear = false;
 
@@ -309,6 +306,9 @@ SkGpuDevice::SkGpuDevice(GrContext* context,
                  width, height);
         SkASSERT(false);
     }
+
+    fMainTextContext = fContext->createTextContext(fRenderTarget, fLeakyProperties);

[Kimmo Kinnunen, 2014/03/25 12:32:48]

Jim, this hunk was wrong before. Eg. it wasn't even compiling, but I didn't
notice it since the define was off.

+    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
 }
 #endif