summaryrefslogtreecommitdiff
path: root/src/parse/properties/utils.c
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2010-03-27 16:10:57 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2010-03-27 16:10:57 +0000
commit80cfe125983eb126a9f8afd974196cf0bf347877 (patch)
treee6fe993a7ad2fc6859509b661d2d4f721e846e60 /src/parse/properties/utils.c
parent46e3a946d7b2f7d68f3753a37c6f68a732a36f01 (diff)
downloadlibcss-80cfe125983eb126a9f8afd974196cf0bf347877.tar.gz
libcss-80cfe125983eb126a9f8afd974196cf0bf347877.tar.bz2
Fix libcss to use new libwapcaplet behaviour.
TODO: update the tests to include a refcounting proof svn path=/trunk/libcss/; revision=10162
Diffstat (limited to 'src/parse/properties/utils.c')
-rw-r--r--src/parse/properties/utils.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/parse/properties/utils.c b/src/parse/properties/utils.c
index 8676015..a0370c2 100644
--- a/src/parse/properties/utils.c
+++ b/src/parse/properties/utils.c
@@ -91,8 +91,7 @@ css_error parse_colour_specifier(css_language *c,
return error;
} else if (token->type == CSS_TOKEN_FUNCTION) {
- if ((lwc_context_string_caseless_isequal(
- c->sheet->dictionary,
+ if ((lwc_string_caseless_isequal(
token->idata, c->strings[RGB],
&match) == lwc_error_ok && match)) {
int i;
@@ -335,8 +334,8 @@ css_error parse_named_colour(css_language *c, lwc_string *data,
bool match;
for (i = FIRST_COLOUR; i <= LAST_COLOUR; i++) {
- if (lwc_context_string_caseless_isequal(c->sheet->dictionary,
- data, c->strings[i], &match) == lwc_error_ok &&
+ if (lwc_string_caseless_isequal(data, c->strings[i],
+ &match) == lwc_error_ok &&
match)
break;
}
@@ -783,8 +782,7 @@ css_error comma_list_to_bytecode(css_language *c,
/* Insert into hash, if it's different
* from the name we already have */
- lerror = lwc_context_intern(
- c->sheet->dictionary,
+ lerror = lwc_intern_string(
(char *) buf, p - buf,
&newname);
if (lerror != lwc_error_ok) {
@@ -794,9 +792,7 @@ css_error comma_list_to_bytecode(css_language *c,
}
if (newname == name) {
- lwc_context_string_unref(
- c->sheet->dictionary,
- newname);
+ lwc_string_unref(newname);
}
name = newname;
@@ -806,8 +802,7 @@ css_error comma_list_to_bytecode(css_language *c,
* new name generated above.
*/
if (name == tok_idata) {
- lwc_context_string_ref(
- c->sheet->dictionary, name);
+ lwc_string_ref(name);
}
memcpy(ptr, &name, sizeof(name));
@@ -821,8 +816,7 @@ css_error comma_list_to_bytecode(css_language *c,
ptr += sizeof(opv);
}
- lwc_context_string_ref(c->sheet->dictionary,
- token->idata);
+ lwc_string_ref(token->idata);
memcpy(ptr, &token->idata, sizeof(token->idata));
ptr += sizeof(token->idata);