From ddeadd1c02880367ad786b113d352a519f45ec73 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Thu, 23 Jul 2009 23:05:34 +0000
Subject: Merge LibCSS port to trunk.

svn path=/trunk/netsurf/; revision=8752
---
 image/bmp.c  | 3 ++-
 image/bmp.h  | 3 ++-
 image/gif.c  | 3 ++-
 image/gif.h  | 3 ++-
 image/ico.c  | 3 ++-
 image/ico.h  | 3 ++-
 image/mng.c  | 3 ++-
 image/mng.h  | 3 ++-
 image/png.c  | 3 ++-
 image/png.h  | 5 +++--
 image/rsvg.c | 3 ++-
 image/rsvg.h | 3 ++-
 image/svg.c  | 2 +-
 image/svg.h  | 3 ++-
 14 files changed, 28 insertions(+), 15 deletions(-)

(limited to 'image')

diff --git a/image/bmp.c b/image/bmp.c
index b7ca94b9c..4eaf5daa6 100644
--- a/image/bmp.c
+++ b/image/bmp.c
@@ -49,7 +49,8 @@ bmp_bitmap_callback_vt bmp_bitmap_callbacks = {
 	.bitmap_get_bpp = bitmap_get_bpp
 };
 
-bool nsbmp_create(struct content *c, const char *params[])
+bool nsbmp_create(struct content *c, struct content *parent,
+		const char *params[])
 {
 	union content_msg_data msg_data;
 
diff --git a/image/bmp.h b/image/bmp.h
index 905f9b40f..f7b974f03 100644
--- a/image/bmp.h
+++ b/image/bmp.h
@@ -40,7 +40,8 @@ struct content_bmp_data {
 
 extern bmp_bitmap_callback_vt bmp_bitmap_callbacks; /** Only to be used by ICO code.  */
 
-bool nsbmp_create(struct content *c, const char *params[]);
+bool nsbmp_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool nsbmp_convert(struct content *c, int width, int height);
 void nsbmp_destroy(struct content *c);
 bool nsbmp_redraw(struct content *c, int x, int y,
diff --git a/image/gif.c b/image/gif.c
index e16275448..62d73f0b0 100644
--- a/image/gif.c
+++ b/image/gif.c
@@ -64,7 +64,8 @@ gif_bitmap_callback_vt gif_bitmap_callbacks = {
 };
 
 
-bool nsgif_create(struct content *c, const char *params[])
+bool nsgif_create(struct content *c, struct content *parent,
+		const char *params[])
 {
 	union content_msg_data msg_data;
 	/* Initialise our data structure */
diff --git a/image/gif.h b/image/gif.h
index 571818ea2..0e3ef6605 100644
--- a/image/gif.h
+++ b/image/gif.h
@@ -37,7 +37,8 @@ struct content_gif_data {
 	int current_frame;	   /**< current frame to display [0...(max-1)] */
 };
 
-bool nsgif_create(struct content *c, const char *params[]);
+bool nsgif_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool nsgif_convert(struct content *c, int width, int height);
 void nsgif_destroy(struct content *c);
 bool nsgif_redraw(struct content *c, int x, int y,
diff --git a/image/ico.c b/image/ico.c
index dc687a0e3..5416e612a 100644
--- a/image/ico.c
+++ b/image/ico.c
@@ -37,7 +37,8 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 
-bool nsico_create(struct content *c, const char *params[])
+bool nsico_create(struct content *c, struct content *parent,
+		const char *params[])
 {
 	union content_msg_data msg_data;
 	c->data.ico.ico = calloc(sizeof(ico_collection), 1);
diff --git a/image/ico.h b/image/ico.h
index 435981470..cd7b0b432 100644
--- a/image/ico.h
+++ b/image/ico.h
@@ -35,7 +35,8 @@ struct content_ico_data {
 	struct ico_collection *ico;	/** ICO collection data */
 };
 
-bool nsico_create(struct content *c, const char *params[]);
+bool nsico_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool nsico_convert(struct content *c, int width, int height);
 void nsico_destroy(struct content *c);
 bool nsico_redraw(struct content *c, int x, int y,
diff --git a/image/mng.c b/image/mng.c
index 4f19d7202..d21d9e879 100644
--- a/image/mng.c
+++ b/image/mng.c
@@ -69,7 +69,8 @@ static void nsmng_free(mng_ptr p, mng_size_t n);
 #endif
 
 
-bool nsmng_create(struct content *c, const char *params[])
+bool nsmng_create(struct content *c, struct content *parent,
+		const char *params[])
 {
 	mng_retcode code;
 	union content_msg_data msg_data;
diff --git a/image/mng.h b/image/mng.h
index 1a3c8852d..2ea85409c 100644
--- a/image/mng.h
+++ b/image/mng.h
@@ -40,7 +40,8 @@ struct content_mng_data {
 	void *handle;
 };
 
-bool nsmng_create(struct content *c, const char *params[]);
+bool nsmng_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool nsmng_process_data(struct content *c, char *data, unsigned int size);
 bool nsmng_convert(struct content *c, int width, int height);
 void nsmng_destroy(struct content *c);
diff --git a/image/png.c b/image/png.c
index 34c517d90..176b89423 100644
--- a/image/png.c
+++ b/image/png.c
@@ -51,7 +51,8 @@ static void row_callback(png_structp png, png_bytep new_row,
 static void end_callback(png_structp png, png_infop info);
 
 
-bool nspng_create(struct content *c, const char *params[])
+bool nspng_create(struct content *c, struct content *parent,
+		const char *params[])
 {
 	union content_msg_data msg_data;
 
diff --git a/image/png.h b/image/png.h
index 4c5b1bed3..ffabd73b9 100644
--- a/image/png.h
+++ b/image/png.h
@@ -24,7 +24,7 @@
 
 #ifdef WITH_PNG
 
-#include "css/css.h"
+#include "desktop/plot_style.h"
 
 #include <stdbool.h>
 #include <png.h>
@@ -42,7 +42,8 @@ struct content_png_data {
         size_t rowbytes; /**< Number of bytes per row */
 };
 
-bool nspng_create(struct content *c, const char *params[]);
+bool nspng_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool nspng_process_data(struct content *c, char *data, unsigned int size);
 bool nspng_convert(struct content *c, int width, int height);
 void nspng_destroy(struct content *c);
diff --git a/image/rsvg.c b/image/rsvg.c
index b1d597052..86e1d5b66 100644
--- a/image/rsvg.c
+++ b/image/rsvg.c
@@ -49,7 +49,8 @@
 static inline void rsvg_argb_to_abgr(uint32_t pixels[], int width, int height,
 				size_t rowstride);
 
-bool rsvg_create(struct content *c, const char *params[])
+bool rsvg_create(struct content *c, struct content *parent,
+		const char *params[])
 {
 	struct content_rsvg_data *d = &c->data.rsvg;
 	union content_msg_data msg_data;
diff --git a/image/rsvg.h b/image/rsvg.h
index d627991cc..ac414d85c 100644
--- a/image/rsvg.h
+++ b/image/rsvg.h
@@ -41,7 +41,8 @@ struct content_rsvg_data {
 	struct bitmap *bitmap;	/**< Created NetSurf bitmap */
 };
 
-bool rsvg_create(struct content *c, const char *params[]);
+bool rsvg_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool rsvg_process_data(struct content *c, char *data, unsigned int size);
 bool rsvg_convert(struct content *c, int width, int height);
 void rsvg_destroy(struct content *c);
diff --git a/image/svg.c b/image/svg.c
index b87a8a67d..4321a9fc3 100644
--- a/image/svg.c
+++ b/image/svg.c
@@ -40,7 +40,7 @@
  * Create a CONTENT_SVG.
  */
 
-bool svg_create(struct content *c, const char *params[])
+bool svg_create(struct content *c, struct content *parent, const char *params[])
 {
 	union content_msg_data msg_data;
 
diff --git a/image/svg.h b/image/svg.h
index ec9c789c2..b191c4cd6 100644
--- a/image/svg.h
+++ b/image/svg.h
@@ -32,7 +32,8 @@ struct content_svg_data {
 	struct svgtiny_diagram *diagram;
 };
 
-bool svg_create(struct content *c, const char *params[]);
+bool svg_create(struct content *c, struct content *parent,
+		const char *params[]);
 bool svg_convert(struct content *c, int width, int height);
 void svg_destroy(struct content *c);
 bool svg_redraw(struct content *c, int x, int y,
-- 
cgit v1.2.3