| Index: src/gpu/SkGpuDevice.cpp
|
| diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
|
| index 82862414fc682968f7b164007a65ad5bb93c25fc..ed80c505818d222feb5052a6cd0189865270255f 100644
|
| --- a/src/gpu/SkGpuDevice.cpp
|
| +++ b/src/gpu/SkGpuDevice.cpp
|
| @@ -13,9 +13,7 @@
|
|
|
| #include "GrContext.h"
|
| #include "GrBitmapTextContext.h"
|
| -#if SK_DISTANCEFIELD_FONTS
|
| #include "GrDistanceFieldTextContext.h"
|
| -#endif
|
|
|
| #include "SkGrTexturePixelRef.h"
|
|
|
| @@ -189,13 +187,8 @@ void SkGpuDevice::initFromRenderTarget(GrContext* context,
|
| fContext = context;
|
| fContext->ref();
|
|
|
| -#if SK_DISTANCEFIELD_FONTS
|
| fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties));
|
| fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
|
| -#else
|
| - fMainTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
|
| - fFallbackTextContext = NULL;
|
| -#endif
|
|
|
| fRenderTarget = NULL;
|
| fNeedClear = false;
|
| @@ -274,13 +267,8 @@ SkGpuDevice::SkGpuDevice(GrContext* context,
|
| fContext = context;
|
| fContext->ref();
|
|
|
| -#if SK_DISTANCEFIELD_FONTS
|
| fMainTextContext = SkNEW_ARGS(GrDistanceFieldTextContext, (fContext, fLeakyProperties));
|
| fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
|
| -#else
|
| - fMainTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
|
| - fFallbackTextContext = NULL;
|
| -#endif
|
|
|
| fRenderTarget = NULL;
|
| fNeedClear = false;
|
|
|