summaryrefslogtreecommitdiff
path: root/src/select/properties/helpers.c
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/properties/helpers.c
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/properties/helpers.c')
-rw-r--r--src/select/properties/helpers.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/select/properties/helpers.c b/src/select/properties/helpers.c
index 28ecdcc..df076db 100644
--- a/src/select/properties/helpers.c
+++ b/src/select/properties/helpers.c
@@ -421,14 +421,12 @@ css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style,
val = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(css_code_t));
- temp = state->computed->alloc(counters,
+ temp = realloc(counters,
(n_counters + 1) *
- sizeof(css_computed_counter),
- state->computed->pw);
+ sizeof(css_computed_counter));
if (temp == NULL) {
if (counters != NULL) {
- state->computed->alloc(counters,
- 0, state->computed->pw);
+ free(counters);
}
return CSS_NOMEM;
}
@@ -455,11 +453,10 @@ css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style,
if (n_counters > 0) {
css_computed_counter *temp;
- temp = state->computed->alloc(counters,
- (n_counters + 1) * sizeof(css_computed_counter),
- state->computed->pw);
+ temp = realloc(counters, (n_counters + 1) *
+ sizeof(css_computed_counter));
if (temp == NULL) {
- state->computed->alloc(counters, 0, state->computed->pw);
+ free(counters);
return CSS_NOMEM;
}
@@ -475,11 +472,11 @@ css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style,
error = fun(state->computed, value, counters);
if (error != CSS_OK && n_counters > 0)
- state->computed->alloc(counters, 0, state->computed->pw);
+ free(counters);
return error;
} else if (n_counters > 0) {
- state->computed->alloc(counters, 0, state->computed->pw);
+ free(counters);
}
return CSS_OK;