Author: jmb Date: Sun Feb 28 11:54:31 2010 New Revision: 10089 URL: http://source.netsurf-browser.org?rev=10089&view=rev Log: s/struct content/hlcache_handle/ in nscss_get_imports API Modified: branches/jmb/new-cache/css/css.c branches/jmb/new-cache/css/css.h Modified: branches/jmb/new-cache/css/css.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/css/css.c?rev=10... ============================================================================== --- branches/jmb/new-cache/css/css.c (original) +++ branches/jmb/new-cache/css/css.c Sun Feb 28 11:54:31 2010 @@ -23,6 +23,7 @@ #include "content/content_protected.h" #include "content/fetch.h" #include "content/fetchcache.h" +#include "content/hlcache.h" #include "css/css.h" #include "css/internal.h" #include "desktop/gui.h" @@ -353,12 +354,15 @@ /** * Retrieve imported stylesheets * - * \param c Stylesheet containing imports + * \param h Stylesheet containing imports * \param n Pointer to location to receive number of imports * \return Pointer to array of imported stylesheets */ -struct nscss_import *nscss_get_imports(struct content *c, uint32_t *n) -{ +struct nscss_import *nscss_get_imports(hlcache_handle *h, uint32_t *n) +{ + struct content *c = hlcache_handle_get_content(h); + + assert(c != NULL); assert(c->type == CONTENT_CSS); assert(n != NULL); Modified: branches/jmb/new-cache/css/css.h URL: http://source.netsurf-browser.org/branches/jmb/new-cache/css/css.h?rev=10... ============================================================================== --- branches/jmb/new-cache/css/css.h (original) +++ branches/jmb/new-cache/css/css.h Sun Feb 28 11:54:31 2010 @@ -26,6 +26,7 @@ #include "utils/errors.h" struct content; +struct hlcache_handle; struct nscss_import; /** @@ -43,6 +44,7 @@ * Imported stylesheet record */ struct nscss_import { +//newcache: should be hlcache_handle struct content *c; /**< Content containing sheet */ uint64_t media; /**< Media types that sheet applies to */ }; @@ -64,7 +66,7 @@ lwc_context *dict); void nscss_destroy_css_data(struct content_css_data *c); -struct nscss_import *nscss_get_imports(struct content *c, uint32_t *n); +struct nscss_import *nscss_get_imports(struct hlcache_handle *h, uint32_t *n); #endif