Split out presentational hints handling.

css/Makefile

@@ -1,5 +1,5 @@
 # CSS sources
 
-S_CSS := css.c dump.c internal.c select.c utils.c
+S_CSS := css.c dump.c internal.c hints.c select.c utils.c
 
 S_CSS := $(addprefix css/,$(S_CSS))

css/hints.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 John-Mark Bell <jmb@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NETSURF_CSS_HINTS_H_
+#define NETSURF_CSS_HINTS_H_
+
+#include <stdint.h>
+
+#include "css/css.h"
+
+
+
+
+/**
+ * Callback to retrieve presentational hints for a node
+ *
+ * \param pw        HTML document
+ * \param node      DOM node
+ * \param property  CSS property to retrieve
+ * \param hint      Pointer to hint object to populate
+ * \return CSS_OK               on success,
+ *         CSS_PROPERTY_NOT_SET if there is no hint for the requested property,
+ *         CSS_NOMEM            on memory exhaustion.
+ */
+css_error node_presentational_hint(
+		void *pw,
+		void *node,
+		uint32_t property,
+		css_hint *hint);
+
+bool nscss_parse_colour(const char *data, css_color *result);
+
+#endif

css/select.h

@@ -49,9 +49,9 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
 css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
 		const css_computed_style *parent);
 
-css_error nscss_compute_font_size(void *pw, const css_hint *parent, 
-		css_hint *size);
 
-bool nscss_parse_colour(const char *data, css_color *result);
+css_error named_ancestor_node(void *pw, void *node,
+		const css_qname *qname, void **ancestor);
+css_error node_is_visited(void *pw, void *node, bool *match);
 
 #endif

render/box_construct.c

@@ -36,8 +36,9 @@
 #include "utils/config.h"
 #include "content/content_protected.h"
 #include "css/css.h"
-#include "css/utils.h"
+#include "css/hints.h"
 #include "css/select.h"
+#include "css/utils.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/locale.h"