Issue#4 - Rewrite the fill test

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>

2 files changed, 822 insertions, 24 deletions

diff --git a/src/cairo-tests/fill.cpp b/src/cairo-tests/fill.cpp
index 772c8e6..b5e31f0 100644
--- a/src/cairo-tests/fill.cpp
+++ b/src/cairo-tests/fill.cpp
@@ -1,12 +1,327 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cairo.h>
-
+#include <math.h>
+#include "cairo-shapes.h"
 #include "caskbench.h"
+#include "kinetics.h"
+#include "unistd.h"
+
+static int element_spacing;
+static int num_x_elements;
+static int num_y_elements;
+static kinetics_t *cairo_particles;
+static int star_points[11][2] = {
+    { 0, 85 },
+    { 75, 75 },
+    { 100, 10 },
+    { 125, 75 },
+    { 200, 85 },
+    { 150, 125 },
+    { 160, 190 },
+    { 100, 150 },
+    { 40, 190 },
+    { 50, 125 },
+    { 0, 85 }
+};
+
+void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
+{
+    int i, j, x, y, r, p, shape;
+    cairo_t *cr = ctx->cairo_cr;
+    r = 0.9 * element_spacing /2;
+    int old_x, old_y,old_width, old_height;
+	 cairo_pattern_t *pattern;
+	cairo_surface_t *image;
+     double red, green, blue, alpha;
+static const double dashed3[] = {1.0};
+static const double dashed2[] = {14.0, 6.0};
+     cairo_path_t *newPath;
+       shape = ctx->shape_args.shape_id;
+       if(!shape)
+        {
+           shape = ((4.0 * rand())/RAND_MAX) + 1;  
+		   if(!ctx->shape_args.multi_shapes)
+           	shape = 2;
+        }
+
+       if(shape)
+       {
+           if(!(ctx->shape_args.centre_x && ctx->shape_args.centre_y))
+           {
+               ctx->shape_args.centre_x = x = ctx->canvas_width/2;
+               ctx->shape_args.centre_y = y = ctx->canvas_height/2;
+           }
+		   if(!ctx->shape_args.multi_shapes)
+           if(!(ctx->shape_args.width && ctx->shape_args.height))
+           {
+               ctx->shape_args.width = 100;
+               ctx->shape_args.height = 50;
+           }
+           ctx->shape_args.radius = r;
+        }
+
+
+	if(!ctx->shape_args.animation && !ctx->shape_args.multi_shapes)
+	{
+		num_x_elements = 1;
+		num_y_elements = 1;
+
+
+        r = 40;
+        old_x = ctx->shape_args.centre_x;
+        old_y = ctx->shape_args.centre_y;
+        old_width = ctx->shape_args.width;
+        old_height = ctx->shape_args.height;
+	}
+
+    for (j=0; j<num_y_elements; j++) {
+        y = particles?particles->y : j * element_spacing;
+        for (i=0; i<num_x_elements; i++) {
+            x = particles?particles->x : i * element_spacing;
+
+			//Options for fill,gradient and transparency
+			if( ctx->shape_args.fill_type == NULL)
+			{
+					if(ctx->shape_args.red > 0 || ctx->shape_args.blue > 0 || ctx->shape_args.green > 0 || ctx->shape_args.alpha > 0)
+					{
+							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);
+			}
+			else if((strcmp(ctx->shape_args.fill_type,"solid")) == 0)
+			{
+		            if(ctx->shape_args.red > 0 || ctx->shape_args.blue > 0 || ctx->shape_args.green > 0 || ctx->shape_args.alpha > 0)
+                    {
+							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);
+			}
+			else if (((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
+			{
+				red = (double)rand()/RAND_MAX;
+				green = (double)rand()/RAND_MAX;
+				blue = (double)rand()/RAND_MAX;
+				alpha = (double)rand()/RAND_MAX;
+
+			}
+			else if((strcmp(ctx->shape_args.fill_type,"herringbone-pattern")) == 0){}
+			else if((strcmp(ctx->shape_args.fill_type,"image-pattern")) == 0 && (ctx->shape_args.image_path))
+			{
+				cairo_matrix_t   matrix;
+
+				image = cairo_image_surface_create_from_png (ctx->shape_args.image_path);
+				int w = cairo_image_surface_get_width (image);
+				int h = cairo_image_surface_get_height (image);
+
+				pattern = cairo_pattern_create_for_surface (image);
+				cairo_set_source (cr, pattern);
+
+			}
+			
+			
+            switch (shape) {
+            case 1:
+                // Circle
+				ctx->shape_args.centre_x = (ctx->shape_args.multi_shapes || ctx->shape_args.animation)?x+r:ctx->shape_args.centre_x;
+				ctx->shape_args.centre_y = (ctx->shape_args.multi_shapes || ctx->shape_args.animation)?y+r:ctx->shape_args.centre_y;			
+				ctx->shape_args.radius = r;	
+	
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+					if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+						pattern = cairo_pattern_create_radial (ctx->shape_args.centre_x, ctx->shape_args.centre_y ,r,ctx->shape_args.centre_x, ctx->shape_args.centre_y,0 );
+					else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+						pattern = cairo_pattern_create_linear (0, ctx->shape_args.centre_y-r ,0, ctx->shape_args.centre_y+r );
+				
+					if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+			           cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+					if(((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
+					{
+    	        		cairo_pattern_add_color_stop_rgba (pattern, 0, red, green, blue, alpha);
+		        	    cairo_pattern_add_color_stop_rgba (pattern, 1, 0.78, 0.78, 0.78, 0.78);
+		            	cairo_set_source (cr, pattern);
+					}
+				}
+				cairoShapes[Circle](ctx,&ctx->shape_args);
+
+                break;
+
+            case 2:
+                // Rectangle
+                ctx->shape_args.centre_x =  (ctx->shape_args.multi_shapes || ctx->shape_args.animation)?x:ctx->shape_args.centre_x;
+                ctx->shape_args.centre_y = (ctx->shape_args.multi_shapes|| ctx->shape_args.animation)?y:ctx->shape_args.centre_y;
+                ctx->shape_args.width = (ctx->shape_args.width)?ctx->shape_args.width:2*r;
+                ctx->shape_args.height = (ctx->shape_args.height)?ctx->shape_args.height:2*r; 
+		
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+					if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+						pattern = cairo_pattern_create_radial (ctx->shape_args.centre_x+(ctx->shape_args.width/2), ctx->shape_args.centre_y+(ctx->shape_args.height/2) ,ctx->shape_args.height/2, ctx->shape_args.centre_x+(ctx->shape_args.width/2), ctx->shape_args.centre_y+(ctx->shape_args.height/2) ,0/*ctx->shape_args.height/2 */);
+					else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+    	            	pattern = cairo_pattern_create_linear (0, ctx->shape_args.centre_y ,0, ctx->shape_args.centre_y+ctx->shape_args.height );
+
+
+
+        	        if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+            	       cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+                	if(((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
+                	{	
+                    	cairo_pattern_add_color_stop_rgba (pattern, 0, red, green, blue, alpha);
+	                    cairo_pattern_add_color_stop_rgba (pattern, 1, 0.78, 0.78, 0.78, 0.78);
+    	                cairo_set_source (cr, pattern);
+        	        }
+				}
+                cairoShapes[Rectangle](ctx,&ctx->shape_args);
+
+	
+                break;
+
+            case 3:
+                // Triangle
+                ctx->shape_args.numpoints = 3;
+				if( (!ctx->shape_args.multi_shapes && !ctx->shape_args.animation))
+				{
+					x = ctx->shape_args.centre_x;
+					y = ctx->shape_args.centre_y;
+				}
+				ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double)));
+				ctx->shape_args.points[0][0] = x;
+				ctx->shape_args.points[0][1] = y+2*r;
+				ctx->shape_args.points[1][0] = 2*r;
+				ctx->shape_args.points[1][1] = 0;
+				ctx->shape_args.points[2][0] = -r;
+				ctx->shape_args.points[2][1] = -2*r;
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+				if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+					pattern = cairo_pattern_create_radial (x, y+2*r, r, x, y+2*r,0/*2*r*/);
+				else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+                	pattern = cairo_pattern_create_linear (0, ctx->shape_args.points[0][1] ,0, ctx->shape_args.points[0][1]+(4*r) );
+
+
 
+                if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+                   cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+                if(((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
+                {
+                    cairo_pattern_add_color_stop_rgba (pattern, 0, red, green, blue, alpha);
+                    cairo_pattern_add_color_stop_rgba (pattern, 1, 0.78, 0.78, 0.78, 0.78);
+                    cairo_set_source (cr, pattern);
+                }
+
+				}
+				cairoShapes[Triangle] (ctx,&ctx->shape_args);
+				free (ctx->shape_args.points);
+
+                break;
+
+            case 4:
+                // Star
+				if( (!ctx->shape_args.multi_shapes && !ctx->shape_args.animation))
+                {
+                    x = ctx->shape_args.centre_x;
+                    y = ctx->shape_args.centre_y;
+                }
+                ctx->shape_args.numpoints = 10;
+                ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double)));
+
+                for (p = 0; p < 10; p++ ) {
+                    int px = x + 2*r * star_points[p][0]/200.0;
+                    int py = y + 2*r * star_points[p][1]/200.0;
+                    ctx->shape_args.points[p][0] = px;
+                    ctx->shape_args.points[p][1] = py;
+                }
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+				if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+					pattern = cairo_pattern_create_radial (ctx->shape_args.points[0][0], ctx->shape_args.points[0][1], r, x, ctx->shape_args.points[0][1],0/*r*/);
+				else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+               		pattern = cairo_pattern_create_linear (0, ctx->shape_args.points[0][1]-r ,0, ctx->shape_args.points[0][1]+(r) );
+
+
+                if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+                   cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+                if(((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
+                {
+                    cairo_pattern_add_color_stop_rgba (pattern, 0, red, green, blue, alpha);
+                    cairo_pattern_add_color_stop_rgba (pattern, 1, 0.78, 0.78, 0.78, 0.78);
+                    cairo_set_source (cr, pattern);
+                }
+				}
+				cairoShapes[Star] (ctx,&ctx->shape_args);
+
+
+
+				free (ctx->shape_args.points);
+                break;
+
+            default:
+                break;
+            }
+            newPath = cairo_copy_path(cr);	
+            cairo_fill (cr);
+            if(ctx->shape_args.stroke_width)
+            {
+                cairo_new_path(cr);
+                cairo_append_path(cr, newPath);
+                cairo_set_line_width(cr, ctx->shape_args.stroke_width);
+                cairo_set_line_cap(cr, (cairo_line_cap_t)ctx->shape_args.cap_style); 
+                if(ctx->shape_args.dash_style == 1)
+                {
+                    cairo_set_dash(cr, dashed3, 1, 0);
+                }
+                else if(ctx->shape_args.dash_style == 2)
+                {
+                    cairo_set_dash(cr, dashed2, 2, 0);
+                }
+
+                cairo_set_line_join(cr,  (cairo_line_join_t)ctx->shape_args.join_style); 
+                if(ctx->shape_args.red > 0 || ctx->shape_args.blue > 0 || ctx->shape_args.green > 0 || ctx->shape_args.alpha > 0)
+                {
+                    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);
+
+                cairo_stroke(cr);
+            }
+            if(ctx->shape_args.fill_type != NULL)
+			{
+				if(pattern != NULL)
+					cairo_pattern_destroy(pattern);
+				if(image != NULL)
+					cairo_surface_destroy (image);
+			}
+        }
+    }
+
+	if(!ctx->shape_args.animation && !ctx->shape_args.multi_shapes)
+	{
+        ctx->shape_args.centre_x = old_x;
+        ctx->shape_args.centre_y = old_y;
+        ctx->shape_args.width = old_width;
+        ctx->shape_args.height = old_height;
+	}
+
+
+}
 int
 ca_setup_fill(caskbench_context_t *ctx)
 {
+    if (ctx->size < 0)
+        return 0;
+
+    element_spacing = sqrt( ((double)ctx->canvas_width * ctx->canvas_height) / ctx->size);
+    num_x_elements = ctx->canvas_width / element_spacing;
+    num_y_elements = ctx->canvas_height / element_spacing;
+
     return 1;
 }
 
@@ -15,16 +330,44 @@ ca_teardown_fill(void)
 {
 }
 
-int
+		int
 ca_test_fill(caskbench_context_t *ctx)
 {
-    int i;
-    cairo_t *cr = ctx->cairo_cr;
+	cairo_t *cr = ctx->cairo_cr;
+	for(int i = 0;i < ctx->size; i++)
+	{	
+	//Animation / Kinematics of single or multi shape
+	if(ctx->shape_args.animation)
+	{
+		int num_particles = ctx->shape_args.animation;
+		double start_frame, stop_frame, delta;
+		cairo_particles = (kinetics_t *) malloc (sizeof (kinetics_t) * num_particles);
+		int i,j ;
+		for (i = 0; i < num_particles; i++)
+			kinetics_init (&cairo_particles[i]);
+		delta = 0;
 
-    for (i=0; i<ctx->size; i++) {
-        randomize_color (cr);
-        cairo_arc (cr, 40*i, 40, 30, 0, 2*M_PI);
-        cairo_fill (cr);
-    }
-    return 1;
+		for (j=0;j<num_particles;j++){
+			start_frame = get_tick ();
+
+		cairo_set_source_rgb (cr, 0, 0, 0);
+		cairo_rectangle (cr, 0, 0, ctx->canvas_width ,ctx->canvas_height);
+		cairo_fill (cr);
+
+		for (i = 0; i < num_particles; i++) {
+			kinetics_update(&cairo_particles[i], 0.1);
+			drawshapes(ctx,&cairo_particles[i]);
+			}
+		stop_frame = get_tick ();
+		delta = stop_frame - start_frame;
+		}
+
+	}
+	//Drawing of multishape on a grid
+	else
+	{
+		drawshapes(ctx,NULL);
+	}
+	}
+	return 1;
 }
diff --git a/src/skia-tests/fill.cpp b/src/skia-tests/fill.cpp
index e721ef2..7ad66fc 100644
--- a/src/skia-tests/fill.cpp
+++ b/src/skia-tests/fill.cpp
@@ -1,14 +1,55 @@
-// From http://www.atoker.com/blog/2008/09/06/skia-graphics-library-in-chrome-first-impressions/
-
 #include <SkCanvas.h>
 #include <SkPaint.h>
 #include <cairo.h>
+#include <math.h>
 
 #include "caskbench.h"
+#include "skia-shapes.h"
+#include "kinetics.h"
+
+#include "effects/SkGradientShader.h"
+#include "unistd.h"
+#include "SkUnitMappers.h"
+#include "SkDraw.h"
+#include "effects/SkGradientShader.h"
+#include "SkGraphics.h"
+#include "SkImageDecoder.h"
+#include <SkDashPathEffect.h>
+SkAutoTUnref<SkPathEffect> pE;
+
+
+static kinetics_t *skia_particles;
+
+static int element_spacing;
+static int num_x_elements;
+static int num_y_elements;
+
+
+
+static int star_points[11][2] = {
+    { 0, 85 },
+    { 75, 75 },
+    { 100, 10 },
+    { 125, 75 },
+    { 200, 85 },
+    { 150, 125 },
+    { 160, 190 },
+    { 100, 150 },
+    { 40, 190 },
+    { 50, 125 },
+    { 0, 85 }
+};
 
 int
 sk_setup_fill(caskbench_context_t *ctx)
 {
+    if (ctx->size < 0)
+        return 0;
+
+    element_spacing = sqrt( ((double)ctx->canvas_width * ctx->canvas_height) / ctx->size);
+    num_x_elements = ctx->canvas_width / element_spacing;
+    num_y_elements = ctx->canvas_height / element_spacing;
+
     return 1;
 }
 
@@ -17,20 +58,434 @@ sk_teardown_fill(void)
 {
 }
 
-int
-sk_test_fill(caskbench_context_t *ctx)
+void randomize_skia_color(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);
+	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;
+	unsigned int red,green,blue,alpha;
+    r = 0.9 * element_spacing /2;
+    int old_x, old_y,old_width, old_height;
+
+       shape = ctx->shape_args.shape_id;
+       if(!shape)
+        {
+           shape = ((4.0 * rand())/RAND_MAX) + 1;  
+		   if(!ctx->shape_args.multi_shapes)
+           	shape = 2;
+        }
+
+       if(shape)
+       {
+           if(!(ctx->shape_args.centre_x && ctx->shape_args.centre_y))
+           {
+               ctx->shape_args.centre_x = x = ctx->canvas_width/2;
+               ctx->shape_args.centre_y = y = ctx->canvas_height/2;
+           }
+		   if(!ctx->shape_args.multi_shapes)
+           if(!(ctx->shape_args.width && ctx->shape_args.height))
+           {
+               ctx->shape_args.width = 100;
+               ctx->shape_args.height = 50;
+           }
+           ctx->shape_args.radius = r;
+        }
+
+	SkUnitMapper* linearMapper;
+	SkColor linearColors[2];
+	SkPoint linearPoints[2];
+	SkScalar radialPoints[4];
+	SkShader* shader;
+	SkPoint center;
+	//Stroke styles
+	SkScalar vals[] = { SkIntToScalar(1), SkIntToScalar(1)  };
+	if(ctx->shape_args.stroke_width)
+	{
+
+		    ctx->skia_paint->setStyle(SkPaint::kStroke_Style);
+		    //ctx->skia_paint->setStyle(SkPaint::kStrokeAndFill_Style);
+
+			ctx->skia_paint->setStrokeWidth(ctx->shape_args.stroke_width);
+
+
+			ctx->skia_paint->setStrokeJoin((SkPaint::Join)ctx->shape_args.join_style);
+			ctx->skia_paint->setStrokeCap((SkPaint::Cap)ctx->shape_args.cap_style);
+			if(ctx->shape_args.dash_style == 0)
+			{
+					pE.reset(new SkDashPathEffect(vals, 2, 0));
+					ctx->skia_paint->setPathEffect(new SkDashPathEffect(vals, 2, 0));
+					ctx->skia_paint->setPathEffect(pE);
+			}
+			else if(ctx->shape_args.dash_style == 1)
+			{
+			}
+
+
+			//                        if(ctx->shape_args.red > 0 || ctx->shape_args.blue > 0 || ctx->shape_args.green > 0 || ctx->shape_args.alpha > 0)
+			{
+					//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
+
+	}
+
+    old_width = ctx->shape_args.width;
+    old_height = ctx->shape_args.height;
+	if(!ctx->shape_args.animation && !ctx->shape_args.multi_shapes)
+	{
+		num_x_elements = 1;
+		num_y_elements = 1;
+
+        r = 40;
+        old_x = ctx->shape_args.centre_x;
+        old_y = ctx->shape_args.centre_y;
+
+	}
+
+    for (j=0; j<num_y_elements; j++) {
+        y = particles?particles->y : j * element_spacing;
+        for (i=0; i<num_x_elements; i++) {
+            x = particles?particles->x : i * element_spacing;
+		
+			//Options for fill,gradient and transparency
+			if( ctx->shape_args.fill_type == NULL)
+			{
+					if(ctx->shape_args.red > 0 || ctx->shape_args.blue > 0 || ctx->shape_args.green > 0 || ctx->shape_args.alpha > 0)
+					{
+							ctx->skia_paint->setARGB(255*((double)ctx->shape_args.alpha ? (double)ctx->shape_args.alpha:(double)1), 
+                            255*(double)ctx->shape_args.red, 
+                            255*((double)ctx->shape_args.green ? (double)ctx->shape_args.green:(double)0), 
+                            255*(ctx->shape_args.blue ? (double)ctx->shape_args.blue:(double)0) );
+					}
+					else
+						randomize_skia_color (ctx);
+			}
+			else if((strcmp(ctx->shape_args.fill_type,"solid")) == 0)
+			{
+		            if(ctx->shape_args.red > 0 || ctx->shape_args.blue > 0 || ctx->shape_args.green > 0 || ctx->shape_args.alpha > 0)
+                    {
+							ctx->skia_paint->setARGB ( 255*(double)ctx->shape_args.red, 
+                            255*((double)ctx->shape_args.green ? (double)ctx->shape_args.green:(double)0),
+                            255* (ctx->shape_args.blue ? (double)ctx->shape_args.blue:(double)0),
+                            255*( (double)ctx->shape_args.alpha ? (double)ctx->shape_args.alpha:(double)1));
+                    }
+                    else
+                        randomize_skia_color (ctx);
+			}
+            else if (((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0) || ((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0))
+			{
+				red = 255*(double)rand()/RAND_MAX;
+				green = 255*(double)rand()/RAND_MAX;
+				blue = 255*(double)rand()/RAND_MAX;
+				alpha = 255*(double)rand()/RAND_MAX;
+
+			}
+			else if((strcmp(ctx->shape_args.fill_type,"herringbone-pattern")) == 0){}
+			else if((strcmp(ctx->shape_args.fill_type,"image-pattern")) == 0 &&(ctx->shape_args.image_path))
+			{
+			    SkBitmap    bm;
+
+    			SkImageDecoder::DecodeFile(ctx->shape_args.image_path, &bm);
+			    shader = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMode,
+                                        SkShader::kClamp_TileMode);
+
+           		ctx->skia_paint->setShader (shader);
+			}
+            switch (shape) {
+            case 1:
+                // Circle
+				ctx->shape_args.centre_x = (ctx->shape_args.multi_shapes || ctx->shape_args.animation)?x+r:ctx->shape_args.centre_x;
+				ctx->shape_args.centre_y = (ctx->shape_args.multi_shapes || ctx->shape_args.animation)?y+r:ctx->shape_args.centre_y;			
+				ctx->shape_args.radius = r;	
+
+
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+				    if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+					{
+					    linearColors[1] = SkColorSetARGB (alpha, red, green, blue);
+						linearColors[0] = SkColorSetARGB (200,200,200,200);
+						center.set(ctx->shape_args.centre_x, ctx->shape_args.centre_y);
+
+						shader = SkGradientShader::CreateRadial (center,r,
+											linearColors, NULL,2,
+											SkShader::kClamp_TileMode, NULL);
+
+
+						ctx->skia_paint->setShader (shader);
+					}
+					else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+					{
+						linearColors[0] = SkColorSetARGB (alpha, red, green, blue);
+						linearColors[1] = SkColorSetARGB (200,200,200,200);
+						linearPoints[0].fX = SkIntToScalar(0);
+						linearPoints[0].fY = SkIntToScalar(ctx->shape_args.centre_y-r);
+						linearPoints[1].fX = SkIntToScalar(0);
+						linearPoints[1].fY = SkIntToScalar(ctx->shape_args.centre_y+r);
+
+
+						shader = SkGradientShader::CreateLinear (
+											linearPoints, linearColors, NULL, 2,
+											SkShader::kClamp_TileMode, NULL);
+
+
+						ctx->skia_paint->setShader (shader);
+					}
+
+				}
+
+
+
+				skiaShapes[Circle](ctx,&ctx->shape_args);
+	
+                break;
+
+            case 2:
+                
+				// Rectangle
+                ctx->shape_args.centre_x =  (ctx->shape_args.multi_shapes || ctx->shape_args.animation)?x:ctx->shape_args.centre_x;
+                ctx->shape_args.centre_y = (ctx->shape_args.multi_shapes|| ctx->shape_args.animation)?y:ctx->shape_args.centre_y;
+                ctx->shape_args.width = (ctx->shape_args.centre_x) +((ctx->shape_args.width)?ctx->shape_args.width:2*r);
+                ctx->shape_args.height = (ctx->shape_args.centre_y) + ((ctx->shape_args.height)?ctx->shape_args.height:2*r); 
+
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+	                if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+    	            {
+        	            linearColors[1] = SkColorSetARGB (alpha, red, green, blue);
+            	        linearColors[0] = SkColorSetARGB (200,200,200,200);
+                		center.set((ctx->shape_args.centre_x+ctx->shape_args.width)/2, (ctx->shape_args.centre_y+ctx->shape_args.height)/2);
+
+                		shader = SkGradientShader::CreateRadial (center, (ctx->shape_args.height-ctx->shape_args.centre_y)/2,
+                    		linearColors, NULL,2,
+		                   	 SkShader::kClamp_TileMode, NULL);
+	
 
-        ctx->skia_canvas->drawCircle(40*i, 40, 30, *ctx->skia_paint);
+	    	            ctx->skia_paint->setShader (shader);
+            	    }
+               	    else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+               		{
+                    	linearColors[0] = SkColorSetARGB (alpha, red, green, blue);
+                    	linearColors[1] = SkColorSetARGB (200,200,200,200);
+	                	linearPoints[0].fX = SkIntToScalar(0);
+		                linearPoints[0].fY = SkIntToScalar(ctx->shape_args.centre_y);
+		                linearPoints[1].fX = SkIntToScalar(0);
+		                linearPoints[1].fY = SkIntToScalar(ctx->shape_args.centre_y+ctx->shape_args.height/4);
+
+
+   		         		shader = SkGradientShader::CreateLinear (
+    		               	linearPoints, linearColors, NULL, 2,
+	        	            SkShader::kClamp_TileMode, NULL);
+
+
+                	    ctx->skia_paint->setShader (shader);
+                	}
+				}
+
+
+               	skiaShapes[Rectangle](ctx,&ctx->shape_args);
+
+
+				ctx->shape_args.width = old_width;
+				ctx->shape_args.height = old_height;
+
+				
+                break;
+
+            case 3:
+                // Triangle
+				ctx->shape_args.path.reset();
+				if( (!ctx->shape_args.multi_shapes && !ctx->shape_args.animation))
+				{
+					x = ctx->shape_args.centre_x;
+					y = ctx->shape_args.centre_y;
+				}
+				ctx->shape_args.numpoints = 3;
+				ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double)));
+				ctx->shape_args.points[0][0] = x;
+				ctx->shape_args.points[0][1] = y+2*r;
+				ctx->shape_args.points[1][0] = 2*r;
+				ctx->shape_args.points[1][1] = 0;
+				ctx->shape_args.points[2][0] = -r;
+				ctx->shape_args.points[2][1] = -2*r;
+
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+	                if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+    	            {
+        	            linearColors[1] = SkColorSetARGB (alpha, red, green, blue);
+            	        linearColors[0] = SkColorSetARGB (200,200,200,200);
+            		    center.set(ctx->shape_args.points[0][0],ctx->shape_args.points[0][1]);
+
+	                	shader = SkGradientShader::CreateRadial (center, r,
+    	                	linearColors, NULL,2,
+	        	            SkShader::kClamp_TileMode, NULL);
+
+
+    	           	    ctx->skia_paint->setShader (shader);
+        	        }
+            	    else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+                	{
+                    	linearColors[0] = SkColorSetARGB (alpha, red, green, blue);
+    	                linearColors[1] = SkColorSetARGB (200,200,200,200);
+	                	linearPoints[0].fX = SkIntToScalar(0);
+		                linearPoints[0].fY = SkIntToScalar(y);
+		                linearPoints[1].fX = SkIntToScalar(0);
+		                linearPoints[1].fY = SkIntToScalar(y+2*r);
+
+	            	    shader = SkGradientShader::CreateLinear (
+    		                linearPoints, linearColors, NULL, 2,
+        		            SkShader::kClamp_TileMode, NULL);
+
+	                	ctx->skia_paint->setShader (shader);
+                	}
+
+
+
+				}
+
+				skiaShapes[Triangle] (ctx,&ctx->shape_args);
+
+				free (ctx->shape_args.points);
+				
+                break;
+
+            case 4:
+                // Star
+				ctx->shape_args.path.reset();
+				if( (!ctx->shape_args.multi_shapes && !ctx->shape_args.animation))
+                {
+                    x = ctx->shape_args.centre_x;
+                    y = ctx->shape_args.centre_y;
+                }
+                ctx->shape_args.numpoints = 10;
+                ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double)));
+
+                for (p = 0; p < 10; p++ ) {
+                    int px = x + 2*r * star_points[p][0]/200.0;
+                    int py = y + 2*r * star_points[p][1]/200.0;
+                    ctx->shape_args.points[p][0] = px;
+                    ctx->shape_args.points[p][1] = py;
+                }
+ 
+
+				if(ctx->shape_args.fill_type != NULL)
+				{
+	                if((strcmp(ctx->shape_args.fill_type,"radial-gradient")) == 0)
+    	            {
+        	            linearColors[1] = SkColorSetARGB (alpha, red, green, blue);
+            	        linearColors[0] = SkColorSetARGB (200,200,200,200);
+	
+
+		                center.set(ctx->shape_args.points[0][0],ctx->shape_args.points[0][1]);
+		
+    	        	    shader = SkGradientShader::CreateRadial (center, r,
+        		            linearColors, NULL,2,
+            		        SkShader::kClamp_TileMode, NULL);
+	
+    	            	ctx->skia_paint->setShader (shader);
+                	}
+	                else if((strcmp(ctx->shape_args.fill_type,"linear-gradient")) == 0)
+    	            {
+        	            linearColors[0] = SkColorSetARGB (alpha, red, green, blue);
+            	        linearColors[1] = SkColorSetARGB (200,200,200,200);
+	            	    linearPoints[0].fX = SkIntToScalar(0);
+   		            	linearPoints[0].fY = SkIntToScalar(y);
+	            	    linearPoints[1].fX = SkIntToScalar(0);
+    	            	linearPoints[1].fY = SkIntToScalar(y+2*r);
+
+	                	shader = SkGradientShader::CreateLinear (
+    	                	linearPoints, linearColors, NULL, 2,
+	    	                SkShader::kClamp_TileMode, NULL);
+
+                        
+            	        ctx->skia_paint->setShader (shader);
+                	}       
+
+
+
+				}
+
+
+				skiaShapes[Star] (ctx,&ctx->shape_args);
+
+
+				free (ctx->shape_args.points);
+                break;
+
+            default:
+				break;
+			}
+			ctx->skia_canvas->flush();
+			if(ctx->shape_args.fill_type != NULL)
+			if(shader != NULL)
+			{
+            ctx->skia_paint->setShader (NULL);
+			delete shader;
+			}
+			ctx->skia_paint->setPathEffect(NULL);
+
+        }
     }
 
