From 385fe4d4b62d7d1dd76116dd570df3290a2f487b Mon Sep 17 00:00:00 2001 From: halcanary Date: Wed, 26 Aug 2015 13:07:48 -0700 Subject: Style Change: SkNEW->new; SkDELETE->delete DOCS_PREVIEW= https://skia.org/?cl=1316123003 Review URL: https://codereview.chromium.org/1316123003 --- bench/RectBench.cpp | 63 ++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) (limited to 'bench/RectBench.cpp') diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index 4aa6b8bd1a..db363959bb 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -249,40 +249,35 @@ private: kMaskType _type; }; - -DEF_BENCH( return SkNEW_ARGS(RectBench, (1)); ) -DEF_BENCH( return SkNEW_ARGS(RectBench, (1, 4)); ) -DEF_BENCH( return SkNEW_ARGS(RectBench, (3)); ) -DEF_BENCH( return SkNEW_ARGS(RectBench, (3, 4)); ) -DEF_BENCH( return SkNEW_ARGS(OvalBench, (1)); ) -DEF_BENCH( return SkNEW_ARGS(OvalBench, (3)); ) -DEF_BENCH( return SkNEW_ARGS(OvalBench, (1, 4)); ) -DEF_BENCH( return SkNEW_ARGS(OvalBench, (3, 4)); ) -DEF_BENCH( return SkNEW_ARGS(RRectBench, (1)); ) -DEF_BENCH( return SkNEW_ARGS(RRectBench, (1, 4)); ) -DEF_BENCH( return SkNEW_ARGS(RRectBench, (3)); ) -DEF_BENCH( return SkNEW_ARGS(RRectBench, (3, 4)); ) -DEF_BENCH( return SkNEW_ARGS(PointsBench, (SkCanvas::kPoints_PointMode, "points")); ) -DEF_BENCH( return SkNEW_ARGS(PointsBench, (SkCanvas::kLines_PointMode, "lines")); ) -DEF_BENCH( return SkNEW_ARGS(PointsBench, (SkCanvas::kPolygon_PointMode, "polygon")); ) - -DEF_BENCH( return SkNEW_ARGS(SrcModeRectBench, ()); ) +DEF_BENCH(return new RectBench(1);) +DEF_BENCH(return new RectBench(1, 4);) +DEF_BENCH(return new RectBench(3);) +DEF_BENCH(return new RectBench(3, 4);) +DEF_BENCH(return new OvalBench(1);) +DEF_BENCH(return new OvalBench(3);) +DEF_BENCH(return new OvalBench(1, 4);) +DEF_BENCH(return new OvalBench(3, 4);) +DEF_BENCH(return new RRectBench(1);) +DEF_BENCH(return new RRectBench(1, 4);) +DEF_BENCH(return new RRectBench(3);) +DEF_BENCH(return new RRectBench(3, 4);) +DEF_BENCH(return new PointsBench(SkCanvas::kPoints_PointMode, "points");) +DEF_BENCH(return new PointsBench(SkCanvas::kLines_PointMode, "lines");) +DEF_BENCH(return new PointsBench(SkCanvas::kPolygon_PointMode, "polygon");) + +DEF_BENCH(return new SrcModeRectBench();) /* init the blitmask bench */ -DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, - (SkCanvas::kPoints_PointMode, - BlitMaskBench::kMaskOpaque, "maskopaque") - ); ) -DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, - (SkCanvas::kPoints_PointMode, - BlitMaskBench::kMaskBlack, "maskblack") - ); ) -DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, - (SkCanvas::kPoints_PointMode, - BlitMaskBench::kMaskColor, "maskcolor") - ); ) -DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, - (SkCanvas::kPoints_PointMode, - BlitMaskBench::KMaskShader, "maskshader") - ); ) +DEF_BENCH(return new BlitMaskBench(SkCanvas::kPoints_PointMode, + BlitMaskBench::kMaskOpaque, + "maskopaque");) +DEF_BENCH(return new BlitMaskBench(SkCanvas::kPoints_PointMode, + BlitMaskBench::kMaskBlack, + "maskblack");) +DEF_BENCH(return new BlitMaskBench(SkCanvas::kPoints_PointMode, + BlitMaskBench::kMaskColor, + "maskcolor");) +DEF_BENCH(return new BlitMaskBench(SkCanvas::kPoints_PointMode, + BlitMaskBench::KMaskShader, + "maskshader");) -- cgit v1.2.3