diff options
Diffstat (limited to 'gm')
82 files changed, 182 insertions, 212 deletions
diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp index 10733b3283..7ede6a5fe1 100644 --- a/gm/aaclip.cpp +++ b/gm/aaclip.cpp @@ -105,7 +105,7 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(AAClipGM); ) +DEF_GM(return new AAClipGM;) ///////////////////////////////////////////////////////////////////////// @@ -118,7 +118,7 @@ static SkCanvas* make_canvas(const SkBitmap& bm) { (SkPMColor*)bm.getPixels(), bm.rowBytes()); } else { - return SkNEW_ARGS(SkCanvas, (bm)); + return new SkCanvas(bm); } } @@ -190,7 +190,7 @@ private: }; #if 0 // Disabled pending fix from reed@ -DEF_GM( return SkNEW(CGImageGM); ) +DEF_GM( return new CGImageGM; ) #endif #endif @@ -260,5 +260,4 @@ protected: private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(ClipCubicGM); ) - +DEF_GM(return new ClipCubicGM;) diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp index 7ff8675462..2fbd71de24 100644 --- a/gm/all_bitmap_configs.cpp +++ b/gm/all_bitmap_configs.cpp @@ -124,8 +124,7 @@ static SkBitmap indexed_bitmap() { pmColors[i] = premultiply_color(colors[i]); } SkBitmap bm; - SkAutoTUnref<SkColorTable> ctable( - SkNEW_ARGS(SkColorTable, (pmColors, SK_ARRAY_COUNT(pmColors)))); + SkAutoTUnref<SkColorTable> ctable(new SkColorTable(pmColors, SK_ARRAY_COUNT(pmColors))); SkImageInfo info = SkImageInfo::Make(SCALE, SCALE, kIndex_8_SkColorType, kPremul_SkAlphaType); bm.allocPixels(info, NULL, ctable); diff --git a/gm/alphagradients.cpp b/gm/alphagradients.cpp index 426acaafcf..b209cec9d1 100644 --- a/gm/alphagradients.cpp +++ b/gm/alphagradients.cpp @@ -76,4 +76,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(AlphaGradientsGM); ) +DEF_GM(return new AlphaGradientsGM;) diff --git a/gm/anisotropic.cpp b/gm/anisotropic.cpp index c1f5190a65..66109267ea 100644 --- a/gm/anisotropic.cpp +++ b/gm/anisotropic.cpp @@ -109,6 +109,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(AnisotropicGM); ) - +DEF_GM(return new AnisotropicGM;) } diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp index 6efea27dcc..792f7da4c0 100644 --- a/gm/arcofzorro.cpp +++ b/gm/arcofzorro.cpp @@ -79,6 +79,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(ArcOfZorroGM); ) - +DEF_GM(return new ArcOfZorroGM;) } diff --git a/gm/astcbitmap.cpp b/gm/astcbitmap.cpp index 316bf88ec2..8ee7746f61 100644 --- a/gm/astcbitmap.cpp +++ b/gm/astcbitmap.cpp @@ -99,4 +99,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(skiagm::ASTCBitmapGM); ) +DEF_GM(return new skiagm::ASTCBitmapGM;) diff --git a/gm/badpaint.cpp b/gm/badpaint.cpp index cce81465ad..7c51c749ee 100644 --- a/gm/badpaint.cpp +++ b/gm/badpaint.cpp @@ -57,4 +57,4 @@ private: ///////////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(BadPaintGM); ) +DEF_GM(return new BadPaintGM;) diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 2636f26001..9edc11411a 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -40,7 +40,7 @@ public: static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo, const SkScalar klmEqs[9], SkScalar sign) { - return SkNEW_ARGS(BezierCubicOrConicTestBatch, (gp, geo, klmEqs, sign)); + return new BezierCubicOrConicTestBatch(gp, geo, klmEqs, sign); } private: @@ -440,7 +440,7 @@ public: static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo, const GrPathUtils::QuadUVMatrix& devToUV) { - return SkNEW_ARGS(BezierQuadTestBatch, (gp, geo, devToUV)); + return new BezierQuadTestBatch(gp, geo, devToUV); } private: @@ -631,10 +631,9 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(BezierCubicEffects); ) -DEF_GM( return SkNEW(BezierConicEffects); ) -DEF_GM( return SkNEW(BezierQuadEffects); ) - +DEF_GM(return new BezierCubicEffects;) +DEF_GM(return new BezierConicEffects;) +DEF_GM(return new BezierQuadEffects;) } #endif diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp index 55000052f0..d68b2ca1f7 100644 --- a/gm/bigblurs.cpp +++ b/gm/bigblurs.cpp @@ -111,6 +111,5 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(BigBlursGM); ) - +DEF_GM(return new BigBlursGM;) } diff --git a/gm/bigtext.cpp b/gm/bigtext.cpp index c69d9b973b..17f69c5745 100644 --- a/gm/bigtext.cpp +++ b/gm/bigtext.cpp @@ -52,4 +52,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(BigTextGM); ) +DEF_GM(return new BigTextGM;) diff --git a/gm/bigtileimagefilter.cpp b/gm/bigtileimagefilter.cpp index b788209c19..dbd41c2ebd 100644 --- a/gm/bigtileimagefilter.cpp +++ b/gm/bigtileimagefilter.cpp @@ -103,6 +103,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(BigTileImageFilterGM); ) - +DEF_GM(return new BigTileImageFilterGM;) } diff --git a/gm/bitmapsource2.cpp b/gm/bitmapsource2.cpp index bc4acf717c..6c32f625d9 100644 --- a/gm/bitmapsource2.cpp +++ b/gm/bitmapsource2.cpp @@ -82,9 +82,8 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW_ARGS(BitmapSourceGM, ("none", kNone_SkFilterQuality) ); ) -DEF_GM( return SkNEW_ARGS(BitmapSourceGM, ("low", kLow_SkFilterQuality) ); ) -DEF_GM( return SkNEW_ARGS(BitmapSourceGM, ("med", kMedium_SkFilterQuality) ); ) -DEF_GM( return SkNEW_ARGS(BitmapSourceGM, ("high", kHigh_SkFilterQuality) ); ) - +DEF_GM(return new BitmapSourceGM("none", kNone_SkFilterQuality);) +DEF_GM(return new BitmapSourceGM("low", kLow_SkFilterQuality);) +DEF_GM(return new BitmapSourceGM("med", kMedium_SkFilterQuality);) +DEF_GM(return new BitmapSourceGM("high", kHigh_SkFilterQuality);) } diff --git a/gm/bmpfilterqualityrepeat.cpp b/gm/bmpfilterqualityrepeat.cpp index dd7b901b00..c147014a87 100644 --- a/gm/bmpfilterqualityrepeat.cpp +++ b/gm/bmpfilterqualityrepeat.cpp @@ -77,4 +77,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(BmpFilterQualityRepeat); ) +DEF_GM(return new BmpFilterQualityRepeat;) diff --git a/gm/clip_strokerect.cpp b/gm/clip_strokerect.cpp index 0175eda984..f4183b1f58 100644 --- a/gm/clip_strokerect.cpp +++ b/gm/clip_strokerect.cpp @@ -67,5 +67,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(ClipStrokeRectGM); ) - +DEF_GM(return new ClipStrokeRectGM;) diff --git a/gm/clipdrawdraw.cpp b/gm/clipdrawdraw.cpp index 9659201054..aa635d97a9 100644 --- a/gm/clipdrawdraw.cpp +++ b/gm/clipdrawdraw.cpp @@ -64,6 +64,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM(return SkNEW(ClipDrawDrawGM);) - +DEF_GM(return new ClipDrawDrawGM;) } diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp index 851e9c74a9..d4fb2faa1c 100644 --- a/gm/cmykjpeg.cpp +++ b/gm/cmykjpeg.cpp @@ -38,7 +38,7 @@ protected: stream.rewind(); codec->setDitherImage(dither); codec->decode(&stream, &fBitmap, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode); - SkDELETE(codec); + delete codec; } } diff --git a/gm/colorfilters.cpp b/gm/colorfilters.cpp index bedb7f6058..73ca7f318d 100644 --- a/gm/colorfilters.cpp +++ b/gm/colorfilters.cpp @@ -84,4 +84,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(ColorFiltersGM); ) +DEF_GM(return new ColorFiltersGM;) diff --git a/gm/colortype.cpp b/gm/colortype.cpp index 8e69664130..4d8c9d6056 100644 --- a/gm/colortype.cpp +++ b/gm/colortype.cpp @@ -40,7 +40,7 @@ protected: if (NULL == orig) { orig = SkTypeface::RefDefault(); } - fColorType = SkNEW_ARGS(SkGTypeface, (orig, paint)); + fColorType = new SkGTypeface(orig, paint); orig->unref(); } @@ -70,4 +70,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(ColorTypeGM); ) +DEF_GM(return new ColorTypeGM;) diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp index 97becde944..2926523c27 100644 --- a/gm/colortypexfermode.cpp +++ b/gm/colortypexfermode.cpp @@ -47,7 +47,7 @@ protected: if (NULL == orig) { orig = SkTypeface::RefDefault(); } - fColorType = SkNEW_ARGS(SkGTypeface, (orig, paint)); + fColorType = new SkGTypeface(orig, paint); orig->unref(); fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index ba44aa0888..74c877d8e6 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -200,13 +200,12 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, false, false)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, false, true)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, true, false)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, true, true)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true, false, false)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true, false, true)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true, true, false)); ) -DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true, true, true)); ) - +DEF_GM(return new ComplexClipGM(false, false, false);) +DEF_GM(return new ComplexClipGM(false, false, true);) +DEF_GM(return new ComplexClipGM(false, true, false);) +DEF_GM(return new ComplexClipGM(false, true, true);) +DEF_GM(return new ComplexClipGM(true, false, false);) +DEF_GM(return new ComplexClipGM(true, false, true);) +DEF_GM(return new ComplexClipGM(true, true, false);) +DEF_GM(return new ComplexClipGM(true, true, true);) } diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 8933cf3965..9d2103beb4 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -35,7 +35,7 @@ static SkShader* make_shader(SkXfermode::Mode mode) { SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(mode)); - return SkNEW_ARGS(SkComposeShader, (shaderA, shaderB, xfer)); + return new SkComposeShader(shaderA, shaderB, xfer); } class ComposeShaderGM : public skiagm::GM { diff --git a/gm/conicpaths.cpp b/gm/conicpaths.cpp index 2bdd1f8d26..71057b8e0b 100644 --- a/gm/conicpaths.cpp +++ b/gm/conicpaths.cpp @@ -128,7 +128,7 @@ private: SkPath fGiantCircle; typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(ConicPathsGM); ) +DEF_GM(return new ConicPathsGM;) ////////////////////////////////////////////////////////////////////////////// diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index 30544af8f9..2287af4754 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -192,7 +192,7 @@ private: const SkScalar ConstColorProcessor::kPad = 10.f; const SkScalar ConstColorProcessor::kRectSize = 20.f; -DEF_GM( return SkNEW(ConstColorProcessor); ) +DEF_GM(return new ConstColorProcessor;) } #endif diff --git a/gm/convex_all_line_paths.cpp b/gm/convex_all_line_paths.cpp index 435a37a10a..6c494cdfc4 100644 --- a/gm/convex_all_line_paths.cpp +++ b/gm/convex_all_line_paths.cpp @@ -211,7 +211,7 @@ protected: break; } - data.reset(SkNEW_ARRAY(SkPoint, numPts)); + data.reset(new SkPoint[numPts]); create_ngon(numPts, data.get(), width, height); points = data.get(); @@ -317,6 +317,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(ConvexLineOnlyPathsGM); ) - +DEF_GM(return new ConvexLineOnlyPathsGM;) } diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index 2ed17f2a5b..2aa05a83d2 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -297,6 +297,5 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(ConvexPolyClip); ) - +DEF_GM(return new ConvexPolyClip;) } diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 30471a797d..bd92069e39 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -38,7 +38,7 @@ public: const char* name() const override { return "ConvexPolyTestBatch"; } static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo) { - return SkNEW_ARGS(ConvexPolyTestBatch, (gp, geo)); + return new ConvexPolyTestBatch(gp, geo); } private: @@ -275,7 +275,7 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(ConvexPolyEffect); ) +DEF_GM(return new ConvexPolyEffect;) } #endif diff --git a/gm/dashing.cpp b/gm/dashing.cpp index bd906cbab2..15e4bc278b 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -474,10 +474,9 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM(return SkNEW(DashingGM);) -DEF_GM(return SkNEW(Dashing2GM);) -DEF_GM(return SkNEW(Dashing3GM);) -DEF_GM(return SkNEW(Dashing4GM);) -DEF_GM(return SkNEW_ARGS(Dashing5GM, (true));) -DEF_GM(return SkNEW_ARGS(Dashing5GM, (false));) - +DEF_GM(return new DashingGM;) +DEF_GM(return new Dashing2GM;) +DEF_GM(return new Dashing3GM;) +DEF_GM(return new Dashing4GM;) +DEF_GM(return new Dashing5GM(true);) +DEF_GM(return new Dashing5GM(false);) diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index 0c4049b46f..e0cb2d714f 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -50,7 +50,7 @@ private: SkFlattenable* DCShader::CreateProc(SkReadBuffer& buf) { SkMatrix matrix; buf.readMatrix(&matrix); - return SkNEW_ARGS(DCShader, (matrix)); + return new DCShader(matrix); } class DCFP : public GrFragmentProcessor { @@ -76,7 +76,7 @@ public: } void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override {} }; - return SkNEW(DCGLFP); + return new DCGLFP; } const char* name() const override { return "DCFP"; } @@ -98,7 +98,7 @@ bool DCShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMat const SkMatrix* localMatrix, GrColor* color, GrProcessorDataManager* procDataManager, GrFragmentProcessor** fp) const { - *fp = SkNEW_ARGS(DCFP, (procDataManager, fDeviceMatrix)); + *fp = new DCFP(procDataManager, fDeviceMatrix); *color = GrColorPackA4(paint.getAlpha()); return true; } @@ -111,7 +111,7 @@ public: ~DCShaderGM() override { for (int i = 0; i < fPrims.count(); ++i) { - SkDELETE(fPrims[i]); + delete fPrims[i]; } } @@ -212,15 +212,15 @@ protected: virtual const char* text() const { return "Hello, Skia!"; } }; - fPrims.push_back(SkNEW(Rect)); - fPrims.push_back(SkNEW(Circle)); - fPrims.push_back(SkNEW(RRect)); - fPrims.push_back(SkNEW(DRRect)); - fPrims.push_back(SkNEW(Path)); - fPrims.push_back(SkNEW(Points(SkCanvas::kPoints_PointMode))); - fPrims.push_back(SkNEW(Points(SkCanvas::kLines_PointMode))); - fPrims.push_back(SkNEW(Points(SkCanvas::kPolygon_PointMode))); - fPrims.push_back(SkNEW(Text)); + fPrims.push_back(new Rect); + fPrims.push_back(new Circle); + fPrims.push_back(new RRect); + fPrims.push_back(new DRRect); + fPrims.push_back(new Path); + fPrims.push_back(new Points(SkCanvas::kPoints_PointMode)); + fPrims.push_back(new Points(SkCanvas::kLines_PointMode)); + fPrims.push_back(new Points(SkCanvas::kPolygon_PointMode)); + fPrims.push_back(new Text); } void onDraw(SkCanvas* canvas) override { @@ -253,7 +253,7 @@ protected: for (int i = 0; i < fPrims.count(); ++i) { for (int j = 0; j < devMats.count(); ++j) { for (int k = 0; k < viewMats.count(); ++k) { - paint.setShader(SkNEW_ARGS(DCShader, (devMats[j])))->unref(); + paint.setShader(new DCShader(devMats[j]))->unref(); paint.setAntiAlias(SkToBool(aa)); canvas->save(); canvas->concat(viewMats[k]); @@ -291,6 +291,6 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(DCShaderGM); ) +DEF_GM(return new DCShaderGM;) } #endif diff --git a/gm/dftext.cpp b/gm/dftext.cpp index 0b68add1ca..f6bc0b2b9c 100755..100644 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -215,4 +215,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(DFTextGM); ) +DEF_GM(return new DFTextGM;) diff --git a/gm/discard.cpp b/gm/discard.cpp index d30e15c316..93da1ab52a 100644 --- a/gm/discard.cpp +++ b/gm/discard.cpp @@ -87,7 +87,7 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(DiscardGM); ) +DEF_GM(return new DiscardGM;) } // end namespace diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index 4aceef93f8..5732378703 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -180,7 +180,7 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM { if (codec) { stream.rewind(); codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode); - SkDELETE(codec); + delete codec; } else { fBM.allocN32Pixels(1, 1); *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad diff --git a/gm/emboss.cpp b/gm/emboss.cpp index d3a893747d..20d3c91890 100644 --- a/gm/emboss.cpp +++ b/gm/emboss.cpp @@ -58,4 +58,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(EmbossGM); ) +DEF_GM(return new EmbossGM;) diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp index c66f7b23b9..363bd4419c 100644 --- a/gm/etc1bitmap.cpp +++ b/gm/etc1bitmap.cpp @@ -219,10 +219,10 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_GM); ) -DEF_GM( return SkNEW(skiagm::ETC1Bitmap_KTX_GM); ) -DEF_GM( return SkNEW(skiagm::ETC1Bitmap_R11_KTX_GM); ) +DEF_GM(return new skiagm::ETC1Bitmap_PKM_GM;) +DEF_GM(return new skiagm::ETC1Bitmap_KTX_GM;) +DEF_GM(return new skiagm::ETC1Bitmap_R11_KTX_GM;) #ifndef SK_IGNORE_ETC1_SUPPORT -DEF_GM( return SkNEW(skiagm::ETC1Bitmap_NPOT_GM); ) +DEF_GM(return new skiagm::ETC1Bitmap_NPOT_GM;) #endif // SK_IGNORE_ETC1_SUPPORT diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 46500ba51f..1af16959c2 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -205,7 +205,7 @@ protected: if (codec) { stream.rewind(); codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode); - SkDELETE(codec); + delete codec; } else { fBM.allocN32Pixels(1, 1); *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp index a4b65e011d..f6797db9f3 100644 --- a/gm/filterfastbounds.cpp +++ b/gm/filterfastbounds.cpp @@ -321,6 +321,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM(return SkNEW(ImageFilterFastBoundGM);) - +DEF_GM(return new ImageFilterFastBoundGM;) } diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index b9f5a7ad51..8df39bcec7 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -108,7 +108,7 @@ protected: if (codec) { stream.rewind(); codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode); - SkDELETE(codec); + delete codec; } else { fBM.allocN32Pixels(1, 1); *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index 5f1141e1e9..77a4c86572 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -83,4 +83,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(FontCacheGM); ) +DEF_GM(return new FontCacheGM;) diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 35914e798c..9339115d0b 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -300,12 +300,12 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(FontMgrGM); ) -DEF_GM( return SkNEW(FontMgrMatchGM); ) -DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, 0)); ) -DEF_GM( return SkNEW(FontMgrBoundsGM(0.75, 0)); ) -DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, -0.25)); ) +DEF_GM(return new FontMgrGM;) +DEF_GM(return new FontMgrMatchGM;) +DEF_GM(return new FontMgrBoundsGM(1.0, 0);) +DEF_GM(return new FontMgrBoundsGM(0.75, 0);) +DEF_GM(return new FontMgrBoundsGM(1.0, -0.25);) #ifdef SK_BUILD_FOR_WIN - DEF_GM( return SkNEW_ARGS(FontMgrGM, (SkFontMgr_New_DirectWrite())); ) +DEF_GM(return new FontMgrGM(SkFontMgr_New_DirectWrite());) #endif diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp index 2ee3797825..e8bfad4990 100644 --- a/gm/giantbitmap.cpp +++ b/gm/giantbitmap.cpp @@ -66,9 +66,7 @@ public: fDoRotate = doRotate; } - virtual ~GiantBitmapGM() { - SkDELETE(fBM); - } + virtual ~GiantBitmapGM() { delete fBM; } protected: @@ -24,13 +24,11 @@ struct GrContextOptions; static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_)); // See colorwheel.cpp for example usage. -#define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \ - static void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas* CANVAS); \ - DEF_GM( return SkNEW_ARGS(skiagm::SimpleGM, \ - (SkString(#NAME), \ - SK_MACRO_CONCAT(NAME, _GM), \ - SkISize::Make(W, H))); ) \ - void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas* CANVAS) +#define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \ + static void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas * CANVAS); \ + DEF_GM(return new skiagm::SimpleGM(SkString(#NAME), SK_MACRO_CONCAT(NAME, _GM), \ + SkISize::Make(W, H));) \ + void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas * CANVAS) namespace skiagm { diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index e706ac634f..d06ae5bdbf 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -128,15 +128,15 @@ struct ColorPos { ColorPos() : fColors(NULL), fPos(NULL), fCount(0) {} ~ColorPos() { - SkDELETE_ARRAY(fColors); - SkDELETE_ARRAY(fPos); + delete[] fColors; + delete[] fPos; } void construct(const SkColor colors[], const SkScalar pos[], int count) { - fColors = SkNEW_ARRAY(SkColor, count); + fColors = new SkColor[count]; memcpy(fColors, colors, count * sizeof(SkColor)); if (pos) { - fPos = SkNEW_ARRAY(SkScalar, count); + fPos = new SkScalar[count]; memcpy(fPos, pos, count * sizeof(SkScalar)); fPos[0] = 0; fPos[count - 1] = 1; @@ -248,5 +248,5 @@ private: /////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(GradientsNoTextureGM)); -DEF_GM( return SkNEW(GradientsManyColorsGM)); +DEF_GM(return new GradientsNoTextureGM); +DEF_GM(return new GradientsManyColorsGM); diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 426a4dcde2..61c3f11f58 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -26,9 +26,7 @@ public: FailImageFilter::GetFlattenableType()); } }; - static FailImageFilter* Create() { - return SkNEW(FailImageFilter); - } + static FailImageFilter* Create() { return new FailImageFilter; } SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter) @@ -70,7 +68,7 @@ public: } }; static IdentityImageFilter* Create(SkImageFilter* input = NULL) { - return SkNEW_ARGS(IdentityImageFilter, (input)); + return new IdentityImageFilter(input); } SK_TO_STRING_OVERRIDE() diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index cfedaf0256..521dd3c7ef 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -34,7 +34,7 @@ public: } }; static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkImageFilter* input) { - return SkNEW_ARGS(SimpleOffsetFilter, (dx, dy, input)); + return new SimpleOffsetFilter(dx, dy, input); } virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx, diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp index 7767c4661d..68faf801c6 100644 --- a/gm/imagefromyuvtextures.cpp +++ b/gm/imagefromyuvtextures.cpp @@ -169,7 +169,7 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(ImageFromYUVTextures); ) +DEF_GM(return new ImageFromYUVTextures;) } #endif diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp index bb5447e4c4..bc1dc24462 100644 --- a/gm/internal_links.cpp +++ b/gm/internal_links.cpp @@ -72,7 +72,7 @@ private: ////////////////////////////////////////////////////////////////////////////// -static GM* MyFactory(void*) { return SkNEW(InternalLinksGM); } +static GM* MyFactory(void*) { return new InternalLinksGM; } static GMRegistry reg(MyFactory); } diff --git a/gm/largeglyphblur.cpp b/gm/largeglyphblur.cpp index 8723824e13..b74f9024b8 100644 --- a/gm/largeglyphblur.cpp +++ b/gm/largeglyphblur.cpp @@ -65,5 +65,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(LargeGlyphBlur); ) +DEF_GM(return new LargeGlyphBlur;) } diff --git a/gm/lerpmode.cpp b/gm/lerpmode.cpp index b483c13787..f690c76fa6 100644 --- a/gm/lerpmode.cpp +++ b/gm/lerpmode.cpp @@ -60,4 +60,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(LerpXfermodeGM); ) +DEF_GM(return new LerpXfermodeGM;) diff --git a/gm/lighting.cpp b/gm/lighting.cpp index f6d236c382..a464a07480 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -170,6 +170,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(ImageLightingGM); ) - +DEF_GM(return new ImageLightingGM;) } diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index c73ad5b4c8..8bb3595a78 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -185,6 +185,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(LightingShaderGM); ) - +DEF_GM(return new LightingShaderGM;) } diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 14237888b1..46a22f84c4 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -152,4 +152,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(LumaFilterGM); ) +DEF_GM(return new LumaFilterGM;) diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp index a98f531f21..e66e73caf3 100644 --- a/gm/mixedtextblobs.cpp +++ b/gm/mixedtextblobs.cpp @@ -163,5 +163,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(MixedTextBlobsGM); ) +DEF_GM(return new MixedTextBlobsGM;) } diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp index f9a3a1042b..9f70bf8674 100644 --- a/gm/modecolorfilters.cpp +++ b/gm/modecolorfilters.cpp @@ -49,8 +49,7 @@ static SkShader* make_bg_shader(int checkSize) { SkIntToScalar(checkSize), SkIntToScalar(checkSize)); canvas.drawRect(rect1, paint); canvas.drawRect(rect0, paint); - return SkNEW_ARGS(SkBitmapProcShader, (bmp, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode)); + return new SkBitmapProcShader(bmp, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); } class ModeColorFilterGM : public GM { diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 21c9d187b3..3a0b0fa7d9 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -258,7 +258,10 @@ static SkSurface* create_compat_surface(SkCanvas* canvas, int width, int height) class ComposeStep { public: ComposeStep() : fSurf(NULL), fX(0.0f), fY(0.0f), fPaint(NULL) { } - ~ComposeStep() { SkSafeUnref(fSurf); SkDELETE(fPaint); } + ~ComposeStep() { + SkSafeUnref(fSurf); + delete fPaint; + } SkSurface* fSurf; SkScalar fX; @@ -415,7 +418,7 @@ static void tiled(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, step.fX = SkIntToScalar(x*kTileWidth); step.fY = SkIntToScalar(y*kTileHeight); - step.fPaint = SkNEW(SkPaint); + step.fPaint = new SkPaint; step.fPaint->setColorFilter( SkColorFilter::CreateModeFilter(colors[x][y], SkXfermode::kModulate_Mode))->unref(); @@ -540,33 +543,33 @@ namespace skiagm { typedef GM INHERITED; }; - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kSierpinski_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kBigLayer_Content, - MultiPictureDraw::kSimple_Layout));) - - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kSierpinski_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kBigLayer_Content, - MultiPictureDraw::kTiled_Layout));) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kNoClipSingle_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRectClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRRectClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kPathClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kInvPathClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kSierpinski_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kBigLayer_Content, + MultiPictureDraw::kSimple_Layout);) + + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kNoClipSingle_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRectClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRRectClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kPathClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kInvPathClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kSierpinski_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kBigLayer_Content, + MultiPictureDraw::kTiled_Layout);) } diff --git a/gm/patch.cpp b/gm/patch.cpp index ea7954c636..df3a84e534 100644 --- a/gm/patch.cpp +++ b/gm/patch.cpp @@ -154,6 +154,5 @@ private: typedef GM INHERITED; }; -DEF_GM(return SkNEW(SkPatchGM); ) - +DEF_GM(return new SkPatchGM;) } diff --git a/gm/patchgrid.cpp b/gm/patchgrid.cpp index 5c719bf0a8..89a9847271 100644 --- a/gm/patchgrid.cpp +++ b/gm/patchgrid.cpp @@ -156,6 +156,5 @@ private: typedef GM INHERITED; }; -DEF_GM(return SkNEW(SkPatchGridGM); ) - +DEF_GM(return new SkPatchGridGM;) } diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp index 37ec32fa74..b8c1678c03 100644 --- a/gm/peekpixels.cpp +++ b/gm/peekpixels.cpp @@ -68,4 +68,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(PeekPixelsGM); ) +DEF_GM(return new PeekPixelsGM;) diff --git a/gm/picture.cpp b/gm/picture.cpp index f1d2a7965b..175e0a76f2 100644 --- a/gm/picture.cpp +++ b/gm/picture.cpp @@ -81,4 +81,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(PictureGM); ) +DEF_GM(return new PictureGM;) diff --git a/gm/pictureimagegenerator.cpp b/gm/pictureimagegenerator.cpp index a978e67f78..9149ec1a70 100644 --- a/gm/pictureimagegenerator.cpp +++ b/gm/pictureimagegenerator.cpp @@ -183,4 +183,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(PictureGeneratorGM); ) +DEF_GM(return new PictureGeneratorGM;) diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp index 3f719be42d..d28749a644 100644 --- a/gm/pictureshader.cpp +++ b/gm/pictureshader.cpp @@ -181,7 +181,7 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW_ARGS(PictureShaderGM, (50, 100)); ) +DEF_GM(return new PictureShaderGM(50, 100);) DEF_SIMPLE_GM(tiled_picture_shader, canvas, 400, 400) { // https://code.google.com/p/skia/issues/detail?id=3398 diff --git a/gm/pictureshadertile.cpp b/gm/pictureshadertile.cpp index 11d6b34bea..a84e23343d 100644 --- a/gm/pictureshadertile.cpp +++ b/gm/pictureshadertile.cpp @@ -155,4 +155,4 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(PictureShaderTileGM); ) +DEF_GM(return new PictureShaderTileGM;) diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp index ea85a948ac..5f1a745b14 100644 --- a/gm/pixelsnap.cpp +++ b/gm/pixelsnap.cpp @@ -175,7 +175,7 @@ private: }; ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(PointSnapGM); ) -DEF_GM( return SkNEW(LineSnapGM); ) -DEF_GM( return SkNEW(RectSnapGM); ) -DEF_GM( return SkNEW(ComboSnapGM); ) +DEF_GM(return new PointSnapGM;) +DEF_GM(return new LineSnapGM;) +DEF_GM(return new RectSnapGM;) +DEF_GM(return new ComboSnapGM;) diff --git a/gm/smallarc.cpp b/gm/smallarc.cpp index 2109b90e0b..6c0df8d8d7 100755..100644 --- a/gm/smallarc.cpp +++ b/gm/smallarc.cpp @@ -50,6 +50,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(SmallArcGM); ) - +DEF_GM(return new SmallArcGM;) } diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp index a7e404dabf..4e8eaffcca 100644 --- a/gm/strokefill.cpp +++ b/gm/strokefill.cpp @@ -355,6 +355,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM(return SkNEW(StrokeFillGM);) - +DEF_GM(return new StrokeFillGM;) } diff --git a/gm/strokes.cpp b/gm/strokes.cpp index 19ba84401d..57517a0616 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -407,4 +407,4 @@ static skiagm::GMRegistry R2(F2); static skiagm::GMRegistry R3(F3); static skiagm::GMRegistry R4(F4); -DEF_GM( return SkNEW(ZeroLenStrokesGM); ) +DEF_GM( return new ZeroLenStrokesGM; ) diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp index 6ec425b5b2..75ce164bcf 100644 --- a/gm/stroketext.cpp +++ b/gm/stroketext.cpp @@ -98,4 +98,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(StrokeTextGM); ) +DEF_GM(return new StrokeTextGM;) diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp index 4581f10ac2..dfd31a0f50 100644 --- a/gm/tallstretchedbitmaps.cpp +++ b/gm/tallstretchedbitmaps.cpp @@ -103,5 +103,4 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM(return SkNEW(TallStretchedBitmapsGM);) - +DEF_GM(return new TallStretchedBitmapsGM;) diff --git a/gm/textblob.cpp b/gm/textblob.cpp index cd5c12a74d..5020e7c5ef 100644 --- a/gm/textblob.cpp +++ b/gm/textblob.cpp @@ -186,4 +186,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW_ARGS(TextBlobGM, ("hamburgefons")); ) +DEF_GM(return new TextBlobGM("hamburgefons");) diff --git a/gm/textblobcolortrans.cpp b/gm/textblobcolortrans.cpp index 8b5413a6e9..0e4e0ff98b 100644 --- a/gm/textblobcolortrans.cpp +++ b/gm/textblobcolortrans.cpp @@ -97,5 +97,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TextBlobColorTrans); ) +DEF_GM(return new TextBlobColorTrans;) } diff --git a/gm/textblobgeometrychange.cpp b/gm/textblobgeometrychange.cpp index fec1ac050d..bae2381b65 100644 --- a/gm/textblobgeometrychange.cpp +++ b/gm/textblobgeometrychange.cpp @@ -77,5 +77,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TextBlobGeometryChange); ) +DEF_GM(return new TextBlobGeometryChange;) } diff --git a/gm/textbloblooper.cpp b/gm/textbloblooper.cpp index 337942c68f..dc4be0b129 100644 --- a/gm/textbloblooper.cpp +++ b/gm/textbloblooper.cpp @@ -255,5 +255,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TextBlobLooperGM); ) +DEF_GM(return new TextBlobLooperGM;) } diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp index 9d91b6125c..a76c6f575b 100644 --- a/gm/textblobmixedsizes.cpp +++ b/gm/textblobmixedsizes.cpp @@ -184,8 +184,8 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW_ARGS(TextBlobMixedSizes, (false)); ) +DEF_GM( return new TextBlobMixedSizes(false); ) #if SK_SUPPORT_GPU -DEF_GM( return SkNEW_ARGS(TextBlobMixedSizes, (true)); ) +DEF_GM( return new TextBlobMixedSizes(true); ) #endif } diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp index c1e754c290..ada46cadfc 100644 --- a/gm/textblobrandomfont.cpp +++ b/gm/textblobrandomfont.cpp @@ -44,7 +44,7 @@ protected: if (NULL == orig) { orig.reset(SkTypeface::RefDefault()); } - SkAutoTUnref<SkTypeface> random(SkNEW_ARGS(SkRandomTypeface, (orig, paint, false))); + SkAutoTUnref<SkTypeface> random(new SkRandomTypeface(orig, paint, false)); paint.setTypeface(random); SkRect bounds; @@ -74,8 +74,7 @@ protected: const char* emojiText = sk_tool_utils::emoji_sample_text(); paint.measureText(emojiText, strlen(emojiText), &bounds); offset += bounds.height(); - SkAutoTUnref<SkTypeface> randomEmoji(SkNEW_ARGS(SkRandomTypeface, (orig, paint, - false))); + SkAutoTUnref<SkTypeface> randomEmoji(new SkRandomTypeface(orig, paint, false)); paint.setTypeface(randomEmoji); sk_tool_utils::add_to_text_blob(&builder, emojiText, paint, 0, offset); } @@ -149,6 +148,6 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TextBlobRandomFont); ) +DEF_GM(return new TextBlobRandomFont;) } #endif diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp index 3b2a9a5167..5c9372d93c 100644 --- a/gm/textblobshader.cpp +++ b/gm/textblobshader.cpp @@ -109,4 +109,4 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW_ARGS(TextBlobShaderGM, ("Blobber")); ) +DEF_GM(return new TextBlobShaderGM("Blobber");) diff --git a/gm/textblobtransforms.cpp b/gm/textblobtransforms.cpp index 0813d87637..eed18095f0 100644 --- a/gm/textblobtransforms.cpp +++ b/gm/textblobtransforms.cpp @@ -168,5 +168,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TextBlobTransforms); ) +DEF_GM(return new TextBlobTransforms;) } diff --git a/gm/textblobuseaftergpufree.cpp b/gm/textblobuseaftergpufree.cpp index 3994c5ddde..363cd2fed9 100644 --- a/gm/textblobuseaftergpufree.cpp +++ b/gm/textblobuseaftergpufree.cpp @@ -70,6 +70,6 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TextBlobUseAfterGpuFree); ) +DEF_GM(return new TextBlobUseAfterGpuFree;) } #endif diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 07b71195c7..7c534676af 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -155,7 +155,7 @@ private: const SkScalar TextureDomainEffect::kDrawPad = 10.f; const SkScalar TextureDomainEffect::kTestPad = 10.f; -DEF_GM( return SkNEW(TextureDomainEffect); ) +DEF_GM(return new TextureDomainEffect;) } #endif diff --git a/gm/thinstrokedrects.cpp b/gm/thinstrokedrects.cpp index 8bde1022ce..73e1f529df 100644 --- a/gm/thinstrokedrects.cpp +++ b/gm/thinstrokedrects.cpp @@ -73,6 +73,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(ThinStrokedRectsGM); ) - +DEF_GM(return new ThinStrokedRectsGM;) } diff --git a/gm/tiledscaledbitmap.cpp b/gm/tiledscaledbitmap.cpp index 79e1111ffe..daecbb05e2 100644 --- a/gm/tiledscaledbitmap.cpp +++ b/gm/tiledscaledbitmap.cpp @@ -79,6 +79,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM(return SkNEW(TiledScaledBitmapGM);) - +DEF_GM(return new TiledScaledBitmapGM;) } diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp index 9d0f95e15c..1ec05113e1 100644 --- a/gm/tileimagefilter.cpp +++ b/gm/tileimagefilter.cpp @@ -121,6 +121,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW(TileImageFilterGM); ) - +DEF_GM(return new TileImageFilterGM;) } diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index 887a7c30d0..83fe7201fd 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -160,7 +160,7 @@ private: typedef skiagm::GM INHERITED; }; -DEF_GM( return SkNEW(VariedTextGM(false, false)); ) -DEF_GM( return SkNEW(VariedTextGM(true, false)); ) -DEF_GM( return SkNEW(VariedTextGM(false, true)); ) -DEF_GM( return SkNEW(VariedTextGM(true, true)); ) +DEF_GM(return new VariedTextGM(false, false);) +DEF_GM(return new VariedTextGM(true, false);) +DEF_GM(return new VariedTextGM(false, true);) +DEF_GM(return new VariedTextGM(true, true);) diff --git a/gm/vertices.cpp b/gm/vertices.cpp index 2f7a9b99d4..9533d81bb4 100644 --- a/gm/vertices.cpp +++ b/gm/vertices.cpp @@ -123,5 +123,5 @@ private: ///////////////////////////////////////////////////////////////////////////////////// -DEF_GM( return SkNEW_ARGS(VerticesGM, (0xFF)); ) -DEF_GM( return SkNEW_ARGS(VerticesGM, (0x80)); ) +DEF_GM(return new VerticesGM(0xFF);) +DEF_GM(return new VerticesGM(0x80);) diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 4ec86f45ee..7dbd24eda0 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -140,7 +140,7 @@ private: typedef GM INHERITED; }; -DEF_GM( return SkNEW(YUVtoRGBEffect); ) +DEF_GM(return new YUVtoRGBEffect;) } #endif |