diff options
Diffstat (limited to 'content')
-rw-r--r-- | content/content.c | 11 | ||||
-rw-r--r-- | content/content.h | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/content/content.c b/content/content.c index ecca5c2fd..5812b9e5f 100644 --- a/content/content.c +++ b/content/content.c @@ -1,11 +1,12 @@ /** - * $Id: content.c,v 1.3 2003/02/28 11:49:13 bursa Exp $ + * $Id: content.c,v 1.4 2003/04/04 15:19:31 bursa Exp $ */ #include <assert.h> #include <string.h> #include <stdlib.h> #include "netsurf/content/content.h" +#include "netsurf/css/css.h" #include "netsurf/render/html.h" #include "netsurf/render/textplain.h" #include "netsurf/riscos/jpeg.h" @@ -19,8 +20,8 @@ struct mime_entry { }; static const struct mime_entry mime_map[] = { {"image/jpeg", CONTENT_JPEG}, -/* {"image/png", CONTENT_PNG}, - {"text/css", CONTENT_CSS},*/ +/* {"image/png", CONTENT_PNG},*/ + {"text/css", CONTENT_CSS}, {"text/html", CONTENT_HTML}, {"text/plain", CONTENT_TEXTPLAIN}, }; @@ -40,8 +41,8 @@ static const struct handler_entry handler_map[] = { {textplain_create, textplain_process_data, textplain_convert, textplain_revive, textplain_reformat, textplain_destroy}, {jpeg_create, jpeg_process_data, jpeg_convert, jpeg_revive, jpeg_reformat, jpeg_destroy}, -/* {css_create, css_process_data, css_convert, css_revive, css_destroy}, - {png_create, png_process_data, png_convert, png_revive, png_destroy},*/ + {css_create, css_process_data, css_convert, css_revive, css_destroy}, +/* {png_create, png_process_data, png_convert, png_revive, png_destroy},*/ }; diff --git a/content/content.h b/content/content.h index 94cbffe20..06210b790 100644 --- a/content/content.h +++ b/content/content.h @@ -1,5 +1,5 @@ /** - * $Id: content.h,v 1.2 2003/02/25 21:00:27 bursa Exp $ + * $Id: content.h,v 1.3 2003/04/04 15:19:31 bursa Exp $ */ #ifndef _NETSURF_DESKTOP_CONTENT_H_ @@ -7,7 +7,7 @@ #include "libxml/HTMLparser.h" #include "netsurf/content/cache.h" -#include "netsurf/render/css.h" +#include "netsurf/css/css.h" #include "netsurf/render/box.h" #include "netsurf/riscos/font.h" @@ -66,22 +66,21 @@ struct content struct page_elements elements; } html; - struct - { - struct css_stylesheet * stylesheet; - } css; + struct css_stylesheet *css; struct { char * data; unsigned long length; } jpeg; - + } data; struct cache_entry *cache; unsigned long size; char *title; + unsigned int active; + int error; }; |