src/svgtiny_css.c: add a missing break statement

[libsvgtiny.git] / src / svgtiny_css.c

diff --git a/src/svgtiny_css.c b/src/svgtiny_css.c
index 3da3c8e165f34b0d6fb09cdcc04c488ecda3e0f8..9416f1fecc797044d7c38ad3fb503adb904185a2 100644 (file)
--- a/src/svgtiny_css.c
+++ b/src/svgtiny_css.c
@@ -649,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);
@@ -1870,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
@@ -1883,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;
 }
 
 
@@ -1934,6 +1953,7 @@ static void svgtiny_dom_user_data_handler(dom_node_operation operation,
                        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);
@@ -2046,5 +2066,3 @@ static css_select_handler svgtiny_select_handler = {
        set_libcss_node_data,
        get_libcss_node_data,
 };
-
-