diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2016-11-19 14:55:15 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2016-11-19 14:55:15 +0000 |
| commit | d986c1c356aba25bdf0b977133b387fbdad5aa90 (patch) | |
| tree | dc89f39bb687a2fd92042b5c8c824eda4c714c79 /include/libcss | |
| parent | 2786e780f20eb45f3ee3f18585d23555a06a1431 (diff) | |
| parent | 216d0931dd56af5043218ccdf3dd99d5c6216979 (diff) | |
| download | libcss-d986c1c356aba25bdf0b977133b387fbdad5aa90.tar.gz libcss-d986c1c356aba25bdf0b977133b387fbdad5aa90.tar.bz2 | |
Merge branch 'tlsa/shared-styles'
Diffstat (limited to 'include/libcss')
| -rw-r--r-- | include/libcss/computed.h | 11 | ||||
| -rw-r--r-- | include/libcss/select.h | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/libcss/computed.h b/include/libcss/computed.h index 3470da8..c7e77e0 100644 --- a/include/libcss/computed.h +++ b/include/libcss/computed.h @@ -76,19 +76,16 @@ typedef struct css_computed_content_item { } data; } css_computed_content_item; -css_error css_computed_style_create(css_computed_style **result); css_error css_computed_style_destroy(css_computed_style *style); -css_error css_computed_style_initialise(css_computed_style *style, - struct css_select_handler *handler, void *pw); - -css_error css_computed_style_compose(const css_computed_style *parent, - const css_computed_style *child, +css_error css_computed_style_compose( + const css_computed_style *restrict parent, + const css_computed_style *restrict child, css_error (*compute_font_size)(void *pw, const struct css_hint *parent, struct css_hint *size), void *pw, - css_computed_style *result); + css_computed_style **restrict result); /****************************************************************************** * Property accessors below here * diff --git a/include/libcss/select.h b/include/libcss/select.h index bd2fed2..3f1e14a 100644 --- a/include/libcss/select.h +++ b/include/libcss/select.h @@ -217,6 +217,9 @@ css_error css_select_ctx_count_sheets(css_select_ctx *ctx, uint32_t *count); css_error css_select_ctx_get_sheet(css_select_ctx *ctx, uint32_t index, const css_stylesheet **sheet); +css_error css_select_default_style(css_select_ctx *ctx, + css_select_handler *handler, void *pw, + css_computed_style **style); css_error css_select_style(css_select_ctx *ctx, void *node, uint64_t media, const css_stylesheet *inline_style, css_select_handler *handler, void *pw, @@ -227,7 +230,7 @@ css_error css_select_font_faces(css_select_ctx *ctx, uint64_t media, lwc_string *font_family, css_select_font_faces_results **result); css_error css_select_font_faces_results_destroy( - css_select_font_faces_results *results); + css_select_font_faces_results *results); #ifdef __cplusplus } |