From 637b4e5fc0ddb5db17b09778567cbad373d36beb Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 4 May 2019 10:37:45 +0100 Subject: CSS: Update for change to libcss imported sheet API. The media is not exposed and sent back into libcss now. Signed-off-by: Michael Drake --- content/handlers/css/css.c | 6 ++---- content/handlers/css/css.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'content/handlers/css') diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c index 93efd6a1b..dda044d15 100644 --- a/content/handlers/css/css.c +++ b/content/handlers/css/css.c @@ -98,7 +98,7 @@ static void nscss_destroy_css_data(struct content_css_data *c); static void nscss_content_done(struct content_css_data *css, void *pw); static css_error nscss_handle_import(void *pw, css_stylesheet *parent, - lwc_string *url, uint64_t media); + lwc_string *url); static nserror nscss_import(hlcache_handle *handle, const hlcache_event *event, void *pw); static css_error nscss_import_complete(nscss_import_ctx *ctx); @@ -512,11 +512,10 @@ void nscss_content_done(struct content_css_data *css, void *pw) * \param pw CSS object requesting the import * \param parent Stylesheet requesting the import * \param url URL of the imported sheet - * \param media Applicable media for the imported sheet * \return CSS_OK on success, appropriate error otherwise */ css_error nscss_handle_import(void *pw, css_stylesheet *parent, - lwc_string *url, uint64_t media) + lwc_string *url) { content_type accept = CONTENT_CSS; struct content_css_data *c = pw; @@ -562,7 +561,6 @@ css_error nscss_handle_import(void *pw, css_stylesheet *parent, } /* Create content */ - c->imports[c->import_count].media = media; /** \todo Why aren't we getting a relative url part, to join? */ nerror = nsurl_create(lwc_string_data(url), &ns_url); diff --git a/content/handlers/css/css.h b/content/handlers/css/css.h index 4b38829f0..5e2b64a38 100644 --- a/content/handlers/css/css.h +++ b/content/handlers/css/css.h @@ -32,7 +32,6 @@ struct hlcache_handle; */ struct nscss_import { struct hlcache_handle *c; /**< Content containing sheet */ - uint64_t media; /**< Media types that sheet applies to */ }; /** -- cgit v1.2.3