Switch out random number generator for tests, benches, samples.

This change makes tests, benches and samples use the new SkMWCRandom PRNG. GMs will be saved for another time, as they'll require rebaselining.

R=reed@google.com, bsalomon@google.com

Author: jvanverth@google.com

Review URL: https://chromiumcodereview.appspot.com/23653018

git-svn-id: http://skia.googlecode.com/svn/trunk@11136 2bbb7eff-a529-9590-31e7-b0007b416f81

24 files changed, 54 insertions, 54 deletions

diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index 276a8ff3e7..ef5ba1588e 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -94,7 +94,7 @@ class NestedAAClipBench : public SkBenchmark {
     SkString fName;
     bool     fDoAA;
     SkRect   fDrawRect;
-    SkRandom fRandom;
+    SkMWCRandom fRandom;
 
     static const int kNumDraws = SkBENCHLOOP(2);
     static const int kNestingDepth = 3;
diff --git a/bench/BicubicBench.cpp b/bench/BicubicBench.cpp
index a3a23180f9..1aa2dbd283 100644
--- a/bench/BicubicBench.cpp
+++ b/bench/BicubicBench.cpp
@@ -37,7 +37,7 @@ protected:
 
         paint.setAntiAlias(true);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         SkRect r = SkRect::MakeWH(40, 40);
         SkAutoTUnref<SkImageFilter> bicubic(SkBicubicImageFilter::CreateMitchell(fScale));
         paint.setImageFilter(bicubic);
diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index a472d2489f..9291342565 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -137,7 +137,7 @@ protected:
 
     virtual void onDraw(SkCanvas* canvas) {
         SkIPoint dim = this->getSize();
-        SkRandom rand;
+        SkMWCRandom rand;
 
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index c147da2349..aee0eec79d 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -86,7 +86,7 @@ protected:
 
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkRandom rand;
+        SkMWCRandom rand;
 
         SkPaint paint;
         this->setupPaint(&paint);
diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp
index 67a600b6b4..a66dac097e 100644
--- a/bench/BlurBench.cpp
+++ b/bench/BlurBench.cpp
@@ -59,7 +59,7 @@ protected:
 
         paint.setAntiAlias(true);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < SkBENCHLOOP(10); i++) {
             SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400,
                                       rand.nextUScalar1() * 400);
diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp
index 315402eeee..bc13ec5a55 100644
--- a/bench/ChecksumBench.cpp
+++ b/bench/ChecksumBench.cpp
@@ -30,7 +30,7 @@ class ComputeChecksumBench : public SkBenchmark {
 
 public:
     ComputeChecksumBench(void* param, ChecksumType type) : INHERITED(param), fType(type) {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < U32COUNT; ++i) {
             fData[i] = rand.nextU();
         }
diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp
index dccf8278f5..78a283b0c5 100644
--- a/bench/GrMemoryPoolBench.cpp
+++ b/bench/GrMemoryPoolBench.cpp
@@ -47,7 +47,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas*) {
-        SkRandom r;
+        SkMWCRandom r;
         enum {
             kMaxObjects = 4 * (1 << 10),
         };
@@ -103,7 +103,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas*) {
-        SkRandom r;
+        SkMWCRandom r;
         enum {
             kMaxObjects = 4 * (1 << 10),
         };
@@ -141,7 +141,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas*) {
-        SkRandom r;
+        SkMWCRandom r;
         A* objects[M];
         for (int i = 0; i < N; i++) {
             uint32_t count = r.nextRangeU(0, M-1);
diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp
index f5b30a38ad..ca3797b7b2 100644
--- a/bench/HairlinePathBench.cpp
+++ b/bench/HairlinePathBench.cpp
@@ -85,7 +85,7 @@ public:
         name->append("line");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
-        SkRandom rand;
+        SkMWCRandom rand;
         int size = SK_ARRAY_COUNT(points);
         int hSize = size / 2;
         for (int i = 0; i < kMaxPathSize; ++i) {
@@ -117,7 +117,7 @@ public:
         name->append("quad");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
-        SkRandom rand;
+        SkMWCRandom rand;
         int size = SK_ARRAY_COUNT(points);
         int hSize = size / 2;
         for (int i = 0; i < kMaxPathSize; ++i) {
@@ -149,8 +149,8 @@ public:
         name->append("conic");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
-        SkRandom rand;
-        SkRandom randWeight;
+        SkMWCRandom rand;
+        SkMWCRandom randWeight;
         int size = SK_ARRAY_COUNT(points);
         int hSize = size / 2;
         for (int i = 0; i < kMaxPathSize; ++i) {
@@ -184,7 +184,7 @@ public:
         name->append("cubic");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
-        SkRandom rand;
+        SkMWCRandom rand;
         int size = SK_ARRAY_COUNT(points);
         int hSize = size / 2;
         for (int i = 0; i < kMaxPathSize; ++i) {
diff --git a/bench/LineBench.cpp b/bench/LineBench.cpp
index feaae2b267..69074359ae 100644
--- a/bench/LineBench.cpp
+++ b/bench/LineBench.cpp
@@ -32,7 +32,7 @@ public:
         fDoAA = doAA;
         fName.printf("lines_%g_%s", width, doAA ? "AA" : "BW");
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < PTS; ++i) {
             fPts[i].set(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480);
         }
diff --git a/bench/MathBench.cpp b/bench/MathBench.cpp
index 32a89d64ef..5470924836 100644
--- a/bench/MathBench.cpp
+++ b/bench/MathBench.cpp
@@ -26,7 +26,7 @@ public:
     MathBench(void* param, const char name[]) : INHERITED(param) {
         fName.printf("math_%s", name);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < kBuffer; ++i) {
             fSrc[i] = rand.nextSScalar1();
         }
@@ -254,7 +254,7 @@ class IsFiniteBench : public SkBenchmark {
 public:
 
     IsFiniteBench(void* param, int index) : INHERITED(param) {
-        SkRandom rand;
+        SkMWCRandom rand;
 
         for (int i = 0; i < N; ++i) {
             fData[i] = rand.nextSScalar1();
@@ -322,7 +322,7 @@ class FloorBench : public SkBenchmark {
 public:
 
     FloorBench(void* param, bool fast) : INHERITED(param), fFast(fast) {
-        SkRandom rand;
+        SkMWCRandom rand;
 
         for (int i = 0; i < ARRAY; ++i) {
             fData[i] = rand.nextSScalar1();
@@ -340,7 +340,7 @@ public:
 
 protected:
     virtual void onDraw(SkCanvas*) {
-        SkRandom rand;
+        SkMWCRandom rand;
         float accum = 0;
         const float* data = fData;
 
@@ -384,7 +384,7 @@ public:
         : INHERITED(param)
         , fUsePortable(usePortable) {
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < ARRAY; ++i) {
             fData[i] = rand.nextU();
         }
@@ -444,7 +444,7 @@ public:
     NormalizeBench(void* param)
     : INHERITED(param) {
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < ARRAY; ++i) {
             fVec[i].set(rand.nextSScalar1(), rand.nextSScalar1());
         }
@@ -490,7 +490,7 @@ class FixedMathBench : public SkBenchmark {
 public:
 
     FixedMathBench(void* param) : INHERITED(param) {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < N; ++i) {
             fData[i] = rand.nextSScalar1();
         }
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index 8fe9e34e4b..e7054d43b8 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -95,7 +95,7 @@ private:
 // handling NaN values is a lot slower. Anyway, this guy is just meant to put
 // reasonable values in our arrays.
 template <typename T> void init9(T array[9]) {
-    SkRandom rand;
+    SkMWCRandom rand;
     for (int i = 0; i < 9; i++) {
         array[i] = rand.nextSScalar1();
     }
@@ -261,7 +261,7 @@ protected:
 private:
     SkMatrix fMatrix;
     float fArray[9];
-    SkRandom fRnd;
+    SkMWCRandom fRnd;
     typedef MatrixBench INHERITED;
 };
 
@@ -302,7 +302,7 @@ class ScaleTransMixedMatrixBench : public MatrixBench {
     SkMatrix fMatrix;
     SkPoint fSrc [16];
     SkPoint fDst [16];
-    SkRandom fRandom;
+    SkMWCRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
@@ -342,7 +342,7 @@ class ScaleTransDoubleMatrixBench : public MatrixBench {
     double fMatrix [9];
     SkPoint fSrc [16];
     SkPoint fDst [16];
-    SkRandom fRandom;
+    SkMWCRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
diff --git a/bench/MatrixConvolutionBench.cpp b/bench/MatrixConvolutionBench.cpp
index 161fc23296..82ac78cb0e 100644
--- a/bench/MatrixConvolutionBench.cpp
+++ b/bench/MatrixConvolutionBench.cpp
@@ -39,7 +39,7 @@ protected:
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setAntiAlias(true);
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < SkBENCHLOOP(3); i++) {
             SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400,
                                       rand.nextUScalar1() * 400);
diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp
index f9657bafd2..961721d77e 100644
--- a/bench/MorphologyBench.cpp
+++ b/bench/MorphologyBench.cpp
@@ -59,7 +59,7 @@ protected:
 
         paint.setAntiAlias(true);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < SkBENCHLOOP(3); i++) {
             SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400,
                                       rand.nextUScalar1() * 400);
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index 057a2b028c..967f501acf 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -183,7 +183,7 @@ public:
         name->append("long_curved");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
-        SkRandom rand (12);
+        SkMWCRandom rand (12);
         int i;
         for (i = 0; i < 100; i++) {
             path->quadTo(SkScalarMul(rand.nextUScalar1(), SkIntToScalar(640)),
@@ -208,7 +208,7 @@ public:
         name->append("long_line");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
-        SkRandom rand;
+        SkMWCRandom rand;
         path->moveTo(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480);
         for (size_t i = 1; i < 100; i++) {
             path->lineTo(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480);
@@ -316,7 +316,7 @@ private:
     int                         fCurrPath;
     int                         fCurrVerb;
     int                         fCurrPoint;
-    SkRandom                    fRandom;
+    SkMWCRandom                 fRandom;
     typedef SkBenchmark INHERITED;
 };
 
@@ -653,7 +653,7 @@ protected:
             paint.setStyle(SkPaint::kStroke_Style);
         }
 
-        SkRandom rand;
+        SkMWCRandom rand;
 
         SkRect r;
 
@@ -754,7 +754,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkRandom rand;
+        SkMWCRandom rand;
         SkRect r;
 
         for (int i = 0; i < 5000; ++i) {
@@ -834,7 +834,7 @@ private:
     virtual void onPreDraw() SK_OVERRIDE {
         fQueryRects.setCount(kQueryRectCnt);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < kQueryRectCnt; ++i) {
             SkSize size;
             SkPoint xy;
@@ -931,7 +931,7 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void rand_conic(SkConic* conic, SkRandom& rand) {
+static void rand_conic(SkConic* conic, SkMWCRandom& rand) {
     for (int i = 0; i < 3; ++i) {
         conic->fPts[i].set(rand.nextUScalar1() * 100, rand.nextUScalar1() * 100);
     }
@@ -945,7 +945,7 @@ static void rand_conic(SkConic* conic, SkRandom& rand) {
 class ConicBench : public SkBenchmark {
 public:
     ConicBench(void* param) : INHERITED(param) {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < CONICS; ++i) {
             rand_conic(&fConics[i], rand);
         }
diff --git a/bench/PathIterBench.cpp b/bench/PathIterBench.cpp
index 987a752ad9..e560ff76ef 100644
--- a/bench/PathIterBench.cpp
+++ b/bench/PathIterBench.cpp
@@ -14,7 +14,7 @@
 #include "SkShader.h"
 #include "SkString.h"
 
-static int rand_pts(SkRandom& rand, SkPoint pts[4]) {
+static int rand_pts(SkMWCRandom& rand, SkPoint pts[4]) {
     int n = rand.nextU() & 3;
     n += 1;
 
@@ -37,7 +37,7 @@ public:
         fName.printf("pathiter_%s", raw ? "raw" : "consume");
         fRaw = raw;
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < 1000; ++i) {
             SkPoint pts[4];
             int n = rand_pts(rand, pts);
diff --git a/bench/PictureRecordBench.cpp b/bench/PictureRecordBench.cpp
index f23f0cb961..1ba3cb3166 100644
--- a/bench/PictureRecordBench.cpp
+++ b/bench/PictureRecordBench.cpp
@@ -143,7 +143,7 @@ public:
 protected:
     virtual float innerLoopScale() const SK_OVERRIDE { return 0.1f; }
     virtual void recordCanvas(SkCanvas* canvas) {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < M; i++) {
             SkPaint paint;
             paint.setColor(rand.nextU());
@@ -167,7 +167,7 @@ class RecurringPaintDictionaryRecordBench : public PictureRecordBench {
 public:
     RecurringPaintDictionaryRecordBench(void* param)
         : INHERITED(param, "recurring_paint_dictionary") {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < ObjCount; i++) {
             fPaint[i].setColor(rand.nextU());
         }
diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp
index 99ff0a94f1..e3d0e24265 100644
--- a/bench/RectBench.cpp
+++ b/bench/RectBench.cpp
@@ -27,7 +27,7 @@ public:
         : INHERITED(param)
         , fShift(shift)
         , fStroke(stroke) {
-        SkRandom rand;
+        SkMWCRandom rand;
         const SkScalar offset = SK_Scalar1/3;
         for (int i = 0; i < N; i++) {
             int x = rand.nextU() % W;
@@ -246,7 +246,7 @@ protected:
             gSizes[0] = this->getStrokeWidth();
             sizes = 1;
         }
-        SkRandom rand;
+        SkMWCRandom rand;
         SkColor color = 0xFF000000;
         U8CPU alpha = 0xFF;
         SkPaint paint;
diff --git a/bench/RegionBench.cpp b/bench/RegionBench.cpp
index 7a306e97c3..4c2ea6e124 100644
--- a/bench/RegionBench.cpp
+++ b/bench/RegionBench.cpp
@@ -82,7 +82,7 @@ public:
         N = SkBENCHLOOP(2000)
     };
 
-    SkIRect randrect(SkRandom& rand) {
+    SkIRect randrect(SkMWCRandom& rand) {
         int x = rand.nextU() % W;
         int y = rand.nextU() % H;
         int w = rand.nextU() % W;
@@ -95,7 +95,7 @@ public:
         fName.printf("region_%s_%d", name, count);
         fLoopMul = mul;
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < count; i++) {
             fA.op(randrect(rand), SkRegion::kXOR_Op);
             fB.op(randrect(rand), SkRegion::kXOR_Op);
diff --git a/bench/RegionContainBench.cpp b/bench/RegionContainBench.cpp
index 8668513979..40375da847 100644
--- a/bench/RegionContainBench.cpp
+++ b/bench/RegionContainBench.cpp
@@ -29,7 +29,7 @@ public:
         N = SkBENCHLOOP(20000)
     };
 
-    SkIRect randrect(SkRandom& rand, int i) {
+    SkIRect randrect(SkMWCRandom& rand, int i) {
         int w = rand.nextU() % W;
         return SkIRect::MakeXYWH(0, i*H/COUNT, w, H/COUNT);
     }
@@ -38,7 +38,7 @@ public:
         fProc = proc;
         fName.printf("region_contains_%s", name);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < COUNT; i++) {
             fA.op(randrect(rand, i), SkRegion::kXOR_Op);
         }
diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp
index 333dd229e1..405d51e953 100644
--- a/bench/ScalarBench.cpp
+++ b/bench/ScalarBench.cpp
@@ -56,7 +56,7 @@ int gScalarBench_NonStaticGlobal;
 // handling NaN values is a lot slower. Anyway, this guy is just meant to put
 // reasonable values in our arrays.
 template <typename T> void init9(T array[9]) {
-    SkRandom rand;
+    SkMWCRandom rand;
     for (int i = 0; i < 9; i++) {
         array[i] = rand.nextSScalar1();
     }
@@ -102,7 +102,7 @@ private:
 class IsFiniteScalarBench : public ScalarBench {
 public:
     IsFiniteScalarBench(void* param) : INHERITED(param, "isfinite") {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (size_t i = 0; i < ARRAY_N; ++i) {
             fArray[i] = rand.nextSScalar1();
         }
@@ -141,7 +141,7 @@ class RectBoundsBench : public SkBenchmark {
 
 public:
     RectBoundsBench(void* param) : INHERITED(param) {
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < PTS; ++i) {
             fPts[i].fX = rand.nextSScalar1();
             fPts[i].fY = rand.nextSScalar1();
diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp
index 0e8e4bbee9..d2f4e26c02 100644
--- a/bench/ShaderMaskBench.cpp
+++ b/bench/ShaderMaskBench.cpp
@@ -59,7 +59,7 @@ protected:
 
     virtual void onDraw(SkCanvas* canvas) {
         const SkIPoint dim = this->getSize();
-        SkRandom rand;
+        SkMWCRandom rand;
 
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
diff --git a/bench/SortBench.cpp b/bench/SortBench.cpp
index c19ebae0c8..3e4637780d 100644
--- a/bench/SortBench.cpp
+++ b/bench/SortBench.cpp
@@ -13,14 +13,14 @@
 static const int N = 1000;
 
 static void rand_proc(int array[], int count) {
-    SkRandom rand;
+    SkMWCRandom rand;
     for (int i = 0; i < count; ++i) {
         array[i] = rand.nextS();
     }
 }
 
 static void randN_proc(int array[], int count) {
-    SkRandom rand;
+    SkMWCRandom rand;
     int mod = N / 10;
     for (int i = 0; i < count; ++i) {
         array[i] = rand.nextU() % mod;
diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp
index 9334c33476..4f78e18a3d 100644
--- a/bench/TextBench.cpp
+++ b/bench/TextBench.cpp
@@ -94,7 +94,7 @@ protected:
 
     virtual void onDraw(SkCanvas* canvas) {
         const SkIPoint dim = this->getSize();
-        SkRandom rand;
+        SkMWCRandom rand;
 
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
diff --git a/bench/VertBench.cpp b/bench/VertBench.cpp
index 5456e28825..564a3064c7 100644
--- a/bench/VertBench.cpp
+++ b/bench/VertBench.cpp
@@ -68,7 +68,7 @@ public:
         SkASSERT(PTS == pts - fPts);
         SkASSERT(IDX == idx - fIdx);
 
-        SkRandom rand;
+        SkMWCRandom rand;
         for (int i = 0; i < PTS; ++i) {
             fColors[i] = rand.nextU() | (0xFF << 24);
         }