Index: src/gpu/SkGpuDevice.cpp |
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp |
index f9abd780624f922545e1eb0dd1ceab86350e9f3c..a849c84e4ec71ba2e713ef3f4ab5c77a0dfa64bd 100644 |
--- a/src/gpu/SkGpuDevice.cpp |
+++ b/src/gpu/SkGpuDevice.cpp |
@@ -188,6 +188,9 @@ |
fContext = context; |
fContext->ref(); |
+ fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties)); |
+ fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties)); |
+ |
fRenderTarget = NULL; |
fNeedClear = flags & kNeedClear_Flag; |
@@ -209,9 +212,6 @@ |
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,6 +268,9 @@ |
fContext = context; |
fContext->ref(); |
+ fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties)); |
+ fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties)); |
+ |
fRenderTarget = NULL; |
fNeedClear = false; |
@@ -306,9 +309,6 @@ |
width, height); |
SkASSERT(false); |
} |
- |
- fMainTextContext = fContext->createTextContext(fRenderTarget, fLeakyProperties); |
- fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties)); |
} |
#endif |