diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-21 14:57:28 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-21 14:57:28 +0000 |
commit | 22dc756a77e37611bfe26d408ec67143101a4973 (patch) | |
tree | c9b47564281bc28b3273345dd17cefe259201eca | |
parent | 8fade8540b2e642b6ebb4069ae10f0f51fbbdc32 (diff) | |
download | libcss-22dc756a77e37611bfe26d408ec67143101a4973.tar.gz libcss-22dc756a77e37611bfe26d408ec67143101a4973.tar.bz2 |
Remove pointless parameter
svn path=/trunk/libcss/; revision=8653
-rw-r--r-- | include/libcss/computed.h | 1 | ||||
-rw-r--r-- | include/libcss/select.h | 2 | ||||
-rw-r--r-- | src/select/computed.c | 9 | ||||
-rw-r--r-- | src/select/computed.h | 2 | ||||
-rw-r--r-- | test/select-auto.c | 6 |
5 files changed, 8 insertions, 12 deletions
diff --git a/include/libcss/computed.h b/include/libcss/computed.h index 49de644..459e361 100644 --- a/include/libcss/computed.h +++ b/include/libcss/computed.h @@ -341,7 +341,6 @@ css_error css_computed_style_compose(const css_computed_style *parent, const css_computed_style *child, css_error (*compute_font_size)(void *pw, const struct css_hint *parent, - bool may_clamp, struct css_hint *size), void *pw, css_computed_style *result); diff --git a/include/libcss/select.h b/include/libcss/select.h index bd85eaa..a3d18df 100644 --- a/include/libcss/select.h +++ b/include/libcss/select.h @@ -71,7 +71,7 @@ typedef struct css_select_handler { css_hint *hint); css_error (*compute_font_size)(void *pw, const css_hint *parent, - bool may_clamp, css_hint *size); + css_hint *size); } css_select_handler; css_error css_select_ctx_create(css_allocator_fn alloc, void *pw, diff --git a/src/select/computed.c b/src/select/computed.c index 8881d2c..1b6ec1e 100644 --- a/src/select/computed.c +++ b/src/select/computed.c @@ -203,7 +203,7 @@ css_error css_computed_style_initialise(css_computed_style *style, css_error css_computed_style_compose(const css_computed_style *parent, const css_computed_style *child, css_error (*compute_font_size)(void *pw, - const css_hint *parent, bool may_clamp, css_hint *size), + const css_hint *parent, css_hint *size), void *pw, css_computed_style *result) { @@ -252,7 +252,7 @@ css_error css_computed_style_compose(const css_computed_style *parent, css_error compute_absolute_values(const css_computed_style *parent, css_computed_style *style, css_error (*compute_font_size)(void *pw, - const css_hint *parent, bool may_clamp, css_hint *size), + const css_hint *parent, css_hint *size), void *pw) { css_hint psize, size, ex_size; @@ -269,8 +269,7 @@ css_error compute_absolute_values(const css_computed_style *parent, &size.data.length.value, &size.data.length.unit); - error = compute_font_size(pw, parent != NULL ? &psize : NULL, - true, &size); + error = compute_font_size(pw, parent != NULL ? &psize : NULL, &size); if (error != CSS_OK) return error; @@ -284,7 +283,7 @@ css_error compute_absolute_values(const css_computed_style *parent, ex_size.status = CSS_FONT_SIZE_DIMENSION; ex_size.data.length.value = INTTOFIX(1); ex_size.data.length.unit = CSS_UNIT_EX; - error = compute_font_size(pw, &size, false, &ex_size); + error = compute_font_size(pw, &size, &ex_size); if (error != CSS_OK) return error; diff --git a/src/select/computed.h b/src/select/computed.h index 4b0e1aa..5527742 100644 --- a/src/select/computed.h +++ b/src/select/computed.h @@ -14,7 +14,7 @@ css_error compute_absolute_values(const css_computed_style *parent, css_computed_style *style, css_error (*compute_font_size)(void *pw, - const css_hint *parent, bool may_clamp, css_hint *size), + const css_hint *parent, css_hint *size), void *pw); #endif diff --git a/test/select-auto.c b/test/select-auto.c index 673d283..7e1ff35 100644 --- a/test/select-auto.c +++ b/test/select-auto.c @@ -120,7 +120,7 @@ static css_error node_presentational_hint(void *pw, void *node, static css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint); static css_error compute_font_size(void *pw, const css_hint *parent, - bool may_clamp, css_hint *size); + css_hint *size); static css_select_handler select_handler = { node_name, @@ -1130,8 +1130,7 @@ css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint) return CSS_OK; } -css_error compute_font_size(void *pw, const css_hint *parent, - bool may_clamp, css_hint *size) +css_error compute_font_size(void *pw, const css_hint *parent, css_hint *size) { static css_hint_length sizes[] = { { FLTTOFIX(6.75), CSS_UNIT_PT }, @@ -1145,7 +1144,6 @@ css_error compute_font_size(void *pw, const css_hint *parent, const css_hint_length *parent_size; UNUSED(pw); - UNUSED(may_clamp); /* Grab parent size, defaulting to medium if none */ if (parent == NULL) { |