X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny_css.c;h=96991ddfcfcfe4684b9411709c44367b4651fa92;hb=refs%2Fheads%2Flibcss;hp=76b01d196abdd6c0fe4a72dc9987555e5922fdc4;hpb=b90df4ac34f3873c235392568f6b35ec8d56e78f;p=libsvgtiny.git

diff --git a/src/svgtiny_css.c b/src/svgtiny_css.c
index 76b01d1..96991dd 100644
--- a/src/svgtiny_css.c
+++ b/src/svgtiny_css.c
@@ -4,6 +4,9 @@
 #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,
@@ -73,6 +76,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 +652,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);
@@ -1173,7 +1203,7 @@ static css_error _node_has_attribute_substring(void *pw, void *node,
 {
 	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" */
@@ -1775,6 +1805,11 @@ static css_error node_is_lang(void *pw, void *node,
 	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;
 	}
@@ -1788,12 +1823,12 @@ static css_error node_is_lang(void *pw, void *node,
 		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;
 		}
@@ -1801,14 +1836,14 @@ static css_error node_is_lang(void *pw, void *node,
 		/* 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;
 }
 
@@ -1841,8 +1876,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,12 +1891,83 @@ 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;
 }
 
 
+/**
+ * A "user handler" function that we pass to dom_node_set_user_data()
+ * in set_libcss_node_data(). The set_libcss_node_data() documentation
+ * says that if the node (on which data is set) is is deleted or
+ * cloned, or if its ancestors are modified, then we must call
+ * css_libcss_node_data_handler() on the user data. This function
+ * basically just checks to see which DOM event has happened and
+ * calls css_libcss_node_data_handler() when any of those criteria
+ * are met.
+ */
+static void svgtiny_dom_user_data_handler(dom_node_operation operation,
+	dom_string *key, void *data, struct dom_node *src,
+	struct dom_node *dst)
+{
+	/* We only care about the userdata that is identified by our
+	 * userdata key. Unfortunately I see no obvious way to obtain
+	 * the copy of the userdata key that is already interned in
+	 * svgtiny_strings.h; so we duplicate it here (ugh). */
+	dom_string *str;
+	dom_string_create((const uint8_t *)"_libcss_user_data", 17, &str);
+	if (dom_string_isequal(str,key) == false || data == NULL) {
+		/* Wrong key, or no data */
+		return;
+	}
+
+	/* Check the DOM operation, and make the corresponding call to
+	 * css_libcss_node_data_handler(). No error handling is done.
+	 */
+	switch (operation) {
+		case DOM_NODE_CLONED:
+			css_libcss_node_data_handler(&svgtiny_select_handler,
+						CSS_NODE_CLONED,
+						NULL, src, dst, data);
+			break;
+		case DOM_NODE_RENAMED:
+			css_libcss_node_data_handler(&svgtiny_select_handler,
+						CSS_NODE_MODIFIED,
+						NULL, src, NULL, data);
+			break;
+		case DOM_NODE_IMPORTED:
+		case DOM_NODE_ADOPTED:
+		case DOM_NODE_DELETED:
+			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);
+	}
+}
+
 /**
  * Store libcss data on a node
  *
@@ -1880,15 +1988,12 @@ css_error set_libcss_node_data(void *pw, void *node,
 	void *old_data;
 
 	/* A unique "userdata key" (a string) is used to identify this
-	 * data. The fourth parameter (NULL) is a "user handler
-	 * function." We will eventually have one, but for now we set
-	 * it to NULL to avoid a circular reference mess that would
-	 * break the build temporarily. */
+	 * data. */
 	state = (struct svgtiny_parse_state *)pw;
 	dom_node_set_user_data((dom_node *)node,
 				state->interned_userdata_key,
 				libcss_node_data,
-				NULL,
+				svgtiny_dom_user_data_handler,
 				&old_data);
 
 	/* dom_node_set_user_data() always returns DOM_NO_ERR */