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

Side by Side Diff: bench/MorphologyBench.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « bench/MipMapBench.cpp ('k') | bench/PatchBench.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "Benchmark.h" 8 #include "Benchmark.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkMorphologyImageFilter.h" 10 #include "SkMorphologyImageFilter.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 paint.setAntiAlias(true); 57 paint.setAntiAlias(true);
58 58
59 SkRandom rand; 59 SkRandom rand;
60 for (int i = 0; i < loops; i++) { 60 for (int i = 0; i < loops; i++) {
61 SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400, 61 SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400,
62 rand.nextUScalar1() * 400); 62 rand.nextUScalar1() * 400);
63 r.offset(fRadius, fRadius); 63 r.offset(fRadius, fRadius);
64 64
65 if (fRadius > 0) { 65 if (fRadius > 0) {
66 SkMorphologyImageFilter* mf = NULL; 66 SkMorphologyImageFilter* mf = nullptr;
67 switch (fStyle) { 67 switch (fStyle) {
68 case kDilate_MT: 68 case kDilate_MT:
69 mf = SkDilateImageFilter::Create(SkScalarFloorToInt(fRadius) , 69 mf = SkDilateImageFilter::Create(SkScalarFloorToInt(fRadius) ,
70 SkScalarFloorToInt(fRadius)) ; 70 SkScalarFloorToInt(fRadius)) ;
71 break; 71 break;
72 case kErode_MT: 72 case kErode_MT:
73 mf = SkErodeImageFilter::Create(SkScalarFloorToInt(fRadius), 73 mf = SkErodeImageFilter::Create(SkScalarFloorToInt(fRadius),
74 SkScalarFloorToInt(fRadius)) ; 74 SkScalarFloorToInt(fRadius)) ;
75 break; 75 break;
76 } 76 }
(...skipping 10 matching lines...) Expand all
87 DEF_BENCH( return new MorphologyBench(SMALL, kErode_MT); ) 87 DEF_BENCH( return new MorphologyBench(SMALL, kErode_MT); )
88 DEF_BENCH( return new MorphologyBench(SMALL, kDilate_MT); ) 88 DEF_BENCH( return new MorphologyBench(SMALL, kDilate_MT); )
89 89
90 DEF_BENCH( return new MorphologyBench(BIG, kErode_MT); ) 90 DEF_BENCH( return new MorphologyBench(BIG, kErode_MT); )
91 DEF_BENCH( return new MorphologyBench(BIG, kDilate_MT); ) 91 DEF_BENCH( return new MorphologyBench(BIG, kDilate_MT); )
92 92
93 DEF_BENCH( return new MorphologyBench(REAL, kErode_MT); ) 93 DEF_BENCH( return new MorphologyBench(REAL, kErode_MT); )
94 DEF_BENCH( return new MorphologyBench(REAL, kDilate_MT); ) 94 DEF_BENCH( return new MorphologyBench(REAL, kDilate_MT); )
95 95
96 DEF_BENCH( return new MorphologyBench(0, kErode_MT); ) 96 DEF_BENCH( return new MorphologyBench(0, kErode_MT); )
OLDNEW
« no previous file with comments | « bench/MipMapBench.cpp ('k') | bench/PatchBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698