-    return 1;
+	if(!ctx->shape_args.animation && !ctx->shape_args.multi_shapes)
+	{
+        ctx->shape_args.centre_x = old_x;
+        ctx->shape_args.centre_y = old_y;
+        ctx->shape_args.width = old_width;
+        ctx->shape_args.height = old_height;
+	}
+
+
+}
+		int
+sk_test_fill(caskbench_context_t *ctx)
+{
+	for(int i = 0;i < ctx->size; i++)
+	{	
+        //Animation / Kinematics of single or multi shape
+        if(ctx->shape_args.animation)
+        {
+            int num_particles = ctx->shape_args.animation;
+            double start_frame, stop_frame, delta;
+            skia_particles = (kinetics_t *) malloc (sizeof (kinetics_t) * num_particles);
+            int i,j ;
+            for (i = 0; i < num_particles; i++)
+                kinetics_init (&skia_particles[i]);
+            delta = 0;
+
+            for (j=0;j<num_particles;j++){
+                start_frame = get_tick ();
+
+                ctx->skia_canvas->drawColor(SK_ColorBLACK);
+
+
+                for (i = 0; i < num_particles; i++) {
+                    kinetics_update(&skia_particles[i], 0.1);
+                    drawSkiashapes(ctx,&skia_particles[i]);
+                }
+                stop_frame = get_tick ();
+                delta = stop_frame - start_frame;
+            }
+
+        }
+
+        //Drawing of multishape on a grid
+        else
+        {
+            drawSkiashapes(ctx,NULL);
+        }
+    }
+	return 1;
 }