src/svgtiny_css.c: fix lwc/dom string comparison in node_has_name()

[libsvgtiny.git] / src / svgtiny_css.c

diff --git a/src/svgtiny_css.c b/src/svgtiny_css.c
index b80d0578b7bd219d8397a2532b23f1b4491e608d..6eefd87999ed561af6d16a7c44830f3ef5c4417c 100644 (file)
--- a/src/svgtiny_css.c
+++ b/src/svgtiny_css.c
@@ -73,6 +73,12 @@ static css_error get_libcss_node_data(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()
  *
@@ -86,27 +92,9 @@ css_error svgtiny_select_style(struct svgtiny_parse_state *state,
                                const css_stylesheet *inline_sheet,
                                css_select_results **result)
 {
-       const css_media media_all = {
-               .type = CSS_MEDIA_ALL,
-       };
-
-       /* These magic numbers below were taken from the libcss
-        * example program without much thought, because at the moment
-        * we don't support any properties with units. */
-       const css_unit_ctx unitctx = {
-               .viewport_width    = FLTTOFIX(state->viewport_width),
-               .viewport_height   = FLTTOFIX(state->viewport_height),
-               .font_size_default = FLTTOFIX(16.0),
-               .font_size_minimum = FLTTOFIX(6.0),
-               .device_dpi        = FLTTOFIX(96.0),
-               .root_style        = NULL,
-               .pw                = NULL,
-               .measure           = NULL,
-       };
-
        return css_select_style(state->select_ctx,
                        node,
-                       &unitctx,
+                       &state->unit_ctx,
                        &media_all,
                        inline_sheet,
                        &svgtiny_select_handler,
@@ -661,15 +649,13 @@ css_error node_has_name(void *pw, void *node,
 
        /* 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);
@@ -1882,8 +1868,10 @@ css_error node_presentational_hint(void *pw, void *node,
 /**
  * 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
@@ -1895,9 +1883,28 @@ css_error ua_default_for_property(void *pw, uint32_t property,
        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;
 }
 
 
@@ -2058,5 +2065,3 @@ static css_select_handler svgtiny_select_handler = {
        set_libcss_node_data,
        get_libcss_node_data,
 };
-
-