Change old PRG to be SkLCGRandom; change new one to SkRandom

The goal here is to get people to start using the new random number
generator, while leaving the old one in place so we don't have to 
rebaseline GMs.

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

Author: jvanverth@google.com

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

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

19 files changed, 33 insertions, 33 deletions

diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp
index f1f1195bad..f5a6c21c98 100644
--- a/gm/arcofzorro.cpp
+++ b/gm/arcofzorro.cpp
@@ -29,7 +29,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkMWCRandom rand;
+        SkRandom rand;
 
         SkRect rect = SkRect::MakeXYWH(10, 10, 200, 200);
 
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 2a63d73816..c33674caad 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -74,7 +74,7 @@ protected:
         };
 
         static const int kNumCubics = 15;
-        SkMWCRandom rand;
+        SkRandom rand;
 
         // Mult by 3 for each edge effect type
         int numCols = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(kNumCubics*3)));
@@ -226,7 +226,7 @@ protected:
         };
 
         static const int kNumConics = 10;
-        SkMWCRandom rand;
+        SkRandom rand;
 
         // Mult by 3 for each edge effect type
         int numCols = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(kNumConics*3)));
@@ -411,7 +411,7 @@ protected:
         };
 
         static const int kNumQuads = 5;
-        SkMWCRandom rand;
+        SkRandom rand;
 
         int numCols = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(kNumQuads*3)));
         int numRows = SkScalarCeilToInt(SkIntToScalar(kNumQuads*3) / numCols);
diff --git a/gm/circles.cpp b/gm/circles.cpp
index f57463954c..3cd07f29a1 100644
--- a/gm/circles.cpp
+++ b/gm/circles.cpp
@@ -152,9 +152,8 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkRandom rand;
+        SkLCGRandom rand;
         canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
-
         int i;
         for (i = 0; i < fPaints.count(); ++i) {
             canvas->save();
@@ -206,3 +205,4 @@ static GM* MyFactory(void*) { return new CircleGM; }
 static GMRegistry reg(MyFactory);
 
 }
+
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index ce1f0e0746..f936ab1c0a 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -70,7 +70,7 @@ public:
             SkRegion::kReplace_Op,
         };
 
