summaryrefslogtreecommitdiff
path: root/src/select/properties/helpers.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-01-05 00:44:04 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-01-05 00:44:04 +0000
commit4860bd14179e94a7d073714c1c5b21fd9c200dd7 (patch)
treed6343a55826ee6d6ae3801c0453dcce12a0e987e /src/select/properties/helpers.c
parente094fcbc9fcf39fb2d71cd521e8076f4703fa100 (diff)
downloadlibcss-4860bd14179e94a7d073714c1c5b21fd9c200dd7.tar.gz
libcss-4860bd14179e94a7d073714c1c5b21fd9c200dd7.tar.bz2
Simultaneously select styles for base + pseudo elements.
svn path=/trunk/libcss/; revision=11211
Diffstat (limited to 'src/select/properties/helpers.c')
-rw-r--r--src/select/properties/helpers.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/select/properties/helpers.c b/src/select/properties/helpers.c
index edc098c..8ce5fc6 100644
--- a/src/select/properties/helpers.c
+++ b/src/select/properties/helpers.c
@@ -107,7 +107,7 @@ css_error cascade_bg_border_color(uint32_t opv, css_style *style,
if (outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- return fun(state->result, value, color);
+ return fun(state->computed, value, color);
}
return CSS_OK;
@@ -137,7 +137,7 @@ css_error cascade_uri_none(uint32_t opv, css_style *style,
/** \todo lose fun != NULL once all properties have set routines */
if (fun != NULL && outranks_existing(getOpcode(opv),
isImportant(opv), state, isInherit(opv))) {
- return fun(state->result, value, uri);
+ return fun(state->computed, value, uri);
}
return CSS_OK;
@@ -188,7 +188,7 @@ css_error cascade_border_style(uint32_t opv, css_style *style,
if (outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- return fun(state->result, value);
+ return fun(state->computed, value);
}
return CSS_OK;
@@ -228,7 +228,7 @@ css_error cascade_border_width(uint32_t opv, css_style *style,
if (outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- return fun(state->result, value, length, unit);
+ return fun(state->computed, value, length, unit);
}
return CSS_OK;
@@ -262,7 +262,7 @@ css_error cascade_length_auto(uint32_t opv, css_style *style,
if (outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- return fun(state->result, value, length, unit);
+ return fun(state->computed, value, length, unit);
}
return CSS_OK;
@@ -296,7 +296,7 @@ css_error cascade_length_normal(uint32_t opv, css_style *style,
if (outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- return fun(state->result, value, length, unit);
+ return fun(state->computed, value, length, unit);
}
return CSS_OK;
@@ -330,7 +330,7 @@ css_error cascade_length_none(uint32_t opv, css_style *style,
if (outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- return fun(state->result, value, length, unit);
+ return fun(state->computed, value, length, unit);
}
return CSS_OK;
@@ -358,7 +358,7 @@ css_error cascade_length(uint32_t opv, css_style *style,
/** \todo lose fun != NULL once all properties have set routines */
if (fun != NULL && outranks_existing(getOpcode(opv),
isImportant(opv), state, isInherit(opv))) {
- return fun(state->result, value, length, unit);
+ return fun(state->computed, value, length, unit);
}
return CSS_OK;
@@ -382,7 +382,7 @@ css_error cascade_number(uint32_t opv, css_style *style,
/** \todo lose fun != NULL once all properties have set routines */
if (fun != NULL && outranks_existing(getOpcode(opv),
isImportant(opv), state, isInherit(opv))) {
- return fun(state->result, value, length);
+ return fun(state->computed, value, length);
}
return CSS_OK;
@@ -411,7 +411,7 @@ css_error cascade_page_break_after_before(uint32_t opv, css_style *style,
/** \todo lose fun != NULL */
if (fun != NULL && outranks_existing(getOpcode(opv),
isImportant(opv), state, isInherit(opv))) {
- return fun(state->result, value);
+ return fun(state->computed, value);
}
return CSS_OK;
@@ -444,14 +444,14 @@ css_error cascade_counter_increment_reset(uint32_t opv, css_style *style,
val = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(val));
- temp = state->result->alloc(counters,
+ temp = state->computed->alloc(counters,
(n_counters + 1) *
sizeof(css_computed_counter),
- state->result->pw);
+ state->computed->pw);
if (temp == NULL) {
if (counters != NULL) {
- state->result->alloc(counters,
- 0, state->result->pw);
+ state->computed->alloc(counters,
+ 0, state->computed->pw);
}
return CSS_NOMEM;
}
@@ -478,11 +478,11 @@ css_error cascade_counter_increment_reset(uint32_t opv, css_style *style,
if (n_counters > 0) {
css_computed_counter *temp;
- temp = state->result->alloc(counters,
+ temp = state->computed->alloc(counters,
(n_counters + 1) * sizeof(css_computed_counter),
- state->result->pw);
+ state->computed->pw);
if (temp == NULL) {
- state->result->alloc(counters, 0, state->result->pw);
+ state->computed->alloc(counters, 0, state->computed->pw);
return CSS_NOMEM;
}
@@ -496,13 +496,13 @@ css_error cascade_counter_increment_reset(uint32_t opv, css_style *style,
isInherit(opv))) {
css_error error;
- error = fun(state->result, value, counters);
+ error = fun(state->computed, value, counters);
if (error != CSS_OK && n_counters > 0)
- state->result->alloc(counters, 0, state->result->pw);
+ state->computed->alloc(counters, 0, state->computed->pw);
return error;
} else if (n_counters > 0) {
- state->result->alloc(counters, 0, state->result->pw);
+ state->computed->alloc(counters, 0, state->computed->pw);
}
return CSS_OK;