From 5fa2a3371c9ed0faded76ffcab77b6b6a93e6101 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Mon, 13 Feb 2023 17:05:48 +0100
Subject: [PATCH] [css] Do not execute css code when CONFIG_LIBCSS was set

---
 src/document/css/apply.c           |  5 +++++
 src/document/html/internal.h       |  3 +++
 src/document/html/parser.c         |  9 +++++++++
 src/document/html/parser.h         |  3 +++
 src/document/html/parser/general.c |  3 +++
 src/document/html/parser/link.c    |  3 +++
 src/document/html/parser/parse.c   | 12 ++++++++++++
 src/document/html/parser/stack.c   |  6 ++++++
 src/document/meson.build           |  2 +-
 9 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/document/css/apply.c b/src/document/css/apply.c
index 54390a83..f18ea4dd 100644
--- a/src/document/css/apply.c
+++ b/src/document/css/apply.c
@@ -234,6 +234,9 @@ examine_element(struct html_context *html_context, struct css_selector *base,
 		process_found_selector(selector, CST_PSEUDO, base);
 	}
 
+#ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	if (element->attr.class_ && seltype <= CST_CLASS) {
 		const char *class_ = element->attr.class_;
 
@@ -255,6 +258,8 @@ examine_element(struct html_context *html_context, struct css_selector *base,
 		selector = find_css_selector(selectors, CST_ID, rel, element->attr.id, -1);
 		process_found_selector(selector, CST_ID, base);
 	}
+#endif
+#endif
 
 #undef process_found_selector
 #undef dbginfo
