| Index: src/gpu/GrContext.cpp
|
| diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
|
| index 0876b4dd3fbc98992fe3743b160b1d97ba279db8..3a2bbe864ca184015bdd53f9833c0d52dbb41ae7 100644
|
| --- a/src/gpu/GrContext.cpp
|
| +++ b/src/gpu/GrContext.cpp
|
| @@ -14,26 +14,24 @@
|
|
|
| #include "GrAARectRenderer.h"
|
| #include "GrBufferAllocPool.h"
|
| -#include "GrDistanceFieldTextContext.h"
|
| +#include "GrGpu.h"
|
| #include "GrDrawTargetCaps.h"
|
| -#include "GrGpu.h"
|
| +#include "GrIndexBuffer.h"
|
| #include "GrInOrderDrawBuffer.h"
|
| -#include "GrIndexBuffer.h"
|
| #include "GrOvalRenderer.h"
|
| #include "GrPathRenderer.h"
|
| #include "GrPathUtils.h"
|
| #include "GrResourceCache.h"
|
| #include "GrSoftwarePathRenderer.h"
|
| -#include "GrStencilAndCoverTextContext.h"
|
| #include "GrStencilBuffer.h"
|
| #include "GrTextStrike.h"
|
| #include "GrTracing.h"
|
| #include "SkGr.h"
|
| +#include "SkRTConf.h"
|
| #include "SkRRect.h"
|
| -#include "SkRTConf.h"
|
| #include "SkStrokeRec.h"
|
| +#include "SkTLazy.h"
|
| #include "SkTLS.h"
|
| -#include "SkTLazy.h"
|
| #include "SkTraceEvent.h"
|
|
|
| // It can be useful to set this to false to test whether a bug is caused by using the
|
| @@ -227,17 +225,6 @@
|
|
|
| int GrContext::getGpuTextureCacheResourceCount() const {
|
| return fTextureCache->getCachedResourceCount();
|
| -}
|
| -
|
| -GrTextContext* GrContext::createTextContext(GrRenderTarget* renderTarget,
|
| - const SkDeviceProperties&
|
| - leakyProperties) {
|
| - if (fGpu->caps()->pathRenderingSupport()) {
|
| - if (renderTarget->getStencilBuffer() && renderTarget->isMultisampled()) {
|
| - return SkNEW_ARGS(GrStencilAndCoverTextContext, (this, leakyProperties));
|
| - }
|
| - }
|
| - return SkNEW_ARGS(GrDistanceFieldTextContext, (this, leakyProperties));
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|