| Index: src/gpu/GrContext.cpp
|
| diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
|
| index 47095135259eb4e8654fabaaad877baf49125363..819774a076a88b657f270dd7bc171a4a4908aaa6 100755
|
| --- a/src/gpu/GrContext.cpp
|
| +++ b/src/gpu/GrContext.cpp
|
| @@ -125,8 +125,8 @@ void GrContext::initCommon() {
|
|
|
| fLayerCache.reset(SkNEW_ARGS(GrLayerCache, (this)));
|
|
|
| - fAARectRenderer = SkNEW_ARGS(GrAARectRenderer, (fGpu));
|
| - fOvalRenderer = SkNEW_ARGS(GrOvalRenderer, (fGpu));
|
| + fAARectRenderer = SkNEW(GrAARectRenderer);
|
| + fOvalRenderer = SkNEW(GrOvalRenderer);
|
|
|
| fDidTestPMConversions = false;
|
|
|
| @@ -186,9 +186,6 @@ void GrContext::abandonContext() {
|
| delete fDrawBufferIBAllocPool;
|
| fDrawBufferIBAllocPool = NULL;
|
|
|
| - fAARectRenderer->reset();
|
| - fOvalRenderer->reset();
|
| -
|
| fBatchFontCache->freeAll();
|
| fLayerCache->freeAll();
|
| fTextBlobCache->freeAll();
|
| @@ -205,9 +202,6 @@ void GrContext::freeGpuResources() {
|
| fDrawBuffer->purgeResources();
|
| }
|
|
|
| - fAARectRenderer->reset();
|
| - fOvalRenderer->reset();
|
| -
|
| fBatchFontCache->freeAll();
|
| fLayerCache->freeAll();
|
| // a path renderer may be holding onto resources
|
| @@ -1840,10 +1834,6 @@ GrDrawTarget* GrContext::getTextTarget() {
|
| return this->prepareToDraw();
|
| }
|
|
|
| -const GrIndexBuffer* GrContext::getQuadIndexBuffer() const {
|
| - return fGpu->getQuadIndexBuffer();
|
| -}
|
| -
|
| namespace {
|
| void test_pm_conversions(GrContext* ctx, int* pmToUPMValue, int* upmToPMValue) {
|
| GrConfigConversionEffect::PMConversion pmToUPM;
|
|
|