Add cairoRandomizeColor and skiaRandomizeColor

27 files changed, 76 insertions, 112 deletions

diff --git a/src/cairo-shapes.cpp b/src/cairo-shapes.cpp
index 8a0a45d..a5dd56a 100644
--- a/src/cairo-shapes.cpp
+++ b/src/cairo-shapes.cpp
@@ -1,7 +1,25 @@
 #include <config.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <cairo.h>
+#include <math.h>
+
 #include "cairo-shapes.h"
 
+void
+cairoRandomizeColor(caskbench_context_t *ctx)
+{
+    double red, green, blue, alpha;
+
+    red = (double)rand()/RAND_MAX;
+    green = (double)rand()/RAND_MAX;
+    blue = (double)rand()/RAND_MAX;
+    alpha = (double)rand()/RAND_MAX;
+
+    cairo_set_source_rgba (ctx->cairo_cr, red, green, blue, alpha);
+}
+
 void cairoDrawCircle(caskbench_context_t *ctx, shapes_t *args)
 {
     cairo_arc (ctx->cairo_cr, args->centre_x, args->centre_y, args->radius, 0, 2*M_PI);
diff --git a/src/cairo-shapes.h b/src/cairo-shapes.h
index 5eeeec0..d6c9a74 100644
--- a/src/cairo-shapes.h
+++ b/src/cairo-shapes.h
@@ -1,14 +1,12 @@
 #ifndef __CAIRO_SHAPES_H_
 #define __CAIRO_SHAPES_H_
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cairo.h>
-#include <math.h>
-
+#include "forward.h"
 #include "shapes.h"
 #include "caskbench.h"
 
+void cairoRandomizeColor(caskbench_context_t *cr);
+
 void cairoDrawCircle(caskbench_context_t *ctx, shapes_t *args);
 
 void cairoDrawRectangle(caskbench_context_t *ctx, shapes_t *args);
diff --git a/src/cairo-tests/bubbles.cpp b/src/cairo-tests/bubbles.cpp
index c3aca0f..001451f 100644
--- a/src/cairo-tests/bubbles.cpp
+++ b/src/cairo-tests/bubbles.cpp
@@ -5,6 +5,7 @@
 #include <cairo.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 static int max_dim;
 
@@ -27,7 +28,7 @@ ca_test_bubbles(caskbench_context_t *ctx)
     cairo_t *cr = ctx->cairo_cr;
 
     for (i=0; i<ctx->size; i++) {
-        randomize_color (cr);
+        cairoRandomizeColor(ctx);
 
         r = ((double)max_dim*rand())/RAND_MAX + 1;
         x = (0.5*(double)ctx->canvas_width*rand())/RAND_MAX;
diff --git a/src/cairo-tests/clip.cpp b/src/cairo-tests/clip.cpp
index 72c5d65..10657d9 100644
--- a/src/cairo-tests/clip.cpp
+++ b/src/cairo-tests/clip.cpp
@@ -116,7 +116,7 @@ void drawClip(caskbench_context_t *ctx,kinetics_t *particles)
         y = particles?particles->y : j * element_spacing;
         for (i=0; i<num_x_elements; i++) {
             x = particles?particles->x : i * element_spacing;
-            randomize_color(cr);
+            cairoRandomizeColor(ctx);
             drawShape(ctx,x,y,30,true);
             cairo_clip (cr);
             drawShape(ctx,x,y,false);
diff --git a/src/cairo-tests/fill.cpp b/src/cairo-tests/fill.cpp
index a5f0256..4d2138d 100644
--- a/src/cairo-tests/fill.cpp
+++ b/src/cairo-tests/fill.cpp
@@ -91,7 +91,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                     cairo_set_source_rgba(cr, (double)ctx->shape_args.red, (double)ctx->shape_args.green ? (double)ctx->shape_args.green:(double)0, ctx->shape_args.blue ? (double)ctx->shape_args.blue:(double)0, (double)ctx->shape_args.alpha ? (double)ctx->shape_args.alpha:(double)1);
                 }
                 else
-                    randomize_color (cr);
+                    cairoRandomizeColor(ctx);
             }
             else if((strcmp(ctx->shape_args.fill_type,"solid")) == 0)
             {
@@ -100,7 +100,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                     cairo_set_source_rgba(cr,  (double)ctx->shape_args.red, (double)ctx->shape_args.green ? (double)ctx->shape_args.green:(double)0, ctx->shape_args.blue ? (double)ctx->shape_args.blue:(double)0, (double)ctx->shape_args.alpha ? (double)ctx->shape_args.alpha:(double)1);
                 }
                 else
-                    randomize_color (cr);
+                    cairoRandomizeColor(ctx);
             }
             else if (((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
             {
@@ -287,7 +287,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                     cairo_set_source_rgba(cr,  (double)ctx->shape_args.red, (double)ctx->shape_args.green ? (double)ctx->shape_args.green:(double)0, ctx->shape_args.blue ? (double)ctx->shape_args.blue:(double)0, (double)ctx->shape_args.alpha ? (double)ctx->shape_args.alpha:(double)1);
                 }
                 else
-                    randomize_color (cr);
+                    cairoRandomizeColor(ctx);
 
                 cairo_stroke(cr);
             }
diff --git a/src/cairo-tests/mask.cpp b/src/cairo-tests/mask.cpp
index f37ec2d..fcb6620 100644
--- a/src/cairo-tests/mask.cpp
+++ b/src/cairo-tests/mask.cpp
@@ -5,6 +5,7 @@
 #include <cairo.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 static cairo_pattern_t *mask;
 
@@ -42,12 +43,7 @@ ca_test_mask(caskbench_context_t *ctx)
 
     for (i=0; i<ctx->size; i++) {
         // Apply mask on a circle
-        double red, green, blue, alpha;
-        red = (double)rand()/RAND_MAX;
-        green = (double)rand()/RAND_MAX;
-        blue = (double)rand()/RAND_MAX;
-        alpha = (double)rand()/RAND_MAX;
-        cairo_set_source_rgba (cr, red, green, blue, alpha);
+        cairoRandomizeColor(ctx);
 
         cairo_arc (cr, 40*i, 40, 30, 0, 2*M_PI);
         cairo_save (cr);
diff --git a/src/cairo-tests/multishape.cpp b/src/cairo-tests/multishape.cpp
index 4422c7f..590edf2 100644
--- a/src/cairo-tests/multishape.cpp
+++ b/src/cairo-tests/multishape.cpp
@@ -6,6 +6,7 @@
 #include <math.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 static int element_spacing;
 static int num_x_elements;
@@ -55,7 +56,7 @@ ca_test_multishape(caskbench_context_t *ctx)
         for (i=0; i<num_x_elements; i++) {
             x = i * element_spacing;
 
-            randomize_color (cr);
+            cairoRandomizeColor(ctx);
 
             shape = (4.0 * rand())/RAND_MAX;
             switch (shape) {
diff --git a/src/cairo-tests/paint.cpp b/src/cairo-tests/paint.cpp
index 0281610..4b88f45 100644
--- a/src/cairo-tests/paint.cpp
+++ b/src/cairo-tests/paint.cpp
@@ -5,6 +5,7 @@
 #include <cairo.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 int
 ca_setup_paint(caskbench_context_t *ctx)
@@ -21,11 +22,10 @@ int
 ca_test_paint(caskbench_context_t *ctx)
 {
     int i;
-    cairo_t *cr = ctx->cairo_cr;
 
     for (i=0; i<ctx->size; i++) {
-        randomize_color (cr);
-        cairo_paint (cr);
+        cairoRandomizeColor(ctx);
+        cairo_paint(ctx->cairo_cr);
     }
     return 1;
 }
diff --git a/src/cairo-tests/rectangles.cpp b/src/cairo-tests/rectangles.cpp
index 40d48c8..4d86105 100644
--- a/src/cairo-tests/rectangles.cpp
+++ b/src/cairo-tests/rectangles.cpp
@@ -6,6 +6,7 @@
 #include <cairo.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 int
 ca_setup_rectangles(caskbench_context_t *ctx)
@@ -30,7 +31,7 @@ ca_test_rectangles(caskbench_context_t *ctx)
     cairo_t *cr = ctx->cairo_cr;
 
     for (i=0; i<ctx->size; i++) {
-        randomize_color (cr);
+        cairoRandomizeColor(ctx);
 
         w = trunc( (0.5*(double)ctx->canvas_width*rand())/RAND_MAX ) + 1;
         h = trunc( (0.5*(double)ctx->canvas_height*rand())/RAND_MAX ) + 1;
diff --git a/src/cairo-tests/roundrect.cpp b/src/cairo-tests/roundrect.cpp
index 2bc1574..7826ead 100644
--- a/src/cairo-tests/roundrect.cpp
+++ b/src/cairo-tests/roundrect.cpp
@@ -6,6 +6,7 @@
 #include <cairo.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 int
 ca_setup_roundrect(caskbench_context_t *ctx)
@@ -41,7 +42,7 @@ ca_test_roundrect(caskbench_context_t *ctx)
     cairo_t *cr = ctx->cairo_cr;
 
     for (i=0; i<ctx->size; i++) {
-        randomize_color (cr);
+        cairoRandomizeColor(ctx);
 
         x = 10 + trunc( (((double)ctx->canvas_width-20.0)*rand())/RAND_MAX );
         y = 10 + trunc( (((double)ctx->canvas_height-20.0)*rand())/RAND_MAX );
diff --git a/src/cairo-tests/stroke.cpp b/src/cairo-tests/stroke.cpp
index e80d529..9ecda3b 100644
--- a/src/cairo-tests/stroke.cpp
+++ b/src/cairo-tests/stroke.cpp
@@ -124,10 +124,9 @@ void drawStroke(caskbench_context_t *ctx,kinetics_t *particles)
         for (i=0; i<num_x_elements; i++) {
             x = particles?particles->x : i * element_spacing;
             cairo_set_line_cap(cr,(cairo_line_cap_t)(i % 3));
-            randomize_color(cr);
+            cairoRandomizeColor(ctx);
             drawShape(ctx,x,y);
             cairo_stroke (cr);
-
         }
     }
 }
diff --git a/src/cairo-tests/text.cpp b/src/cairo-tests/text.cpp
index 7c1472d..51a6468 100644
--- a/src/cairo-tests/text.cpp
+++ b/src/cairo-tests/text.cpp
@@ -6,6 +6,7 @@
 #include <cairo.h>
 
 #include "caskbench.h"
+#include "cairo-shapes.h"
 
 static int max_dim;
 static char rand_text_array[19][100];
@@ -54,7 +55,7 @@ ca_test_text(caskbench_context_t *ctx)
         for(font_size = 18; font_size <= 36; font_size++)
         {
             cairo_set_font_size (cr, font_size);
-            randomize_color (cr);
+            cairoRandomizeColor(ctx);
 
             cairo_status_t status;
             cairo_scaled_font_t *font;
@@ -86,8 +87,7 @@ ca_test_text(caskbench_context_t *ctx)
         for(font_size = 36; font_size >= 18; font_size--)
         {
             cairo_set_font_size (cr, font_size);
-
-            randomize_color (cr);
+            cairoRandomizeColor(ctx);
 
             cairo_status_t status;
             cairo_scaled_font_t *font;
diff --git a/src/caskbench.cpp b/src/caskbench.cpp
index 17e27d1..4b48246 100644
--- a/src/caskbench.cpp
+++ b/src/caskbench.cpp
@@ -369,19 +369,6 @@ get_tick (void)
 }
 
 void
-randomize_color(cairo_t *cr)
-{
-    double red, green, blue, alpha;
-
-    red = (double)rand()/RAND_MAX;
-    green = (double)rand()/RAND_MAX;
-    blue = (double)rand()/RAND_MAX;
-    alpha = (double)rand()/RAND_MAX;
-
-    cairo_set_source_rgba (cr, red, green, blue, alpha);
-}
-
-void
 context_init(caskbench_context_t *context, int size)
 {
     assert(context);
diff --git a/src/caskbench.h b/src/caskbench.h
index a571f10..10bcf0e 100644
--- a/src/caskbench.h
+++ b/src/caskbench.h
@@ -47,7 +47,4 @@ typedef struct _caskbench_context {
 double get_tick (void);
 void   display_results_json(int iterations, int status);
 
-// Cairo helpers
-void   randomize_color(cairo_t *cr);
-
 #endif // __CASKBENCH_H__
diff --git a/src/skia-shapes.cpp b/src/skia-shapes.cpp
index 74ddad3..28b784b 100644
--- a/src/skia-shapes.cpp
+++ b/src/skia-shapes.cpp
@@ -4,6 +4,17 @@
 
 #include "skia-shapes.h"
 
+void
+skiaRandomizeColor(caskbench_context_t *ctx)
+{
+    unsigned int red, blue, green, alpha;
+    red = int( 255 * (double)rand()/RAND_MAX );
+    green = int( 255 * (double)rand()/RAND_MAX );
+    blue = int( 255 * (double)rand()/RAND_MAX );
+    alpha = int( 255 * (double)rand()/RAND_MAX );
+    ctx->skia_paint->setARGB(alpha,red, green, blue );
+}
+
 void skiaDrawCircle(caskbench_context_t *ctx, shapes_t *args)
 {
     ctx->skia_canvas->drawCircle(args->centre_x, args->centre_y, args->radius,
diff --git a/src/skia-shapes.h b/src/skia-shapes.h
index f8651df..b45c3cf 100644
--- a/src/skia-shapes.h
+++ b/src/skia-shapes.h
@@ -7,6 +7,8 @@
 #include "shapes.h"
 #include "caskbench.h"
 
+void skiaRandomizeColor(caskbench_context_t *ctx);
+
 void skiaDrawCircle(caskbench_context_t *ctx, shapes_t *args);
 
 void skiaDrawRectangle(caskbench_context_t *ctx, shapes_t *args);
diff --git a/src/skia-tests/bubbles.cpp b/src/skia-tests/bubbles.cpp
index c12c97c..a05953b 100644
--- a/src/skia-tests/bubbles.cpp
+++ b/src/skia-tests/bubbles.cpp
@@ -5,6 +5,7 @@
 #include <SkPaint.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 static int max_dim;
 
@@ -26,11 +27,7 @@ sk_test_bubbles(caskbench_context_t *ctx)
     unsigned char red, green, blue, alpha;
     int i, x, y, r;
     for (i=0; i<ctx->size; i++) {
-        red = int( 255 * (double)rand()/RAND_MAX );
-        green = int( 255 * (double)rand()/RAND_MAX );
-        blue = int( 255 * (double)rand()/RAND_MAX );
-        alpha = int( 255 * (double)rand()/RAND_MAX );
-        ctx->skia_paint->setARGB(alpha, red, green, blue);
+        skiaRandomizeColor(ctx);
 
         r = ((double)max_dim*rand())/RAND_MAX + 1;
         x = (0.5*(double)ctx->canvas_width*rand())/RAND_MAX;
diff --git a/src/skia-tests/clip.cpp b/src/skia-tests/clip.cpp
index 0b0b93a..8a85519 100644
--- a/src/skia-tests/clip.cpp
+++ b/src/skia-tests/clip.cpp
@@ -213,11 +213,7 @@ draw_clip_tests (caskbench_context_t *ctx,SkCanvas* canvas,kinetics_t* particles
         y = particles?particles->y : j * element_spacing;
         for (i=0; i<num_x_elements; i++) {
             x = particles?particles->x : i * element_spacing;
-            red = int( 255 * (double)rand()/RAND_MAX );
-            green = int( 255 * (double)rand()/RAND_MAX );
-            blue = int( 255 * (double)rand()/RAND_MAX );
-            alpha = int( 255 * (double)rand()/RAND_MAX );
-            ctx->skia_paint->setARGB(alpha,red, green, blue );
+            skiaRandomizeColor(ctx);
             if (!draw_square(ctx,canvas, x,y))
                 return false;
         }
diff --git a/src/skia-tests/fill.cpp b/src/skia-tests/fill.cpp
index ebfcb3f..f81a5d7 100644
--- a/src/skia-tests/fill.cpp
+++ b/src/skia-tests/fill.cpp
@@ -54,16 +54,6 @@ sk_teardown_fill(void)
 {
 }
 
-void randomize_skia_color(caskbench_context_t *ctx)
-{
-    unsigned int red, blue, green, alpha;
-    red = int( 255 * (double)rand()/RAND_MAX );
-    green = int( 255 * (double)rand()/RAND_MAX );
-    blue = int( 255 * (double)rand()/RAND_MAX );
-    alpha = int( 255 * (double)rand()/RAND_MAX );
-    ctx->skia_paint->setARGB(alpha,red, green, blue );
-}
-
 void drawSkiashapes(caskbench_context_t *ctx,kinetics_t *particles)
 {
     int i, j, x, y, r, p, shape;
@@ -161,7 +151,7 @@ void drawSkiashapes(caskbench_context_t *ctx,kinetics_t *particles)
                                              255*(ctx->shape_args.blue ? (double)ctx->shape_args.blue:(double)0) );
                 }
                 else
-                    randomize_skia_color (ctx);
+                    skiaRandomizeColor(ctx);
             }
             else if ((strcmp(ctx->shape_args.fill_type,"solid")) == 0)
             {
@@ -173,7 +163,7 @@ void drawSkiashapes(caskbench_context_t *ctx,kinetics_t *particles)
                                                255*( (double)ctx->shape_args.alpha ? (double)ctx->shape_args.alpha:(double)1));
                 }
                 else
-                    randomize_skia_color (ctx);
+                    skiaRandomizeColor(ctx);
             }
             else if (((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
             {
diff --git a/src/skia-tests/image.cpp b/src/skia-tests/image.cpp
index c11a76f..39f371c 100644
--- a/src/skia-tests/image.cpp
+++ b/src/skia-tests/image.cpp
@@ -6,6 +6,7 @@
 #include <SkBitmapDevice.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 static SkBitmap bitmap;
 
diff --git a/src/skia-tests/mask.cpp b/src/skia-tests/mask.cpp
index 8646e28..d505726 100644
--- a/src/skia-tests/mask.cpp
+++ b/src/skia-tests/mask.cpp
@@ -5,6 +5,7 @@
 #include <effects/SkStippleMaskFilter.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 int
 sk_setup_mask(caskbench_context_t *ctx)
@@ -30,11 +31,7 @@ sk_test_mask(caskbench_context_t *ctx)
     int i;
 
     for (i=0; i<ctx->size; i++) {
-        red = int( 255 * (double)rand()/RAND_MAX );
-        green = int( 255 * (double)rand()/RAND_MAX );
-        blue = int( 255 * (double)rand()/RAND_MAX );
-        alpha = int( 255 * (double)rand()/RAND_MAX );
-        ctx->skia_paint->setARGB(alpha, red, green, blue);
+        skiaRandomizeColor(ctx);
 
         // Apply mask on a circle
         ctx->skia_canvas->drawCircle(40*i, 40, 30, *ctx->skia_paint);
diff --git a/src/skia-tests/multishape.cpp b/src/skia-tests/multishape.cpp
index 46751ec..31d4a61 100644
--- a/src/skia-tests/multishape.cpp
+++ b/src/skia-tests/multishape.cpp
@@ -6,6 +6,7 @@
 #include <SkPaint.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 static int element_spacing;
 static int num_x_elements;
@@ -56,11 +57,7 @@ sk_test_multishape(caskbench_context_t *ctx)
             x = i * element_spacing;
 
             // TODO: Select a pre-defined paint object at random
-            red = int( 255 * (double)rand()/RAND_MAX );
-            green = int( 255 * (double)rand()/RAND_MAX );
-            blue = int( 255 * (double)rand()/RAND_MAX );
-            alpha = int( 255 * (double)rand()/RAND_MAX );
-            ctx->skia_paint->setARGB(alpha, red, green, blue);
+            skiaRandomizeColor(ctx);
 
             shape = (4.0 * rand())/RAND_MAX;
             switch (shape) {
diff --git a/src/skia-tests/paint.cpp b/src/skia-tests/paint.cpp
index fbdcae3..8e46a39 100644
--- a/src/skia-tests/paint.cpp
+++ b/src/skia-tests/paint.cpp
@@ -4,6 +4,7 @@
 #include <SkPaint.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 static SkRect r;
 
@@ -24,12 +25,7 @@ sk_test_paint(caskbench_context_t *ctx)
     unsigned char red, green, blue, alpha;
     int i;
     for (i=0; i<ctx->size; i++) {
-        red = int( 255 * (double)rand()/RAND_MAX );
-        green = int( 255 * (double)rand()/RAND_MAX );
-        blue = int( 255 * (double)rand()/RAND_MAX );
-        alpha = int( 255 * (double)rand()/RAND_MAX );
-
-        ctx->skia_paint->setARGB(alpha, red, green, blue);
+        skiaRandomizeColor(ctx);
         ctx->skia_canvas->drawPaint(*ctx->skia_paint);
     }
 
diff --git a/src/skia-tests/rectangles.cpp b/src/skia-tests/rectangles.cpp
index 110b5fd..9e2f086 100644
--- a/src/skia-tests/rectangles.cpp
+++ b/src/skia-tests/rectangles.cpp
@@ -7,6 +7,7 @@
 #include <SkRect.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 int
 sk_setup_rectangles(caskbench_context_t *ctx)
@@ -30,12 +31,7 @@ sk_test_rectangles(caskbench_context_t *ctx)
     SkRect rect;
 
     for (i=0; i<ctx->size; i++) {
-        red = int( 255 * (double)rand()/RAND_MAX );
-        green = int( 255 * (double)rand()/RAND_MAX );
-        blue = int( 255 * (double)rand()/RAND_MAX );
-        alpha = int( 255 * (double)rand()/RAND_MAX );
-        ctx->skia_paint->setARGB(alpha, red, green, blue);
-
+        skiaRandomizeColor(ctx);
         w = trunc( (0.5*(double)ctx->canvas_width*rand())/RAND_MAX ) + 1;
         h = trunc( (0.5*(double)ctx->canvas_height*rand())/RAND_MAX ) + 1;
         x = trunc( (0.5*(double)ctx->canvas_width*rand())/RAND_MAX );
diff --git a/src/skia-tests/roundrect.cpp b/src/skia-tests/roundrect.cpp
index 3082809..d00b4e8 100644
--- a/src/skia-tests/roundrect.cpp
+++ b/src/skia-tests/roundrect.cpp
@@ -7,6 +7,7 @@
 #include <SkRect.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 int
 sk_setup_roundrect(caskbench_context_t *ctx)
@@ -30,11 +31,7 @@ sk_test_roundrect(caskbench_context_t *ctx)
     SkRect rect;
 
     for (i=0; i<ctx->size; i++) {
-        red = int( 255 * (double)rand()/RAND_MAX );
-        green = int( 255 * (double)rand()/RAND_MAX );
-        blue = int( 255 * (double)rand()/RAND_MAX );
-        alpha = int( 255 * (double)rand()/RAND_MAX );
-        ctx->skia_paint->setARGB(alpha, red, green, blue);
+        skiaRandomizeColor(ctx);
 
         x = trunc( (((double)ctx->canvas_width-20)*rand())/RAND_MAX ) + 10;
         y = trunc( (((double)ctx->canvas_height-20)*rand())/RAND_MAX ) + 10;
diff --git a/src/skia-tests/stroke.cpp b/src/skia-tests/stroke.cpp
index 6340480..3792af6 100644
--- a/src/skia-tests/stroke.cpp
+++ b/src/skia-tests/stroke.cpp
@@ -109,11 +109,7 @@ static void draw_stroke(caskbench_context_t *ctx,SkCanvas* canvas,kinetics_t* pa
         for (i=0; i<num_x_elements; i++) {
             x = particles?particles->x : i * element_spacing;
             ctx->skia_paint->setStrokeCap((SkPaint::Cap)(i % 5));
-            red = int( 255 * (double)rand()/RAND_MAX );
-            green = int( 255 * (double)rand()/RAND_MAX );
-            blue = int( 255 * (double)rand()/RAND_MAX );
-            alpha = int( 255 * (double)rand()/RAND_MAX );
-            ctx->skia_paint->setARGB(alpha,red, green, blue );
+            skiaRandomizeColor(ctx);
             drawShape(ctx, x,y);
         }
     }
@@ -164,11 +160,7 @@ sk_test_stroke(caskbench_context_t *ctx)
             ctx->skia_canvas->drawColor(SK_ColorWHITE);
             for (i = 0; i < num_particles; i++) {
                 kinetics_update(&particles[i], 0.3);
-                red = int( 255 * (double)rand()/RAND_MAX );
-                green = int( 255 * (double)rand()/RAND_MAX );
-                blue = int( 255 * (double)rand()/RAND_MAX );
-                alpha = int( 255 * (double)rand()/RAND_MAX );
-                ctx->skia_paint->setARGB(alpha,red, green, blue );
+                skiaRandomizeColor(ctx);
                 //draw_stroke(ctx,ctx->skia_canvas,&particles[i]);
                 drawShape(ctx,particles[i].x,particles[i].y,&particles[i]);
             }
diff --git a/src/skia-tests/text.cpp b/src/skia-tests/text.cpp
index 3f683b9..c26bf48 100644
--- a/src/skia-tests/text.cpp
+++ b/src/skia-tests/text.cpp
@@ -16,6 +16,7 @@
 #include <SkGraphics.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
 
 static int max_dim;
 static char rand_text_array[19][100];
@@ -72,11 +73,7 @@ sk_test_text(caskbench_context_t *ctx)
         for(font_size = 18; font_size <= 36; font_size++)
         {
             ctx->skia_paint->setTextSize (SkIntToScalar (font_size));
-            red = int( 255 * (double)rand()/RAND_MAX );
-            green = int( 255 * (double)rand()/RAND_MAX );
-            blue = int( 255 * (double)rand()/RAND_MAX );
-            alpha = int( 255 * (double)rand()/RAND_MAX );
-            ctx->skia_paint->setARGB (alpha,red,green,blue);
+            skiaRandomizeColor(ctx);
 
             SkPaint newpaint (*ctx->skia_paint);;
             newpaint.setTextEncoding (SkPaint::kGlyphID_TextEncoding);
@@ -95,11 +92,7 @@ sk_test_text(caskbench_context_t *ctx)
         for(font_size = 36; font_size >= 18; font_size--)
         {
             ctx->skia_paint->setTextSize (SkIntToScalar (font_size));
-            red = int( 255 * (double)rand()/RAND_MAX );
-            green = int( 255 * (double)rand()/RAND_MAX );
-            blue = int( 255 * (double)rand()/RAND_MAX );
-            alpha = int( 255 * (double)rand()/RAND_MAX );
-            ctx->skia_paint->setARGB (alpha,red,green,blue);
+            skiaRandomizeColor(ctx);
 
             SkPaint localPaint (*ctx->skia_paint);;
             localPaint.setTextEncoding (SkPaint::kGlyphID_TextEncoding);