Author: jmb
Date: Sun Jan 25 12:42:23 2009
New Revision: 6266
URL: http://source.netsurf-browser.org?rev=6266&view=rev
Log:
Simplify API of css_stylesheet_selector_create -- it's always used to create
element selectors. Everything else is handled via detail.
Modified:
trunk/libcss/src/parse/language.c
trunk/libcss/src/stylesheet.c
trunk/libcss/src/stylesheet.h
Modified: trunk/libcss/src/parse/language.c
URL:
http://source.netsurf-browser.org/trunk/libcss/src/parse/language.c?rev=6266&r1=6265&r2=6266&view=diff
==============================================================================
--- trunk/libcss/src/parse/language.c (original)
+++ trunk/libcss/src/parse/language.c Sun Jan 25 12:42:23 2009
@@ -812,8 +812,7 @@
if (token->type == CSS_TOKEN_IDENT || tokenIsChar(token, '*')) {
/* Have element name */
error = css_stylesheet_selector_create(c->sheet,
- CSS_SELECTOR_ELEMENT, token->idata, NULL,
- &selector);
+ token->idata, &selector);
if (error != CSS_OK)
return error;
@@ -821,8 +820,7 @@
} else {
/* Universal selector */
error = css_stylesheet_selector_create(c->sheet,
- CSS_SELECTOR_ELEMENT, c->strings[UNIVERSAL],
- NULL, &selector);
+ c->strings[UNIVERSAL], &selector);
if (error != CSS_OK)
return error;
Modified: trunk/libcss/src/stylesheet.c
URL:
http://source.netsurf-browser.org/trunk/libcss/src/stylesheet.c?rev=6266&r1=6265&r2=6266&view=diff
==============================================================================
--- trunk/libcss/src/stylesheet.c (original)
+++ trunk/libcss/src/stylesheet.c Sun Jan 25 12:42:23 2009
@@ -368,20 +368,17 @@
}
/**
- * Create a selector
+ * Create an element selector
*
* \param sheet The stylesheet context
- * \param type The type of selector to create
* \param name Name of selector
- * \param value Value of selector, or NULL
* \param selector Pointer to location to receive selector object
* \return CSS_OK on success,
* CSS_BADPARM on bad parameters,
* CSS_NOMEM on memory exhaustion
*/
css_error css_stylesheet_selector_create(css_stylesheet *sheet,
- css_selector_type type, const parserutils_hash_entry *name,
- const parserutils_hash_entry *value, css_selector **selector)
+ const parserutils_hash_entry *name, css_selector **selector)
{
css_selector *sel;
@@ -394,9 +391,9 @@
memset(sel, 0, sizeof(css_selector));
- sel->data.type = type;
+ sel->data.type = CSS_SELECTOR_ELEMENT;
sel->data.name = name;
- sel->data.value = value;
+ sel->data.value = NULL;
/** \todo specificity */
sel->specificity = 0;
Modified: trunk/libcss/src/stylesheet.h
URL:
http://source.netsurf-browser.org/trunk/libcss/src/stylesheet.h?rev=6266&r1=6265&r2=6266&view=diff
==============================================================================
--- trunk/libcss/src/stylesheet.h (original)
+++ trunk/libcss/src/stylesheet.h Sun Jan 25 12:42:23 2009
@@ -180,8 +180,7 @@
css_error css_stylesheet_style_destroy(css_stylesheet *sheet, css_style
*style);
css_error css_stylesheet_selector_create(css_stylesheet *sheet,
- css_selector_type type, const parserutils_hash_entry *name,
- const parserutils_hash_entry *value, css_selector **selector);
+ const parserutils_hash_entry *name, css_selector **selector);
css_error css_stylesheet_selector_destroy(css_stylesheet *sheet,
css_selector *selector);
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