diff --git a/src/document/html/internal.h b/src/document/html/internal.h
index 676454bc..85d3a2b1 100644
--- a/src/document/html/internal.h
+++ b/src/document/html/internal.h
@@ -42,10 +42,13 @@ enum html_whitespace_state {
 
 struct html_context {
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	/* The default stylesheet is initially merged into it. When parsing CSS
 	 * from <style>-tags and external stylesheets if enabled is merged
 	 * added to it. */
 	struct css_stylesheet css_styles;
+#endif
 #endif
 
 	/* These are global per-document base values, alterable by the <base>
diff --git a/src/document/html/parser.c b/src/document/html/parser.c
index 08ff6e86..ed0f81aa 100644
--- a/src/document/html/parser.c
+++ b/src/document/html/parser.c
@@ -775,8 +775,11 @@ init_html_parser(struct uri *uri, struct document_options *options,
 	if (!html_context) return NULL;
 
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	html_context->css_styles.import = import_css_stylesheet;
 	init_css_selector_set(&html_context->css_styles.selectors);
+#endif
 #endif
 
 	init_list(html_context->stack);
@@ -841,11 +844,14 @@ init_html_parser(struct uri *uri, struct document_options *options,
 	html_context->table_level = 0;
 
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	html_context->css_styles.import_data = html_context;
 
 	if (options->css_enable)
 		mirror_css_stylesheet(&default_stylesheet,
 				      &html_context->css_styles);
+#endif
 #endif
 
 	return html_context;
@@ -855,8 +861,11 @@ void
 done_html_parser(struct html_context *html_context)
 {
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	if (html_context->options->css_enable)
 		done_css_stylesheet(&html_context->css_styles);
+#endif
 #endif
 
 	mem_free(html_context->base_target);
diff --git a/src/document/html/parser.h b/src/document/html/parser.h
index 8b76d086..f7a911ab 100644
--- a/src/document/html/parser.h
+++ b/src/document/html/parser.h
@@ -53,6 +53,8 @@ struct text_attrib {
 	struct text_attrib_color color;
 
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	/* Bug 766: CSS speedup.  56% of CPU time was going to
 	 * get_attr_value().  Of those calls, 97% were asking for "id"
 	 * or "class".  So cache the results.  start_element() sets up
@@ -60,6 +62,7 @@ struct text_attrib {
 	 * otherwise they remain NULL. */
 	char *id;
 	char *class_;
+#endif
 #endif
 
 	char *select;
diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index ba222117..cb4f7c96 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -186,11 +186,14 @@ void
 html_apply_canvas_bgcolor(struct html_context *html_context)
 {
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	/* If there are any CSS twaks regarding bgcolor, make sure we will get
 	 * it _and_ prefer it over bgcolor attribute. */
 	if (html_context->options->css_enable)
 		css_apply(html_context, html_top, &html_context->css_styles,
 		          &html_context->stack);
+#endif
 #endif
 
 	if (par_elformat.color.background != elformat.style.color.background) {
diff --git a/src/document/html/parser/link.c b/src/document/html/parser/link.c
index d4390cc9..a2711abf 100644
--- a/src/document/html/parser/link.c
+++ b/src/document/html/parser/link.c
@@ -923,6 +923,8 @@ html_link(struct html_context *html_context, char *a,
 	if (!link.href) goto free_and_return;
 
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	if (link.type == LT_STYLESHEET
 	    && supports_html_media_attr(link.media)) {
 		int len = strlen(link.href);
@@ -932,6 +934,7 @@ html_link(struct html_context *html_context, char *a,
 	}
 
 	if (!link_display) goto free_and_return;
+#endif
 #endif
 
 	/* Ignore few annoying links.. */
diff --git a/src/document/html/parser/parse.c b/src/document/html/parser/parse.c
index 3008695a..d2cf3f2e 100644
--- a/src/document/html/parser/parse.c
+++ b/src/document/html/parser/parse.c
@@ -857,7 +857,10 @@ start_element(struct element_info *ei,
 	struct par_attrib old_format;
 	int restore_format;
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	struct css_selector *selector = NULL;
+#endif
 #endif
 
 	/* If the currently top element on the stack cannot contain other
@@ -896,6 +899,8 @@ start_element(struct element_info *ei,
 
 	/* If this is a style tag, parse it. */
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	if (ei->open == html_style && html_context->options->css_enable) {
 		char *media
 			= get_attr_val(attr, "media", html_context->doc_cp);
@@ -907,6 +912,7 @@ start_element(struct element_info *ei,
 					     html_context->base_href,
 					     html, eof);
 	}
+#endif
 #endif
 
 	/* If this element is inline, non-nestable, and not <li>, and the next
@@ -977,6 +983,8 @@ start_element(struct element_info *ei,
 
 	/* Apply CSS styles. */
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	if (html_top->options && html_context->options->css_enable) {
 		/* XXX: We should apply CSS otherwise as well, but that'll need
 		 * some deeper changes in order to have options filled etc.
@@ -1002,6 +1010,7 @@ start_element(struct element_info *ei,
 			done_css_selector(selector);
 		}
 	}
+#endif
 #endif
 
 	/* 1. Put any linebreaks that the element calls for, and 2. register
@@ -1019,6 +1028,8 @@ start_element(struct element_info *ei,
 
 	/* Apply CSS styles again. */
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	if (selector && html_top->options) {
 		/* Call it now to override default colors of the elements. */
 		selector = get_css_selector_for_element(html_context, html_top,
@@ -1030,6 +1041,7 @@ start_element(struct element_info *ei,
 			done_css_selector(selector);
 		}
 	}
+#endif
 #endif
 
 	/* If this element was not <br>, clear the was_br flag. */
diff --git a/src/document/html/parser/stack.c b/src/document/html/parser/stack.c
index bcbd773b..e53092c9 100644
--- a/src/document/html/parser/stack.c
+++ b/src/document/html/parser/stack.c
@@ -122,8 +122,11 @@ kill_html_stack_item(struct html_context *html_context, struct html_element *e)
 	mem_free_if(e->attr.select);
 
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	mem_free_if(e->attr.id);
 	mem_free_if(e->attr.class_);
+#endif
 #endif
 
 	mem_free_if(e->attr.onclick);
@@ -168,7 +171,10 @@ html_stack_dup(struct html_context *html_context, enum html_element_mortality_ty
 	if (ep->attr.select) e->attr.select = stracpy(ep->attr.select);
 
 #ifdef CONFIG_CSS
+#ifdef CONFIG_LIBCSS
+#else
 	e->attr.id = e->attr.class_ = NULL;
+#endif
 #endif
 	/* We don't want to propagate these. */
 	/* XXX: For sure? --pasky */
diff --git a/src/document/meson.build b/src/document/meson.build
index 4527546f..479941cb 100644
--- a/src/document/meson.build
+++ b/src/document/meson.build
@@ -1,4 +1,4 @@
-if conf_data.get('CONFIG_CSS')
+if conf_data.get('CONFIG_CSS') and conf_data.get('CONFIG_DOM')
 	subdir('css')
 endif
 if conf_data.get('CONFIG_DOM')