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

Side by Side Diff: src/gpu/GrTestUtils.cpp

Issue 1277433005: Fix for Crashing IOS Stroke test (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Reset SkCommonFlags 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 | « no previous file | no next file » | 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 "GrStrokeInfo.h" 8 #include "GrStrokeInfo.h"
9 #include "GrTestUtils.h" 9 #include "GrTestUtils.h"
10 #include "SkMatrix.h" 10 #include "SkMatrix.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 return rec; 237 return rec;
238 } 238 }
239 239
240 GrStrokeInfo TestStrokeInfo(SkRandom* random) { 240 GrStrokeInfo TestStrokeInfo(SkRandom* random) {
241 SkStrokeRec::InitStyle style = 241 SkStrokeRec::InitStyle style =
242 SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_Init Style + 1)); 242 SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_Init Style + 1));
243 GrStrokeInfo strokeInfo(style); 243 GrStrokeInfo strokeInfo(style);
244 randomize_stroke_rec(&strokeInfo, random); 244 randomize_stroke_rec(&strokeInfo, random);
245 SkPathEffect::DashInfo dashInfo; 245 SkPathEffect::DashInfo dashInfo;
246 dashInfo.fCount = random->nextRangeU(1, 50) * 2; 246 dashInfo.fCount = random->nextRangeU(1, 50) * 2;
247 SkAutoTMalloc<SkScalar> intervals(dashInfo.fCount); 247 dashInfo.fIntervals = SkNEW_ARRAY(SkScalar, dashInfo.fCount);
248 dashInfo.fIntervals = intervals.get();
249 SkScalar sum = 0; 248 SkScalar sum = 0;
250 for (int i = 0; i < dashInfo.fCount; i++) { 249 for (int i = 0; i < dashInfo.fCount; i++) {
251 #if defined(SK_BUILD_FOR_IOS)
252 SkDebugf("&dashInfo.fIntervals[%d] = %p\n", i, &dashInfo.fIntervals[i]);
253 #endif
254 dashInfo.fIntervals[i] = random->nextRangeScalar(SkDoubleToScalar(0.01), 250 dashInfo.fIntervals[i] = random->nextRangeScalar(SkDoubleToScalar(0.01),
255 SkDoubleToScalar(10.0)) ; 251 SkDoubleToScalar(10.0)) ;
256 sum += dashInfo.fIntervals[i]; 252 sum += dashInfo.fIntervals[i];
257 } 253 }
258 dashInfo.fPhase = random->nextRangeScalar(0, sum); 254 dashInfo.fPhase = random->nextRangeScalar(0, sum);
259 strokeInfo.setDashInfo(dashInfo); 255 strokeInfo.setDashInfo(dashInfo);
256 SkDELETE(dashInfo.fIntervals);
260 return strokeInfo; 257 return strokeInfo;
261 } 258 }
262 259
263 }; 260 };
264 261
265 #endif 262 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698