summaryrefslogtreecommitdiff
path: root/content/hlcache.h
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-05-06 20:40:09 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-05-06 20:40:09 +0000
commite71691bae890040b83cfd54a2d9a1097d5026866 (patch)
tree96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /content/hlcache.h
parente77b1a29550e4753f771848705975295a6ebe99e (diff)
downloadnetsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz
netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'content/hlcache.h')
-rw-r--r--content/hlcache.h6
1 files changed, 2 insertions, 4 deletions
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