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/hlcache.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'content/hlcache.h') diff --git a/content/hlcache.h b/content/hlcache.h index c4e10915a..2372158e1 100644 --- a/content/hlcache.h +++ b/content/hlcache.h @@ -101,7 +101,7 @@ nserror hlcache_poll(void); * \param cb Callback to handle object events * \param pw Pointer to client-specific data for callback * \param child Child retrieval context, or NULL for top-level content - * \param accepted_types Array of acceptable content types, or NULL for any + * \param accepted_types Bitmap of acceptable content types * \param result Pointer to location to recieve cache handle * \return NSERROR_OK on success, appropriate error otherwise * @@ -109,8 +109,6 @@ nserror hlcache_poll(void); * The quirks field is ignored for child contents whose behaviour is not * affected by quirks mode. * - * The \a accepted_types array must be terminated with CONTENT_UNKNOWN - * * \todo The above rules should be encoded in the handler_map. * * \todo Is there any way to sensibly reduce the number of parameters here? @@ -119,7 +117,7 @@ nserror hlcache_handle_retrieve(const char *url, uint32_t flags, const char *referer, llcache_post_data *post, hlcache_handle_callback cb, void *pw, hlcache_child_context *child, - const content_type *accepted_types, hlcache_handle **result); + content_type accepted_types, hlcache_handle **result); /** * Release a high-level cache handle -- cgit v1.2.3