-        SkRandom r;
+        SkLCGRandom r;
         for (int i = 0; i < kRows; ++i) {
             for (int j = 0; j < kCols; ++j) {
                 for (int k = 0; k < 5; ++k) {
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index 668e01c0a7..b1b2696bf8 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -261,7 +261,7 @@ protected:
 
     SkPaint paint;
     paint.setAntiAlias(true);
-    SkRandom rand;
+    SkLCGRandom rand;
     canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
 
     // As we've added more paths this has gotten pretty big. Scale the whole thing down.
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp
index 15f611a9ee..f95f700660 100644
--- a/gm/cubicpaths.cpp
+++ b/gm/cubicpaths.cpp
@@ -131,7 +131,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         canvas->save();
         canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
@@ -275,7 +275,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         canvas->save();
         canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index 2e19d05f7d..3f99c6852d 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -297,7 +297,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(220*SK_Scalar1, 50*SK_Scalar1);
         canvas->save();
         canvas->translate(2*SK_Scalar1, 30 * SK_Scalar1); // The title
diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp
index df314a356d..7b3a7e606a 100644
--- a/gm/emptypath.cpp
+++ b/gm/emptypath.cpp
@@ -72,7 +72,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         int i = 0;
         canvas->save();
diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index 39a3fc160f..0f2eb7983e 100644
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -51,7 +51,7 @@ protected:
         SkAutoTArray<SkScalar> widths(len);
         paint.getTextWidths(text, len, &widths[0]);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkScalar x = SkIntToScalar(20);
         SkScalar y = SkIntToScalar(100);
         for (size_t i = 0; i < len; ++i) {
diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp
index 03275719fb..6ffc1f9f86 100644
--- a/gm/hittestpath.cpp
+++ b/gm/hittestpath.cpp
@@ -42,7 +42,7 @@ protected:
 
     virtual void onDraw(SkCanvas* canvas) {
         SkPath path;
-        SkRandom rand;
+        SkLCGRandom rand;
 
         int scale = 300;
         for (int i = 0; i < 4; ++i) {
diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp
index fbf3faf947..69c47fe80c 100644
--- a/gm/linepaths.cpp
+++ b/gm/linepaths.cpp
@@ -90,7 +90,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         canvas->save();
         canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
@@ -232,7 +232,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         canvas->save();
         canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
diff --git a/gm/mixedxfermodes.cpp b/gm/mixedxfermodes.cpp
index 645143a453..e3ce91a9dc 100644
--- a/gm/mixedxfermodes.cpp
+++ b/gm/mixedxfermodes.cpp
@@ -32,7 +32,7 @@ protected:
 
     void drawShape(SkCanvas* canvas,
                    const SkPaint& paint,
-                   SkMWCRandom* random) {
+                   SkRandom* random) {
         static const SkRect kRect = SkRect::MakeXYWH(SkIntToScalar(-50), SkIntToScalar(-50),
                                                      SkIntToScalar(75), SkIntToScalar(105));
         int shape = random->nextULessThan(5);
@@ -102,7 +102,7 @@ protected:
         canvas->drawPaint(bgPaint);
         SkISize size = canvas->getDeviceSize();
         SkScalar maxScale = SkScalarSqrt((SkIntToScalar(size.fWidth * size.fHeight))) / 300;
-        SkMWCRandom random;
+        SkRandom random;
         for (int i = 0; i < kNumShapes; ++i) {
             SkScalar s = random.nextRangeScalar(SK_Scalar1 / 8, SK_Scalar1) * maxScale;
             SkScalar r = random.nextRangeScalar(0, SkIntToScalar(360));
diff --git a/gm/nested.cpp b/gm/nested.cpp
index d5b61a490f..b3d75cfa39 100644
--- a/gm/nested.cpp
+++ b/gm/nested.cpp
@@ -73,7 +73,7 @@ protected:
         };
 
         // draw a background pattern to make transparency errors more apparent
-        SkMWCRandom rand;
+        SkRandom rand;
 
         for (int y = 0; y < kImageHeight; y += 10) {
             for (int x = 0; x < kImageWidth; x += 10) {
diff --git a/gm/ovals.cpp b/gm/ovals.cpp
index ae727b9ef3..96e04885e3 100755
--- a/gm/ovals.cpp
+++ b/gm/ovals.cpp
@@ -125,7 +125,7 @@ protected:
         }
     }
 
-    SkColor genColor(SkMWCRandom* rand) {
+    SkColor genColor(SkRandom* rand) {
         SkScalar hsv[3];
         hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f));
         hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
@@ -135,7 +135,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkMWCRandom rand(1);
+        SkRandom rand(1);
         canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
         SkRect oval = SkRect::MakeLTRB(-20, -30, 20, 30);
 
diff --git a/gm/points.cpp b/gm/points.cpp
index 0a83acf05f..4902c889cc 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -23,7 +23,7 @@ protected:
         return make_isize(640, 490);
     }
 
-    static void fill_pts(SkPoint pts[], size_t n, SkRandom* rand) {
+    static void fill_pts(SkPoint pts[], size_t n, SkLCGRandom* rand) {
         for (size_t i = 0; i < n; i++) {
             // Compute these independently and store in variables, rather
             // than in the parameter-passing expression, to get consistent
@@ -37,7 +37,7 @@ protected:
     virtual void onDraw(SkCanvas* canvas) {
         canvas->translate(SK_Scalar1, SK_Scalar1);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkPaint  p0, p1, p2, p3;
         const size_t n = 99;
 
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp
index ac91c62df3..7351e45fcf 100644
--- a/gm/quadpaths.cpp
+++ b/gm/quadpaths.cpp
@@ -91,7 +91,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         canvas->save();
         canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
@@ -234,7 +234,7 @@ protected:
                             20 * SK_Scalar1,
                             titlePaint);
 
-        SkRandom rand;
+        SkLCGRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
         canvas->save();
         canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp
index c309b2a931..3f1c49ebdd 100644
--- a/gm/roundrects.cpp
+++ b/gm/roundrects.cpp
@@ -126,7 +126,7 @@ protected:
         }
     }
 
-    SkColor genColor(SkMWCRandom* rand) {
+    SkColor genColor(SkRandom* rand) {
         SkScalar hsv[3];
         hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f));
         hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
@@ -136,7 +136,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkMWCRandom rand(1);
+        SkRandom rand(1);
         canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
         SkRect rect = SkRect::MakeLTRB(-20, -30, 20, 30);
         SkRRect circleRect;
diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp
index 61ee9e0309..88641da695 100644
--- a/gm/strokerects.cpp
+++ b/gm/strokerects.cpp
@@ -33,7 +33,7 @@ protected:
         return make_isize(W*2, H*2);
     }
 
-    static void rnd_rect(SkRect* r, SkRandom& rand) {
+    static void rnd_rect(SkRect* r, SkLCGRandom& rand) {
         SkScalar x = rand.nextUScalar1() * W;
         SkScalar y = rand.nextUScalar1() * H;
         SkScalar w = rand.nextUScalar1() * (W >> 2);
@@ -61,7 +61,7 @@ protected:
                         , SW - SkIntToScalar(2), SH - SkIntToScalar(2)
                 ));
 
-                SkRandom rand;
+                SkLCGRandom rand;
                 for (int i = 0; i < N; i++) {
                     SkRect r;
                     rnd_rect(&r, rand);
diff --git a/gm/strokes.cpp b/gm/strokes.cpp
index 49a7fc63b4..861fd76352 100644
--- a/gm/strokes.cpp
+++ b/gm/strokes.cpp
@@ -18,7 +18,7 @@
 static const SkScalar SW = SkIntToScalar(W);
 static const SkScalar SH = SkIntToScalar(H);
 
-static void rnd_rect(SkRect* r, SkPaint* paint, SkRandom& rand) {
+static void rnd_rect(SkRect* r, SkPaint* paint, SkLCGRandom& rand) {
     SkScalar x = rand.nextUScalar1() * W;
     SkScalar y = rand.nextUScalar1() * H;
     SkScalar w = rand.nextUScalar1() * (W >> 2);
@@ -61,7 +61,7 @@ protected:
                                               , SW - SkIntToScalar(2), SH - SkIntToScalar(2)
                                               ));
 
-            SkRandom rand;
+            SkLCGRandom rand;
             for (int i = 0; i < N; i++) {
                 SkRect r;
                 rnd_rect(&r, &paint, rand);
@@ -81,7 +81,7 @@ class Strokes2GM : public skiagm::GM {
     SkPath fPath;
 public:
     Strokes2GM() {
-        SkRandom rand;
+        SkLCGRandom rand;
         fPath.moveTo(0, 0);
         for (int i = 0; i < 13; i++) {
             SkScalar x = rand.nextUScalar1() * (W >> 1);
@@ -121,7 +121,7 @@ protected:
                                               SW - SkIntToScalar(2),
                                               SH - SkIntToScalar(2)));
 
-            SkRandom rand;
+            SkLCGRandom rand;
             for (int i = 0; i < N/2; i++) {
                 SkRect r;
                 rnd_rect(&r, &paint, rand);