aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-10-17 06:24:12 -04:00
Code

[html] struct document * instead of struct document_options * in init_html_parser

Browse Source 
I want have access to document in renderer and parser functions.
This commit is contained in:
Witold Filipczyk 2023-02-15 18:56:15 +01:00
parent 5fa2a3371c
commit 967e5d5f09
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/document/html/internal.h
View File

@ -10,6 +10,7 @@
extern "C" { extern "C" {
#endif #endif
struct document;
struct document_options; struct document_options;
struct uri; struct uri;
@ -43,6 +44,7 @@ enum html_whitespace_state {
struct html_context { struct html_context {
#ifdef CONFIG_CSS #ifdef CONFIG_CSS
#ifdef CONFIG_LIBCSS #ifdef CONFIG_LIBCSS
struct document *document;
#else #else
/* The default stylesheet is initially merged into it. When parsing CSS /* The default stylesheet is initially merged into it. When parsing CSS
* from <style>-tags and external stylesheets if enabled is merged * from <style>-tags and external stylesheets if enabled is merged

4
src/document/html/parser.c
View File

@ -758,7 +758,7 @@ done_html_parser_state(struct html_context *html_context,
* The title of the document. This is in the document charset, * The title of the document. This is in the document charset,
* and entities have not been decoded. */ * and entities have not been decoded. */
struct html_context * struct html_context *
init_html_parser(struct uri *uri, struct document_options *options, init_html_parser(struct uri *uri, struct document *document,
char *start, char *end, char *start, char *end,
struct string *head, struct string *title, struct string *head, struct string *title,
void (*put_chars)(struct html_context *, const char *, int), void (*put_chars)(struct html_context *, const char *, int),
@ -767,6 +767,7 @@ init_html_parser(struct uri *uri, struct document_options *options,
{ {
struct html_context *html_context; struct html_context *html_context;
struct html_element *e; struct html_element *e;
struct document_options *options = &document->options;
assert(uri && options); assert(uri && options);
if_assert_failed return NULL; if_assert_failed return NULL;
@ -776,6 +777,7 @@ init_html_parser(struct uri *uri, struct document_options *options,
#ifdef CONFIG_CSS #ifdef CONFIG_CSS
#ifdef CONFIG_LIBCSS #ifdef CONFIG_LIBCSS
html_context->document = document;
#else #else
html_context->css_styles.import = import_css_stylesheet; html_context->css_styles.import = import_css_stylesheet;
init_css_selector_set(&html_context->css_styles.selectors); init_css_selector_set(&html_context->css_styles.selectors);

3
src/document/html/parser.h
View File

@ -14,6 +14,7 @@
extern "C" { extern "C" {
#endif #endif
struct document;
struct document_options; struct document_options;
struct el_form_control; struct el_form_control;
struct frameset_desc; struct frameset_desc;
@ -181,7 +182,7 @@ struct html_element {
/* Interface for the renderer */ /* Interface for the renderer */
struct html_context * struct html_context *
init_html_parser(struct uri *uri, struct document_options *options, init_html_parser(struct uri *uri, struct document *document,
char *start, char *end, char *start, char *end,
struct string *head, struct string *title, struct string *head, struct string *title,
void (*put_chars)(struct html_context *, const char *, int), void (*put_chars)(struct html_context *, const char *, int),

2
src/document/html/renderer.c
View File

@ -2597,7 +2597,7 @@ render_html_document(struct cache_entry *cached, struct document *document,
start = buffer->source; start = buffer->source;
end = buffer->source + buffer->length; end = buffer->source + buffer->length;
html_context = init_html_parser(cached->uri, &document->options, html_context = init_html_parser(cached->uri, document,
start, end, &head, &title, start, end, &head, &title,
put_chars_conv, line_break, put_chars_conv, line_break,
html_special); html_special);