#include "svgtiny.h"
#include "svgtiny_internal.h"
+css_error svgtiny_resolve_url(void *pw, const char *base,
+ lwc_string *rel, lwc_string **abs);
+
/* select handler callbacks */
static css_error node_name(void *pw, void *node, css_qname *qname);
static css_error node_classes(void *pw, void *node,
static struct css_select_handler svgtiny_select_handler;
+/* Every call to svgtiny_select_style() needs this, so let's only make
+ * one copy. */
+static const css_media media_all = {
+ .type = CSS_MEDIA_ALL,
+};
+
+/**
+ * Convenient wrapper around css_select_style()
+ *
+ * \param state The current state of the libsvgtiny parser
+ * \param node The node that we're getting styles for
+ * \param inline_sheet The inline stylesheet for the given node
+ * \param result Address at which to store the results array
+ */
+css_error svgtiny_select_style(struct svgtiny_parse_state *state,
+ dom_element *node,
+ const css_stylesheet *inline_sheet,
+ css_select_results **result)
+{
+ return css_select_style(state->select_ctx,
+ node,
+ &state->unit_ctx,
+ &media_all,
+ inline_sheet,
+ &svgtiny_select_handler,
+ state,
+ result);
+}
+
/**
* Resolve a relative URL to an absolute one by doing nothing. This is
* the simplest possible implementation of a URL resolver, needed for
/* Start by checking to see if qname is the universal selector */
state = (struct svgtiny_parse_state *)pw;
- if (lwc_string_isequal(qname->name,
- state->interned_universal, match) == lwc_error_ok) {
- if (*match) {
+ *match = dom_string_lwc_isequal(state->interned_universal, qname->name);
+ if (*match) {
/* It's the universal selector. In NetSurf, all node
* names match the universal selector, and nothing in
* the libcss documentation suggests another approach,
* so we follow NetSurf here. */
return CSS_OK;
- }
}
err = dom_node_get_node_name((dom_node *)node, &name);
{
UNUSED(pw);
dom_string *name;
- dom_string *attr_val;
+ dom_string *attr_val = NULL;
dom_exception err;
size_t attr_len; /* length of attr_val */
size_t substrlen; /* length of "substring" */
css_qname attr;
attr.ns = NULL;
+ /* The string "lang" is already interned in our
+ * css_select_ctx, but its members aren't visible to
+ * us. Trying to intern it again will get a reference to the
+ * existing string, so it's important that we unref (as
+ * opposed to destroy) it later. */
if (lwc_intern_string("lang", 4, &attr.name) != lwc_error_ok) {
return CSS_NOMEM;
}
c_err = _node_has_attribute_substring(pw, (void *)n, &attr,
lang, &match, true);
if (c_err != CSS_OK) {
- lwc_string_destroy(attr.name);
+ lwc_string_unref(attr.name);
return c_err;
}
if (match) {
/* matched this element; we're done */
- lwc_string_destroy(attr.name);
+ lwc_string_unref(attr.name);
*is_lang = true;
return CSS_OK;
}
/* no match on this element, try its parent */
d_err = dom_node_get_parent_node(n, &p);
if (d_err != DOM_NO_ERR) {
- lwc_string_destroy(attr.name);
+ lwc_string_unref(attr.name);
return CSS_NOMEM;
}
n = p;
}
/* If we never find a match we may wind up here */
- lwc_string_destroy(attr.name);
+ lwc_string_unref(attr.name);
return CSS_OK;
}
/**
* User-agent defaults for CSS properties
*
- * For the moment, we provide no defaults, because libsvgtiny does not
- * yet support any CSS properties that might need them.
+ * Ideally we would provide _no_ defaults here, because we don't yet
+ * support any CSS properties that can use them. However, we run into
+ * libcss parent/child style composition issues unless these defaults
+ * are provided. And it's harmless to provide them, so let's do it.
*
* \param pw Pointer to the current SVG parser state; unused
* \param property LibCSS property identifier; unused
css_hint *hint)
{
UNUSED(pw);
- UNUSED(property);
- UNUSED(hint);
- return CSS_INVALID;
+ switch (property) {
+ case CSS_PROP_COLOR:
+ hint->data.color = 0xff000000;
+ hint->status = CSS_COLOR_COLOR;
+ break;
+ case CSS_PROP_FONT_FAMILY:
+ hint->data.strings = NULL;
+ hint->status = CSS_FONT_FAMILY_SANS_SERIF;
+ break;
+ case CSS_PROP_QUOTES:
+ hint->data.strings = NULL;
+ hint->status = CSS_QUOTES_NONE;
+ break;
+ case CSS_PROP_VOICE_FAMILY:
+ hint->data.strings = NULL;
+ hint->status = 0;
+ break;
+ default:
+ return CSS_INVALID;
+ }
+
+ return CSS_OK;
}
css_libcss_node_data_handler(&svgtiny_select_handler,
CSS_NODE_DELETED,
NULL, src, NULL, data);
+ break;
default:
/* Our list of cases should have been exhaustive */
assert(false);
projects / libsvgtiny.git / blobdiff