Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Unified Diff: src/gpu/effects/GrConfigConversionEffect.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrConstColorProcessor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrConfigConversionEffect.cpp
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index 4c8813d41550dee7cbcf1233c2815ae8d9344052..06b2d8db6d1b06428d1cf7638694412ffea418e1 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -136,12 +136,9 @@ GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestData* d
} else {
swapRB = d->fRandom->nextBool();
}
- return SkNEW_ARGS(GrConfigConversionEffect,
- (d->fProcDataManager,
- d->fTextures[GrProcessorUnitTest::kSkiaPMTextureIdx],
- swapRB,
- pmConv,
- GrTest::TestMatrix(d->fRandom)));
+ return new GrConfigConversionEffect(d->fProcDataManager,
+ d->fTextures[GrProcessorUnitTest::kSkiaPMTextureIdx],
+ swapRB, pmConv, GrTest::TestMatrix(d->fRandom));
}
///////////////////////////////////////////////////////////////////////////////
@@ -152,7 +149,7 @@ void GrConfigConversionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
}
GrGLFragmentProcessor* GrConfigConversionEffect::onCreateGLInstance() const {
- return SkNEW_ARGS(GrGLConfigConversionEffect, (*this));
+ return new GrGLConfigConversionEffect(*this);
}
@@ -219,18 +216,12 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
GrPaint paint1;
GrPaint paint2;
GrPaint paint3;
- SkAutoTUnref<GrFragmentProcessor> pmToUPM1(
- SkNEW_ARGS(GrConfigConversionEffect,
- (paint1.getProcessorDataManager(), dataTex, false, *pmToUPMRule,
- SkMatrix::I())));
- SkAutoTUnref<GrFragmentProcessor> upmToPM(
- SkNEW_ARGS(GrConfigConversionEffect,
- (paint2.getProcessorDataManager(), readTex, false, *upmToPMRule,
- SkMatrix::I())));
- SkAutoTUnref<GrFragmentProcessor> pmToUPM2(
- SkNEW_ARGS(GrConfigConversionEffect,
- (paint3.getProcessorDataManager(), tempTex, false, *pmToUPMRule,
- SkMatrix::I())));
+ SkAutoTUnref<GrFragmentProcessor> pmToUPM1(new GrConfigConversionEffect(
+ paint1.getProcessorDataManager(), dataTex, false, *pmToUPMRule, SkMatrix::I()));
+ SkAutoTUnref<GrFragmentProcessor> upmToPM(new GrConfigConversionEffect(
+ paint2.getProcessorDataManager(), readTex, false, *upmToPMRule, SkMatrix::I()));
+ SkAutoTUnref<GrFragmentProcessor> pmToUPM2(new GrConfigConversionEffect(
+ paint3.getProcessorDataManager(), tempTex, false, *pmToUPMRule, SkMatrix::I()));
paint1.addColorProcessor(pmToUPM1);
@@ -314,10 +305,7 @@ const GrFragmentProcessor* GrConfigConversionEffect::Create(GrProcessorDataManag
// The PM conversions assume colors are 0..255
return NULL;
}
- return SkNEW_ARGS(GrConfigConversionEffect, (procDataManager,
- texture,
- swapRedAndBlue,
- pmConversion,
- matrix));
+ return new GrConfigConversionEffect(procDataManager, texture, swapRedAndBlue, pmConversion,
+ matrix);
}
}
« no previous file with comments | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrConstColorProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698