Merge branch 'vince/forms-fixed'

Conflicts:
	Makefile.sources
	render/box_construct.c
	render/html.c
	render/html_internal.h

Merge Daniel Silverstones forms branch

1 files changed, 5 insertions, 0 deletions

diff --git a/render/html_internal.h b/render/html_internal.h
index 049b648b3..ad032f720 100644
--- a/render/html_internal.h
+++ b/render/html_internal.h
@@ -146,9 +146,14 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
 void html_overflow_scroll_callback(void *client_data,
 		struct scrollbar_msg_data *scrollbar_data);
 
+
 /* in render/html_script.c */
 dom_hubbub_error  html_process_script(void *ctx, dom_node *node);
 
+/* in render/html_forms.c */
+struct form *html_forms_get_forms(const char *docenc, dom_html_document *doc);
+struct form_control *html_forms_get_control_for_node(struct form *forms, dom_node *node);
+
 /* Useful dom_string pointers */
 struct dom_string;