AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove global SkRandoms from ChartBench.

Browse Source 
TSAN picked them up while running DM.

BUG=skia:1792
R=bsalomon@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/278523005

git-svn-id: http://skia.googlecode.com/svn/trunk@14641 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-08 15:12:43 +00:00
parent a87dd2084c
commit 8a2151f0ae
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bench/ChartBench.cpp
View File

@ -16,11 +16,11 @@
*/
// Generates y values for the chart plots.
static void gen_data(SkScalar yAvg, SkScalar ySpread, int count, SkTDArray<SkScalar>* dataPts) {
static void gen_data(SkScalar yAvg, SkScalar ySpread, int count,
SkRandom* random, SkTDArray<SkScalar>* dataPts) {
dataPts->setCount(count);
static SkRandom gRandom;
for (int i = 0; i < count; ++i) {
(*dataPts)[i] = gRandom.nextRangeScalar(yAvg - SkScalarHalf(ySpread),
(*dataPts)[i] = random->nextRangeScalar(yAvg - SkScalarHalf(ySpread),
yAvg + SkScalarHalf(ySpread));
}
}
@ -115,25 +115,24 @@ protected:
if (sizeChanged) {
int dataPointCount = SkMax32(fSize.fWidth / kPixelsPerTick + 1, 2);
SkRandom random;
for (int i = 0; i < kNumGraphs; ++i) {
SkScalar y = (kNumGraphs - i) * (height - ySpread) / (kNumGraphs + 1);
fData[i].reset();
gen_data(y, ySpread, dataPointCount, fData + i);
gen_data(y, ySpread, dataPointCount, &random, fData + i);
}
}
SkRandom colorRand;
SkColor colors[kNumGraphs];
for (int i = 0; i < kNumGraphs; ++i) {
colors[i] = colorRand.nextU() | 0xff000000;
}
for (int frame = 0; frame < loops; ++frame) {
canvas->clear(0xFFE0F0E0);
static SkRandom colorRand;
static SkColor gColors[kNumGraphs] = { 0x0 };
if (0 == gColors[0]) {
for (int i = 0; i < kNumGraphs; ++i) {
gColors[i] = colorRand.nextU() | 0xff000000;
}
}
SkPath plotPath;
SkPath fillPath;
@ -160,10 +159,10 @@ protected:
&fillPath);
// Make the fills partially transparent
fillPaint.setColor((gColors[i] & 0x00ffffff) | 0x80000000);
fillPaint.setColor((colors[i] & 0x00ffffff) | 0x80000000);
canvas->drawPath(fillPath, fillPaint);
plotPaint.setColor(gColors[i]);
plotPaint.setColor(colors[i]);
canvas->drawPath(plotPath, plotPaint);
prevData = fData + i;