alec/erythros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

System/Libraries/Html/Renderer: Set node->display and debugging values earlier

Browse source
This commit is contained in:
Alec Murphy 2025-04-26 10:31:11 -04:00
parent edc931d6c3
commit 9d9fb80aa9
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
System/Libraries/Html/Renderer.HC
View file

@ -724,6 +724,8 @@ U0 @dump_node_indent(HtmlRenderer* renderer)
" "; " ";
} }
JsonArray* block_level_element_tag_names = Json.Parse("[\"address\",\"article\",\"aside\",\"blockquote\",\"canvas\",\"dd\",\"div\",\"dl\",\"dt\",\"fieldset\",\"figcaption\",\"figure\",\"footer\",\"form\",\"h1\",\"h2\",\"h3\",\"h4\",\"h5\",\"h6\",\"header\",\"hr\",\"li\",\"main\",\"nav\",\"noscript\",\"ol\",\"p\",\"pre\",\"section\",\"table\",\"tfoot\",\"ul\",\"video\"]", erythros_mem_task);
JsonArray* parent_nodes_excluded_from_text_rendering = Json.Parse("[\"option\",\"script\",\"style\",\"title\"]", erythros_mem_task);
JsonArray* text_align_values = Json.Parse("[\"left\",\"center\",\"right\"]", erythros_mem_task); JsonArray* text_align_values = Json.Parse("[\"left\",\"center\",\"right\"]", erythros_mem_task);
JsonArray* display_values = Json.Parse("[\"none\",\"block\",\"inline\",\"inline-block\"]", erythros_mem_task); JsonArray* display_values = Json.Parse("[\"none\",\"block\",\"inline\",\"inline-block\"]", erythros_mem_task);
@ -755,6 +757,10 @@ Bool @apply_css_rules_to_node(@html_dom_node* node, HtmlRenderer* renderer)
Bool matched = FALSE; Bool matched = FALSE;
Bool should_display = TRUE; Bool should_display = TRUE;
if (block_level_element_tag_names->contains(node->tagName)) {
node->display = CSS_DISPLAY_BLOCK;
}
@inherit_css_values_from_parent_node(node); @inherit_css_values_from_parent_node(node);
if (renderer->debug) if (renderer->debug)
@dump_node_info(node, renderer, "Inherited CSS values from parentNode:"); @dump_node_info(node, renderer, "Inherited CSS values from parentNode:");
@ -1017,9 +1023,6 @@ U0 @render_form_element(@html_dom_node* node, HtmlRenderer* renderer)
} }
} }
JsonArray* parent_nodes_excluded_from_text_rendering = Json.Parse("[\"option\",\"script\",\"style\",\"title\"]", erythros_mem_task);
JsonArray* block_level_element_tag_names = Json.Parse("[\"address\",\"article\",\"aside\",\"blockquote\",\"canvas\",\"dd\",\"div\",\"dl\",\"dt\",\"fieldset\",\"figcaption\",\"figure\",\"footer\",\"form\",\"h1\",\"h2\",\"h3\",\"h4\",\"h5\",\"h6\",\"header\",\"hr\",\"li\",\"main\",\"nav\",\"noscript\",\"ol\",\"p\",\"pre\",\"section\",\"table\",\"tfoot\",\"ul\",\"video\"]", erythros_mem_task);
#define ADD_BYTE_TO_CODE_POINT_VALUE code_point = ((code_point << 6) | text[++i] & 0x3f); #define ADD_BYTE_TO_CODE_POINT_VALUE code_point = ((code_point << 6) | text[++i] & 0x3f);
#define ADD_TWO_BYTES_TO_CODE_POINT_VALUE ADD_BYTE_TO_CODE_POINT_VALUE ADD_BYTE_TO_CODE_POINT_VALUE #define ADD_TWO_BYTES_TO_CODE_POINT_VALUE ADD_BYTE_TO_CODE_POINT_VALUE ADD_BYTE_TO_CODE_POINT_VALUE
#define ADD_THREE_BYTES_TO_CODE_POINT_VALUE ADD_TWO_BYTES_TO_CODE_POINT_VALUE ADD_BYTE_TO_CODE_POINT_VALUE #define ADD_THREE_BYTES_TO_CODE_POINT_VALUE ADD_TWO_BYTES_TO_CODE_POINT_VALUE ADD_BYTE_TO_CODE_POINT_VALUE
@ -1248,6 +1251,8 @@ U0 @render_node_list(@html_dom_node* node, HtmlRenderer* renderer)
if (!node || !renderer) if (!node || !renderer)
return; return;
++renderer->indent;
I64 i; I64 i;
U8 buf[HTML_WORK_BUFFER_SIZE]; U8 buf[HTML_WORK_BUFFER_SIZE];
U8* dump_text; U8* dump_text;
@ -1255,16 +1260,10 @@ U0 @render_node_list(@html_dom_node* node, HtmlRenderer* renderer)
Context2DWidget* block_widget; Context2DWidget* block_widget;
Context2DWidget* img_widget; Context2DWidget* img_widget;
if (block_level_element_tag_names->contains(node->tagName)) {
node->display = CSS_DISPLAY_BLOCK;
}
if (StrICmp(node->tagName, "InternalTextNode")) if (StrICmp(node->tagName, "InternalTextNode"))
if (!@apply_css_rules_to_node(node, renderer)) if (!@apply_css_rules_to_node(node, renderer))
return; return;
++renderer->indent;
@apply_attribute_values_to_node(node); @apply_attribute_values_to_node(node);
// Insert a block widget for the element's opening tag // Insert a block widget for the element's opening tag