Change random number generator for tests to SkMWCRandom

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
@@ skipping 55 matching lines @@
                                  int count, DrawBitmapProc proc) {
     SkPicture* pic = new SkPicture;
     SkCanvas* canvas = pic->beginRecording(1000, 1000);
     for (int i = 0; i < count; ++i) {
         proc(canvas, bm[i], pos[i]);
     }
     pic->endRecording();
     return pic;
 }
 
-static void rand_rect(SkRect* rect, SkRandom& rand, SkScalar W, SkScalar H) {
+static void rand_rect(SkRect* rect, SkMWCRandom& rand, SkScalar W, SkScalar H) {
     rect->fLeft   = rand.nextRangeScalar(-W, 2*W);
     rect->fTop    = rand.nextRangeScalar(-H, 2*H);
     rect->fRight  = rect->fLeft + rand.nextRangeScalar(0, W);
     rect->fBottom = rect->fTop + rand.nextRangeScalar(0, H);
 
     // we integralize rect to make our tests more predictable, since Gather is
     // a little sloppy.
     SkIRect ir;
     rect->round(&ir);
     rect->set(ir);
@@ skipping 82 matching lines @@
     // corresponding bitmap/pixelref
     for (int i = 0; i < N; ++i) {
         make_bm(&bm[i], IW, IH, SkColorSetARGB(0xFF, i, i, i), true);
         refs[i] = bm[i].pixelRef();
     }
 
     static const DrawBitmapProc procs[] = {
         drawbitmap_proc, drawbitmaprect_proc, drawshader_proc
     };
 
-    SkRandom rand;
+    SkMWCRandom rand;
     for (size_t k = 0; k < SK_ARRAY_COUNT(procs); ++k) {
         SkAutoTUnref<SkPicture> pic(record_bitmaps(bm, pos, N, procs[k]));
 
         // quick check for a small piece of each quadrant, which should just
         // contain 1 bitmap.
         for (size_t  i = 0; i < SK_ARRAY_COUNT(pos); ++i) {
             SkRect r;
             r.set(2, 2, W - 2, H - 2);
             r.offset(pos[i].fX, pos[i].fY);
             SkAutoDataUnref data(SkPictureUtils::GatherPixelRefs(pic, r));
@@ skipping 62 matching lines @@
 // Ensure that serializing an empty picture does not assert. Likewise only runs in debug mode.
 static void test_serializing_empty_picture() {
     SkPicture picture;
     picture.beginRecording(0, 0);
     picture.endRecording();
     SkDynamicMemoryWStream stream;
     picture.serialize(&stream);
 }
 #endif
 
-static void rand_op(SkCanvas* canvas, SkRandom& rand) {
+static void rand_op(SkCanvas* canvas, SkMWCRandom& rand) {
     SkPaint paint;
     SkRect rect = SkRect::MakeWH(50, 50);
 
     SkScalar unit = rand.nextUScalar1();
     if (unit <= 0.3) {
 //        SkDebugf("save\n");
         canvas->save();
     } else if (unit <= 0.6) {
 //        SkDebugf("restore\n");
         canvas->restore();
     } else if (unit <= 0.9) {
 //        SkDebugf("clip\n");
         canvas->clipRect(rect);
     } else {
 //        SkDebugf("draw\n");
         canvas->drawPaint(paint);
     }
 }
 
 static void test_peephole() {
-    SkRandom rand;
+    SkMWCRandom rand;
 
     for (int j = 0; j < 100; j++) {
-        SkRandom rand2(rand.getSeed()); // remember the seed
+        SkMWCRandom rand2(rand); // remember the seed
 
         SkPicture picture;
         SkCanvas* canvas = picture.beginRecording(100, 100);
 
         for (int i = 0; i < 1000; ++i) {
             rand_op(canvas, rand);
         }
         picture.endRecording();
+
+        rand = rand2;
     }
 
     {
         SkPicture picture;
         SkCanvas* canvas = picture.beginRecording(100, 100);
         SkRect rect = SkRect::MakeWH(50, 50);
 
         for (int i = 0; i < 100; ++i) {
             canvas->save();
         }
@@ skipping 120 matching lines @@
     test_bad_bitmap();
 #endif
     test_peephole();
     test_gatherpixelrefs(reporter);
     test_bitmap_with_encoded_data(reporter);
     test_clone_empty(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Pictures", PictureTestClass, TestPicture)