From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- content/content.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'content/content.h') diff --git a/content/content.h b/content/content.h index 0bb40779f..b3e0b1ce2 100644 --- a/content/content.h +++ b/content/content.h @@ -28,8 +28,12 @@ #include +#include + #include "utils/config.h" #include "utils/errors.h" +#include "utils/http.h" +#include "content/content_factory.h" #include "content/content_type.h" #include "desktop/mouse.h" #include "desktop/plot_style.h" @@ -88,11 +92,7 @@ union content_msg_data { struct llcache_handle *download; }; - /* The following are for hlcache */ -content_type content_lookup(const char *mime_type); -struct content *content_create(struct llcache_handle *llcache, - const char *fallback_charset, bool quirks); void content_destroy(struct content *c); bool content_add_user(struct content *h, @@ -138,7 +138,7 @@ void content_close(struct hlcache_handle *h); /* Member accessors */ content_type content_get_type(struct hlcache_handle *c); -const char *content_get_mime_type(struct hlcache_handle *c); +lwc_string *content_get_mime_type(struct hlcache_handle *c); const char *content_get_url(struct hlcache_handle *c); const char *content_get_title(struct hlcache_handle *c); content_status content_get_status(struct hlcache_handle *c); -- cgit v1.2.3