From 7d9fffe1fa883aa06509dbb71a1c34b6b91e15e6 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Thu, 13 Aug 2009 09:33:24 +0000 Subject: Merge the Events module (branches/struggleyb/libdom-events) back to trunk. :) svn path=/trunk/dom/; revision=9236 --- bindings/hubbub/parser.c | 5 ++++- bindings/xml/xmlparser.c | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'bindings') diff --git a/bindings/hubbub/parser.c b/bindings/hubbub/parser.c index 4551f13..a19647b 100644 --- a/bindings/hubbub/parser.c +++ b/bindings/hubbub/parser.c @@ -190,8 +190,11 @@ dom_hubbub_parser *dom_hubbub_parser_create(const char *aliases, /* No longer need the feature string */ dom_string_unref(features); + /* TODO: Just pass the dom_events_default_action_fetcher a NULL, + * we should pass the real function when we integrate libDOM with + * Netsurf */ err = dom_implementation_create_document(parser->impl, NULL, NULL, NULL, - alloc, pw, ctx, &parser->doc); + alloc, pw, ctx, NULL, &parser->doc); if (err != DOM_NO_ERR) { hubbub_parser_destroy(parser->parser); alloc(parser, 0, pw); diff --git a/bindings/xml/xmlparser.c b/bindings/xml/xmlparser.c index e451699..8cae01c 100644 --- a/bindings/xml/xmlparser.c +++ b/bindings/xml/xmlparser.c @@ -348,12 +348,14 @@ void xml_parser_start_document(void *ctx) /* Invoke libxml2's default behaviour */ xmlSAX2StartDocument(parser->xml_ctx); - /* Attempt to create a document */ + /* TODO: Just pass the dom_events_default_action_fetcher a NULL, + * we should pass the real function when we integrate libDOM with + * Netsurf */ err = dom_implementation_create_document(parser->impl, /* namespace */ NULL, /* qname */ NULL, /* doctype */ NULL, - parser->alloc, parser->pw, parser->ctx, + parser->alloc, parser->pw, parser->ctx, NULL, &doc); if (err != DOM_NO_ERR) { parser->msg(DOM_MSG_CRITICAL, parser->mctx, -- cgit v1.2.1