X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny_css.c;h=6eefd87999ed561af6d16a7c44830f3ef5c4417c;hb=c576ba06023fd9d2addaf1cb0b372dc260da1a33;hp=075d87d139089d19469050808d085a9888265c11;hpb=7dba1bf5be8eb9acd0b064ac3c8f41ae60216f82;p=libsvgtiny.git

diff --git a/src/svgtiny_css.c b/src/svgtiny_css.c
index 075d87d..6eefd87 100644
--- a/src/svgtiny_css.c
+++ b/src/svgtiny_css.c
@@ -73,6 +73,35 @@ 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()
+ *
+ * \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
@@ -620,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);
@@ -1841,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
@@ -1854,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;
 }