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

Side by Side Diff: gm/convex_all_line_paths.cpp

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « bench/DashBench.cpp ('k') | gm/pixelsnap.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 2015 Google Inc. 2 * Copyright 2015 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 "gm.h" 8 #include "gm.h"
9 #include "SkPathPriv.h" 9 #include "SkPathPriv.h"
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 SK_ARRAY_COUNT(gPoints2), 156 SK_ARRAY_COUNT(gPoints2),
157 SK_ARRAY_COUNT(gPoints3), 157 SK_ARRAY_COUNT(gPoints3),
158 SK_ARRAY_COUNT(gPoints4), 158 SK_ARRAY_COUNT(gPoints4),
159 SK_ARRAY_COUNT(gPoints5), 159 SK_ARRAY_COUNT(gPoints5),
160 SK_ARRAY_COUNT(gPoints6), 160 SK_ARRAY_COUNT(gPoints6),
161 SK_ARRAY_COUNT(gPoints7), 161 SK_ARRAY_COUNT(gPoints7),
162 SK_ARRAY_COUNT(gPoints8), 162 SK_ARRAY_COUNT(gPoints8),
163 SK_ARRAY_COUNT(gPoints9), 163 SK_ARRAY_COUNT(gPoints9),
164 SK_ARRAY_COUNT(gPoints10), 164 SK_ARRAY_COUNT(gPoints10),
165 }; 165 };
166 SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), arr ay_mismatch); 166 static_assert(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), "array_ mismatch");
167 167
168 SkAutoTDeleteArray<SkPoint> data(NULL); 168 SkAutoTDeleteArray<SkPoint> data(NULL);
169 const SkPoint* points; 169 const SkPoint* points;
170 int numPts; 170 int numPts;
171 if (index < (int) SK_ARRAY_COUNT(gPoints)) { 171 if (index < (int) SK_ARRAY_COUNT(gPoints)) {
172 // manually specified 172 // manually specified
173 points = gPoints[index]; 173 points = gPoints[index];
174 numPts = (int) gSizes[index]; 174 numPts = (int) gSizes[index];
175 } else { 175 } else {
176 // procedurally generated 176 // procedurally generated
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 static const int kGMHeight = 512; 313 static const int kGMHeight = 512;
314 314
315 typedef GM INHERITED; 315 typedef GM INHERITED;
316 }; 316 };
317 317
318 ////////////////////////////////////////////////////////////////////////////// 318 //////////////////////////////////////////////////////////////////////////////
319 319
320 DEF_GM( return SkNEW(ConvexLineOnlyPathsGM); ) 320 DEF_GM( return SkNEW(ConvexLineOnlyPathsGM); )
321 321
322 } 322 }
OLDNEW
« no previous file with comments | « bench/DashBench.cpp ('k') | gm/pixelsnap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698