mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update for new libcss API.

Browse Source
This commit is contained in:
Michael Drake 2013-12-13 20:25:08 +00:00
parent a7499820ba
commit e4c50bd58a
8 changed files with 92 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/css.c
View File

@ -226,7 +226,7 @@ static nserror nscss_create_css_data(struct content_css_data *c,
params.font = NULL;
params.font_pw = NULL;
error = css_stylesheet_create(&params, ns_realloc, NULL, &c->sheet);
error = css_stylesheet_create(&params, &c->sheet);
if (error != CSS_OK) {
return NSERROR_NOMEM;
}
@ -783,9 +783,7 @@ css_error nscss_register_import(struct content_css_data *c,
params.font = NULL;
params.font_pw = NULL;
error = css_stylesheet_create(&params,
ns_realloc, NULL,
&blank_import);
error = css_stylesheet_create(&params, &blank_import);
if (error != CSS_OK) {
return error;
}

238
css/select.c
View File

@ -94,6 +94,10 @@ static css_error node_presentational_hint(void *pw, void *node,
uint32_t property, css_hint *hint);
static css_error ua_default_for_property(void *pw, uint32_t property,
css_hint *hint);
static css_error set_libcss_node_data(void *pw, void *node,
void *libcss_node_data);
static css_error get_libcss_node_data(void *pw, void *node,
void **libcss_node_data);
static int cmp_colour_name(const void *a, const void *b);
static bool parse_named_colour(const char *data, css_color *result);
@ -104,8 +108,7 @@ static bool parse_number(const char *data, bool non_negative, bool real,
static bool parse_font_size(const char *size, uint8_t *val,
css_fixed *len, css_unit *unit);
static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx,
css_allocator_fn, void *pw);
static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx);
static bool isWhitespace(char c);
static bool isHex(char c);
@ -151,7 +154,9 @@ static css_select_handler selection_handler = {
node_is_lang,
node_presentational_hint,
ua_default_for_property,
nscss_compute_font_size
nscss_compute_font_size,
set_libcss_node_data,
get_libcss_node_data
};
/**
@ -162,13 +167,10 @@ static css_select_handler selection_handler = {
* \param charset Charset of data, or NULL if unknown
* \param url URL of document containing data
* \param allow_quirks True to permit CSS parsing quirks
* \param alloc Memory allocation function
* \param pw Private word for allocator
* \return Pointer to stylesheet, or NULL on failure.
*/
css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
const char *charset, const char *url, bool allow_quirks,
css_allocator_fn alloc, void *pw)
const char *charset, const char *url, bool allow_quirks)
{
css_stylesheet_params params;
css_stylesheet *sheet;
@ -190,7 +192,7 @@ css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
params.font = NULL;
params.font_pw = NULL;
error = css_stylesheet_create(&params, alloc, pw, &sheet);
error = css_stylesheet_create(&params, &sheet);
if (error != CSS_OK) {
LOG(("Failed creating sheet: %d", error));
return NULL;
@ -213,43 +215,12 @@ css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
return sheet;
}
#ifdef PRINT_NODE_BLOOM_DETAILS
/* Count bits set in uint32_t */
static int bits_set(uint32_t n) {
n = n - ((n >> 1) & 0x55555555);
n = (n & 0x33333333) + ((n >> 2) & 0x33333333);
n = (n + (n >> 4)) & 0x0f0f0f0f;
n = n + (n >> 8);
n = n + (n >> 16);
return n & 0x0000003f;
}
/* Node bloom instrumentation ouput display. */
static void print_node_bloom_details(css_bloom bloom[CSS_BLOOM_SIZE])
{
printf("Node bloom:\t");
int total = 0, i;
int set[CSS_BLOOM_SIZE];
for (i = 0; i < CSS_BLOOM_SIZE; i++) {
set[i] = bits_set(bloom[i]);
total += set[i];
}
printf("bits set:");
for (i = 0; i < CSS_BLOOM_SIZE; i++) {
printf(" %2i", set[i]);
}
printf(" (total:%4i of %i) saturation: %3i%%\n", total,
(32 * CSS_BLOOM_SIZE),
(100 * total) / (32 * CSS_BLOOM_SIZE));
}
#endif
/* Handler for libdom node user data
* We store our libcss selection bloom filter on the DOM node. */
/* Handler for libcss_node_data, stored as libdom node user data */
static void nscss_dom_user_data_handler(dom_node_operation operation,
dom_string *key, void *data, struct dom_node *src,
struct dom_node *dst)
{
css_error error;
bool match;
if (lwc_string_isequal(corestring_dom_key_css_bloom, key, &match) !=
@ -259,15 +230,31 @@ static void nscss_dom_user_data_handler(dom_node_operation operation,
switch (operation) {
case DOM_NODE_CLONED:
case DOM_NODE_IMPORTED:
case DOM_NODE_RENAMED:
case DOM_NODE_ADOPTED:
/* TODO: Do something about these.
* For now, just cautiously fall through to delete.
*/
case DOM_NODE_DELETED:
free(data);
error = css_libcss_node_data_handler(&selection_handler,
CSS_NODE_CLONED,
NULL, src, dst, data);
if (error != CSS_OK)
LOG(("Failed to clone libcss_node_data."));
break;
case DOM_NODE_RENAMED:
error = css_libcss_node_data_handler(&selection_handler,
CSS_NODE_MODIFIED,
NULL, src, NULL, data);
if (error != CSS_OK)
LOG(("Failed to update libcss_node_data."));
break;
case DOM_NODE_IMPORTED:
case DOM_NODE_ADOPTED:
case DOM_NODE_DELETED:
error = css_libcss_node_data_handler(&selection_handler,
CSS_NODE_DELETED,
NULL, src, NULL, data);
if (error != CSS_OK)
LOG(("Failed to delete libcss_node_data."));
break;
default:
LOG(("User data operation not handled."));
assert(0);
@ -281,65 +268,22 @@ static void nscss_dom_user_data_handler(dom_node_operation operation,
* \param n Element to select for
* \param media Permitted media types
* \param inline_style Inline style associated with element, or NULL
* \param alloc Memory allocation function
* \param pw Private word for allocator
* \return Pointer to selection results (containing partial computed styles),
* or NULL on failure
*/
css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
uint64_t media, const css_stylesheet *inline_style,
css_allocator_fn alloc, void *pw)
uint64_t media, const css_stylesheet *inline_style)
{
css_select_results *styles;
css_bloom *bloom = NULL;
dom_exception err;
css_error error;
/* Create the node's bloom */
ctx->bloom = calloc(sizeof(css_bloom), CSS_BLOOM_SIZE);
if (ctx->bloom == NULL) {
return NULL;
}
/* Get parent node */
ctx->parent = NULL;
dom_element_parent_node((struct dom_element *) n, &(ctx->parent));
/* Get parent node's bloom */
if (ctx->parent != NULL) {
err = dom_node_get_user_data(ctx->parent,
corestring_dom_key_css_bloom, (void *) &bloom);
if (err != DOM_NO_ERR) {
dom_node_unref(ctx->parent);
return NULL;
}
/* TODO: no bloom; walk up the tree to generate it. */
assert(bloom != NULL);
} else {
/* No parents means empty bloom. Just use node bloom. */
bloom = ctx->bloom;
}
/* Select style for node */
ctx->current = n;
error = css_select_style(ctx->ctx, n, bloom, media, inline_style,
error = css_select_style(ctx->ctx, n, media, inline_style,
&selection_handler, ctx, &styles);
if (error != CSS_OK) {
return NULL;
}
/* Merge parent bloom into node bloom */
css_bloom_merge(bloom, ctx->bloom);
#ifdef PRINT_NODE_BLOOM_DETAILS
print_node_bloom_details(ctx->bloom);
#endif
/* Set this node's bloom */
/* TODO: For now, this is LEAKED. Move it into libdom? */
dom_node_set_user_data(n, corestring_dom_key_css_bloom, ctx->bloom,
nscss_dom_user_data_handler, (void *) &bloom);
return styles;
}
@ -347,17 +291,14 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
* Get an initial style
*
* \param ctx CSS selection context
* \param alloc Memory allocation function
* \param pw Private word for allocator
* \return Pointer to partial computed style, or NULL on failure
*/
css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx,
css_allocator_fn alloc, void *pw)
css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
{
css_computed_style *style;
css_error error;
error = css_computed_style_create(alloc, pw, &style);
error = css_computed_style_create(&style);
if (error != CSS_OK)
return NULL;
@ -375,18 +316,15 @@ css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx,
*
* \param ctx CSS selection context
* \param parent Parent style to cascade inherited properties from
* \param alloc Memory allocation function
* \param pw Private word for allocator
* \return Pointer to blank style, or NULL on failure
*/
css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
const css_computed_style *parent,
css_allocator_fn alloc, void *pw)
const css_computed_style *parent)
{
css_computed_style *partial;
css_error error;
partial = nscss_get_initial_style(ctx, alloc, pw);
partial = nscss_get_initial_style(ctx);
if (partial == NULL)
return NULL;
@ -558,7 +496,6 @@ bool nscss_parse_colour(const char *data, css_color *result)
*/
css_error node_name(void *pw, void *node, css_qname *qname)
{
nscss_select_ctx *ctx = (nscss_select_ctx *) pw;
dom_node *n = node;
dom_string *name;
dom_exception err;
@ -575,21 +512,6 @@ css_error node_name(void *pw, void *node, css_qname *qname)
return CSS_NOMEM;
}
/* If 'n' is the element we are currently selecting for,
* add element name to the node's bloom. */
if (n == ctx->current) {
/* Element names are case insensitive in HTML */
if (qname->name->insensitive == NULL) {
if (lwc__intern_caseless_string(qname->name) !=
lwc_error_ok) {
dom_string_unref(name);
return CSS_NOMEM;
}
}
css_bloom_add_hash(ctx->bloom, lwc_string_hash_value(
qname->name->insensitive));
}
dom_string_unref(name);
return CSS_OK;
@ -612,10 +534,8 @@ css_error node_name(void *pw, void *node, css_qname *qname)
css_error node_classes(void *pw, void *node,
lwc_string ***classes, uint32_t *n_classes)
{
nscss_select_ctx *ctx = (nscss_select_ctx *) pw;
dom_node *n = node;
dom_exception err;
unsigned int i;
*classes = NULL;
*n_classes = 0;
@ -624,34 +544,7 @@ css_error node_classes(void *pw, void *node,
if (err != DOM_NO_ERR)
return CSS_NOMEM;
/* If 'n' is the element we are currently selecting for,
* add class names to the node's bloom. */
if (n == ctx->current) {
lwc_string *s;
for (i = 0; i < (*n_classes); i++) {
s = (*classes)[i];
/* TODO: remain case sensitive in standards mode */
if (s->insensitive == NULL) {
if (lwc__intern_caseless_string(s) !=
lwc_error_ok) {
goto error;
}
}
css_bloom_add_hash(ctx->bloom,
lwc_string_hash_value(s->insensitive));
}
}
return CSS_OK;
error:
for (i = 0; i < (*n_classes); i++)
lwc_string_unref((*classes)[i]);
free(*classes);
return CSS_NOMEM;
}
/**
@ -665,7 +558,6 @@ error:
*/
css_error node_id(void *pw, void *node, lwc_string **id)
{
nscss_select_ctx *ctx = (nscss_select_ctx *) pw;
dom_node *n = node;
dom_string *attr;
dom_exception err;
@ -683,18 +575,6 @@ css_error node_id(void *pw, void *node, lwc_string **id)
dom_string_unref(attr);
return CSS_NOMEM;
}
if (n == ctx->current) {
/* TODO: remain case sensitive in standards mode */
if ((*id)->insensitive == NULL) {
if (lwc__intern_caseless_string(*id) !=
lwc_error_ok) {
dom_string_unref(attr);
return CSS_NOMEM;
}
}
css_bloom_add_hash(ctx->bloom, lwc_string_hash_value(
(*id)->insensitive));
}
dom_string_unref(attr);
}
@ -3192,6 +3072,40 @@ css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint)
return CSS_OK;
}
css_error set_libcss_node_data(void *pw, void *node, void *libcss_node_data)
{
dom_node *n = node;
dom_exception err;
void *old_node_data;
/* Set this node's node data */
err = dom_node_set_user_data(n, corestring_dom_key_css_bloom,
libcss_node_data, nscss_dom_user_data_handler,
(void *) &old_node_data);
if (err != DOM_NO_ERR) {
return CSS_NOMEM;
}
assert(old_node_data == NULL);
return CSS_OK;
}
css_error get_libcss_node_data(void *pw, void *node, void **libcss_node_data)
{
dom_node *n = node;
dom_exception err;
/* Get this node's node data */
err = dom_node_get_user_data(n, corestring_dom_key_css_bloom,
libcss_node_data);
if (err != DOM_NO_ERR) {
return CSS_NOMEM;
}
return CSS_OK;
}
/**
* Mapping of colour name to CSS color
*/

13
css/select.h
View File

@ -37,23 +37,16 @@ typedef struct nscss_select_ctx
bool quirks;
nsurl *base_url;
lwc_string *universal;
dom_node *current;
dom_element *parent;
css_bloom *bloom;
} nscss_select_ctx;
css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
const char *charset, const char *url, bool allow_quirks,
css_allocator_fn alloc, void *pw);
const char *charset, const char *url, bool allow_quirks);
css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
uint64_t media, const css_stylesheet *inline_style,
css_allocator_fn alloc, void *pw);
uint64_t media, const css_stylesheet *inline_style);
css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
const css_computed_style *parent,
css_allocator_fn alloc, void *pw);
const css_computed_style *parent);
css_error nscss_compute_font_size(void *pw, const css_hint *parent,
css_hint *size);

