From 850160c40f4eb7d1aaa3be575ada842eec584dbb Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 29 Jan 2011 14:53:18 +0000 Subject: Reflect new css_stylesheet_create API svn path=/trunk/netsurf/; revision=11523 --- css/css.c | 41 +++++++++++++++++++++++++++++++---------- css/select.c | 18 +++++++++++++++--- 2 files changed, 46 insertions(+), 13 deletions(-) (limited to 'css') diff --git a/css/css.c b/css/css.c index 7ed972134..5616403ef 100644 --- a/css/css.c +++ b/css/css.c @@ -99,6 +99,7 @@ nserror nscss_create_css_data(struct content_css_data *c, const char *url, const char *charset, bool quirks) { css_error error; + css_stylesheet_params params; c->import_count = 0; c->imports = NULL; @@ -107,12 +108,20 @@ nserror nscss_create_css_data(struct content_css_data *c, else c->charset = NULL; - error = css_stylesheet_create(CSS_LEVEL_21, charset, - url, NULL, quirks, false, - ns_realloc, NULL, - nscss_resolve_url, NULL, - NULL, NULL, - &c->sheet); + params.level = CSS_LEVEL_DEFAULT; + params.charset = charset; + params.url = url; + params.title = NULL; + params.allow_quirks = quirks; + params.inline_style = false; + params.resolve = nscss_resolve_url; + params.resolve_pw = NULL; + params.import = NULL; + params.import_pw = NULL; + params.color = NULL; + params.color_pw = NULL; + + error = css_stylesheet_create(¶ms, ns_realloc, NULL, &c->sheet); if (error != CSS_OK) { return NSERROR_NOMEM; } @@ -439,11 +448,23 @@ css_error nscss_import_complete(struct content_css_data *c, /* Create a blank sheet if needed. */ if (blank_import == NULL) { - error = css_stylesheet_create(CSS_LEVEL_DEFAULT, - NULL, "", NULL, false, false, + css_stylesheet_params params; + + params.level = CSS_LEVEL_DEFAULT; + params.charset = NULL; + params.url = ""; + params.title = NULL; + params.allow_quirks = false; + params.inline_style = false; + params.resolve = nscss_resolve_url; + params.resolve_pw = NULL; + params.import = NULL; + params.import_pw = NULL; + params.color = NULL; + params.color_pw = NULL; + + error = css_stylesheet_create(¶ms, ns_realloc, NULL, - nscss_resolve_url, NULL, - NULL, NULL, &blank_import); if (error != CSS_OK) { return error; diff --git a/css/select.c b/css/select.c index 4054f6185..2aae5fbae 100644 --- a/css/select.c +++ b/css/select.c @@ -134,12 +134,24 @@ css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len, const char *charset, const char *url, bool allow_quirks, css_allocator_fn alloc, void *pw) { + css_stylesheet_params params; css_stylesheet *sheet; css_error error; - error = css_stylesheet_create(CSS_LEVEL_DEFAULT, charset, url, NULL, - allow_quirks, true, alloc, pw, nscss_resolve_url, - NULL, NULL, NULL, &sheet); + params.level = CSS_LEVEL_DEFAULT; + params.charset = charset; + params.url = url; + params.title = NULL; + params.allow_quirks = allow_quirks; + params.inline_style = true; + params.resolve = nscss_resolve_url; + params.resolve_pw = NULL; + params.import = NULL; + params.import_pw = NULL; + params.color = NULL; + params.color_pw = NULL; + + error = css_stylesheet_create(¶ms, alloc, pw, &sheet); if (error != CSS_OK) { LOG(("Failed creating sheet: %d", error)); return NULL; -- cgit v1.2.3