summaryrefslogtreecommitdiff
path: root/src/select/propset.h
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-12-13 20:16:52 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2013-12-13 20:16:52 +0000
commit1b95fec601a3d006ba6b99e1dea3f61c3c8318fc (patch)
tree1a0c3a78afe1db919ff6b4c56a6c3f2e01d03607 /src/select/propset.h
parente3372335ec1628e1d6ef1a4fd63b11bb47f2e0e6 (diff)
downloadlibcss-1b95fec601a3d006ba6b99e1dea3f61c3c8318fc.tar.gz
libcss-1b95fec601a3d006ba6b99e1dea3f61c3c8318fc.tar.bz2
Various changes which modify API and ABI:
- Remove client allocation function. - Change node_classes callback not to yield array ownership to libcss. - Node bloom filters now built by, during selection libcss. - Added selection callbacks to get and set data on document nodes. Test suite, example, and documentation updated to match.
Diffstat (limited to 'src/select/propset.h')
-rw-r--r--src/select/propset.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/select/propset.h b/src/select/propset.h
index ddd5642..5af7e8b 100644
--- a/src/select/propset.h
+++ b/src/select/propset.h
@@ -41,8 +41,7 @@ static const css_computed_uncommon default_uncommon = {
#define ENSURE_UNCOMMON do { \
if (style->uncommon == NULL) { \
- style->uncommon = style->alloc(NULL, \
- sizeof(css_computed_uncommon), style->pw); \
+ style->uncommon = malloc(sizeof(css_computed_uncommon));\
if (style->uncommon == NULL) \
return CSS_NOMEM; \
\
@@ -65,8 +64,7 @@ static const css_computed_page default_page = {
#define ENSURE_PAGE do { \
if (style->page == NULL) { \
- style->page = style->alloc(NULL, \
- sizeof(css_computed_page), style->pw); \
+ style->page = malloc(sizeof(css_computed_page)); \
if (style->page == NULL) \
return CSS_NOMEM; \
\
@@ -264,7 +262,7 @@ static inline css_error set_counter_increment(
lwc_string_unref(c->name);
if (oldcounters != counters)
- style->alloc(oldcounters, 0, style->pw);
+ free(oldcounters);
}
return CSS_OK;
@@ -304,7 +302,7 @@ static inline css_error set_counter_reset(
lwc_string_unref(c->name);
if (oldcounters != counters)
- style->alloc(oldcounters, 0, style->pw);
+ free(oldcounters);
}
return CSS_OK;
@@ -344,7 +342,7 @@ static inline css_error set_cursor(
lwc_string_unref(*s);
if (oldurls != urls)
- style->alloc(oldurls, 0, style->pw);
+ free(oldurls);
}
return CSS_OK;
@@ -482,7 +480,7 @@ static inline css_error set_content(
}
if (oldcontent != content)
- style->alloc(oldcontent, 0, style->pw);
+ free(oldcontent);
}
return CSS_OK;
@@ -717,7 +715,7 @@ static inline css_error set_quotes(
lwc_string_unref(*s);
if (oldquotes != quotes)
- style->alloc(oldquotes, 0, style->pw);
+ free(oldquotes);
}
return CSS_OK;
@@ -1641,7 +1639,7 @@ static inline css_error set_font_family(
lwc_string_unref(*s);
if (oldnames != names)
- style->alloc(oldnames, 0, style->pw);
+ free(oldnames);
}
return CSS_OK;