Plotters: Remove width param from path plotter.

We now use the stroke_width in the plot_style.

content/handlers/image/svg.c

@@ -188,14 +188,14 @@ svg_redraw_internal(struct content *c,
 
 	for (i = 0; i != diagram->shape_count; i++) {
 		if (diagram->shape[i].path) {
+			pstyle.stroke_width = plot_style_int_to_fixed(
+					diagram->shape[i].stroke);
 			pstyle.stroke_colour = BGR(diagram->shape[i].stroke);
 			pstyle.fill_colour = BGR(diagram->shape[i].fill);
 			res = ctx->plot->path(ctx,
 					&pstyle,
 					diagram->shape[i].path,
 					diagram->shape[i].path_length,
-					plot_style_int_to_fixed(
-						diagram->shape[i].stroke_width),
 					transform);
 			if (res != NSERROR_OK) {
 				return false;

desktop/knockout.c

@@ -671,7 +671,6 @@ knockout_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -680,14 +679,13 @@ knockout_plot_path(const struct redraw_context *ctx,
 		   const plot_style_t *pstyle,
 		   const float *p,
 		   unsigned int n,
-		   float width,
 		   const float transform[6])
 {
 	nserror res;
 	nserror ffres;
 
 	ffres = knockout_plot_flush(ctx);
-	res = real_plot.path(ctx, pstyle, p, n, width, transform);
+	res = real_plot.path(ctx, pstyle, p, n, transform);
 
 	/* return the first error */
 	if ((res != NSERROR_OK) && (ffres == NSERROR_OK)) {

frontends/amiga/plotters.c

@@ -868,7 +868,6 @@ ami_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -877,7 +876,6 @@ ami_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	unsigned int i;

frontends/atari/plot/plot.c

@@ -2343,7 +2343,6 @@ plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -2352,7 +2351,6 @@ plot_path(const struct redraw_context *ctx,
 	  const plot_style_t *pstyle,
 	  const float *p,
 	  unsigned int n,
-	  float width,
 	  const float transform[6])
 {
     /** \todo Implement atari path plot */

frontends/beos/plotters.cpp

@@ -518,7 +518,6 @@ nsbeos_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -527,7 +526,6 @@ nsbeos_plot_path(const struct redraw_context *ctx,
                  const plot_style_t *pstyle,
                  const float *p,
                  unsigned int n,
-                 float width,
                  const float transform[6])
 {
         unsigned int i;
@@ -578,7 +576,7 @@ nsbeos_plot_path(const struct redraw_context *ctx,
 
         rgb_color old_high = view->HighColor();
         float old_pen = view->PenSize();
-        view->SetPenSize(width);
+        view->SetPenSize(plot_style_fixed_to_float(pstyle->stroke_width));
         view->MovePenTo(0, 0);
         if (pstyle->fill_colour != NS_TRANSPARENT) {
                 view->SetHighColor(nsbeos_rgb_colour(pstyle->fill_colour));

frontends/framebuffer/framebuffer.c

@@ -261,7 +261,6 @@ framebuffer_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -270,7 +269,6 @@ framebuffer_plot_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	NSLOG(netsurf, INFO, "path unimplemented");

frontends/gtk/plotters.c

@@ -399,7 +399,6 @@ nsgtk_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -408,7 +407,6 @@ nsgtk_plot_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	unsigned int i;
@@ -426,7 +424,7 @@ nsgtk_plot_path(const struct redraw_context *ctx,
 	cairo_get_matrix(current_cr, &old_ctm);
 
 	/* Set up line style and width */
-	cairo_set_line_width(current_cr, 1);
+	nsgtk_set_line_width(pstyle->stroke_width);
 	nsgtk_set_solid();
 
 	/* Load new CTM */

frontends/gtk/print.c

@@ -427,7 +427,6 @@ nsgtk_print_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -436,7 +435,6 @@ nsgtk_print_plot_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	/* Only the internal SVG renderer uses this plot call currently,

frontends/monkey/plot.c

@@ -177,7 +177,6 @@ monkey_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -186,12 +185,11 @@ monkey_plot_path(const struct redraw_context *ctx,
 		 const plot_style_t *pstyle,
 		 const float *p,
 		 unsigned int n,
-		 float width,
 		 const float transform[6])
 {
 	fprintf(stdout,
 		"PLOT PATH VERTICIES %d WIDTH %f\n",
-		n, width);
+		n, plot_style_fixed_to_float(pstyle->stroke_width));
 	return NSERROR_OK;
 }
 
@@ -273,7 +271,7 @@ static const struct plotter_table plotters = {
 	.path = monkey_plot_path,
 	.bitmap = monkey_plot_bitmap,
 	.text = monkey_plot_text,
-        .option_knockout = true,
+	.option_knockout = true,
 };
 
 const struct plotter_table* monkey_plotters = &plotters;

frontends/riscos/plotters.c

@@ -483,7 +483,6 @@ ro_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -492,7 +491,6 @@ ro_plot_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	static const draw_line_style line_style = {
@@ -591,7 +589,9 @@ ro_plot_path(const struct redraw_context *ctx,
 		}
 
 		error = xdraw_stroke((draw_path *) path, 0, &trfm, 0,
-				width * 2 * 256, &line_style, 0);
+				plot_style_fixed_to_int(
+						pstyle->stroke_width) * 2 * 256,
+				&line_style, 0);
 		if (error) {
 			NSLOG(netsurf, INFO, "xdraw_stroke: 0x%x: %s",
 			      error->errnum, error->errmess);

frontends/riscos/print.c

@@ -831,7 +831,6 @@ print_fonts_plot_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	return NSERROR_OK;

frontends/riscos/save_draw.c

@@ -312,7 +312,6 @@ ro_save_draw_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -321,7 +320,6 @@ ro_save_draw_path(const struct redraw_context *ctx,
 		  const plot_style_t *pstyle,
 		  const float *p,
 		  unsigned int n,
-		  float width,
 		  const float transform[6])
 {
 	pencil_code code;
@@ -409,7 +407,8 @@ ro_save_draw_path(const struct redraw_context *ctx,
 			   pstyle->stroke_colour == NS_TRANSPARENT ?
 			   pencil_TRANSPARENT :
 			   pstyle->stroke_colour << 8,
-			   width, pencil_JOIN_MITRED,
+			   plot_style_fixed_to_int(style->stroke_width),
+			   pencil_JOIN_MITRED,
 			   pencil_CAP_BUTT,
 			   pencil_CAP_BUTT,
 			   0,

frontends/windows/plot.c

@@ -814,7 +814,6 @@ polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -823,7 +822,6 @@ path(const struct redraw_context *ctx,
      const plot_style_t *pstyle,
      const float *p,
      unsigned int n,
-     float width,
      const float transform[6])
 {
 	NSLOG(plot, DEEPDEBUG, "path unimplemented");

include/netsurf/plotters.h

@@ -220,7 +220,6 @@ struct plotter_table {
 	 * \param pstyle Style controlling the path plot.
 	 * \param p elements of path
 	 * \param n nunber of elements on path
-	 * \param width The width of the path
 	 * \param transform A transform to apply to the path.
 	 * \return NSERROR_OK on success else error code.
 	 */
@@ -229,7 +228,6 @@ struct plotter_table {
 			const plot_style_t *pstyle,
 			const float *p,
 			unsigned int n,
-			float width,
 			const float transform[6]);
 
 	/**