18
render/box.c
View File

@ -53,24 +53,6 @@ static bool box_nearest_text_box(struct box *box, int bx, int by,
#define box_is_float(box) (box->type == BOX_FLOAT_LEFT || \
box->type == BOX_FLOAT_RIGHT)
/**
* Allocator
*
* \param ptr Pointer to reallocate, or NULL for new allocation
* \param size Number of bytes requires
* \param pw Allocation context
* \return Pointer to allocated block, or NULL on failure
*/
void *box_style_alloc(void *ptr, size_t len, void *pw)
{
if (len == 0) {
free(ptr);
return NULL;
}
return realloc(ptr, len);
}
/**
* Destructor for box nodes which own styles
*

1
render/box.h
View File

@ -315,7 +315,6 @@ extern const char *TARGET_BLANK;
void *box_style_alloc(void *ptr, size_t len, void *pw);
struct box * box_create(css_select_results *styles, css_computed_style *style,
bool style_owned, nsurl *href, const char *target,
const char *title, lwc_string *id, void *context);

6
render/box_construct.c
View File

@ -1442,8 +1442,7 @@ css_select_results *box_get_style(html_content *c,
dom_string_byte_length(s),
c->encoding,
nsurl_access(content_get_url(&c->base)),
c->quirks != DOM_DOCUMENT_QUIRKS_MODE_NONE,
box_style_alloc, NULL);
c->quirks != DOM_DOCUMENT_QUIRKS_MODE_NONE);
dom_string_unref(s);
@ -1458,8 +1457,7 @@ css_select_results *box_get_style(html_content *c,
ctx.universal = c->universal;
/* Select partial style for element */
styles = nscss_get_style(&ctx, n, CSS_MEDIA_SCREEN, inline_style,
box_style_alloc, NULL);
styles = nscss_get_style(&ctx, n, CSS_MEDIA_SCREEN, inline_style);
/* No longer need inline style */
if (inline_style != NULL)

