| OLD | NEW |
| 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 | 9 |
| 10 static void create_ngon(int n, SkPoint* pts, SkScalar width, SkScalar height) { | 10 static void create_ngon(int n, SkPoint* pts, SkScalar width, SkScalar height) { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), arr
ay_mismatch); |
| 167 | 167 |
| 168 SkAutoTDelete<SkPoint> data; | 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 |
| 177 SkScalar width = kMaxPathHeight/2; | 177 SkScalar width = kMaxPathHeight/2; |
| 178 SkScalar height = kMaxPathHeight/2; | 178 SkScalar height = kMaxPathHeight/2; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 SkPoint fOffset; // the right edge of the last drawn path | 312 SkPoint fOffset; // the right edge of the last drawn path |
| 313 | 313 |
| 314 typedef GM INHERITED; | 314 typedef GM INHERITED; |
| 315 }; | 315 }; |
| 316 | 316 |
| 317 ////////////////////////////////////////////////////////////////////////////// | 317 ////////////////////////////////////////////////////////////////////////////// |
| 318 | 318 |
| 319 DEF_GM( return SkNEW(ConvexLineOnlyPathsGM); ) | 319 DEF_GM( return SkNEW(ConvexLineOnlyPathsGM); ) |
| 320 | 320 |
| 321 } | 321 } |
| OLD | NEW |