24
render/box_normalise.c
View File

@ -156,8 +156,7 @@ bool box_normalise_block(struct box *block, html_content *c)
ctx.base_url = c->base_url;
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx, block->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, block->style);
if (style == NULL)
return false;
@ -258,8 +257,7 @@ bool box_normalise_table(struct box *table, html_content * c)
ctx.base_url = c->base_url;
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx, table->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, table->style);
if (style == NULL) {
free(col_info.spans);
return false;
@ -345,8 +343,7 @@ bool box_normalise_table(struct box *table, html_content * c)
ctx.base_url = c->base_url;
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx, table->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, table->style);
if (style == NULL) {
free(col_info.spans);
return false;
@ -361,8 +358,7 @@ bool box_normalise_table(struct box *table, html_content * c)
}
row_group->type = BOX_TABLE_ROW_GROUP;
style = nscss_get_blank_style(&ctx, row_group->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, row_group->style);
if (style == NULL) {
box_free(row_group);
free(col_info.spans);
@ -482,8 +478,7 @@ bool box_normalise_table_spans(struct box *table, struct span_info *spans,
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx,
table_row->style,
box_style_alloc, NULL);
table_row->style);
if (style == NULL)
return false;
@ -591,8 +586,7 @@ bool box_normalise_table_row_group(struct box *row_group,
ctx.base_url = c->base_url;
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx, row_group->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, row_group->style);
if (style == NULL)
return false;
@ -666,8 +660,7 @@ bool box_normalise_table_row_group(struct box *row_group,
ctx.base_url = c->base_url;
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx, row_group->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, row_group->style);
if (style == NULL) {
return false;
}
@ -736,8 +729,7 @@ bool box_normalise_table_row(struct box *row,
ctx.base_url = c->base_url;
ctx.universal = c->universal;
style = nscss_get_blank_style(&ctx, row->style,
box_style_alloc, NULL);
style = nscss_get_blank_style(&ctx, row->style);
if (style == NULL)
return false;

2
render/html_css.c
View File

@ -596,7 +596,7 @@ html_css_new_selection_context(html_content *c, css_select_ctx **ret_select_ctx)
}
/* Create selection context */
css_ret = css_select_ctx_create(ns_realloc, c, &select_ctx);
css_ret = css_select_ctx_create(&select_ctx);
if (css_ret != CSS_OK) {
return css_error_to_nserror(css_ret);
}