Update Lexbor (#14032)

Author: nielsdos

ext/dom/lexbor/lexbor/core/array.c

@@ -18,7 +18,7 @@ extern "C" {
 
 
 #define LXB_CSS_VERSION_MAJOR 1
-#define LXB_CSS_VERSION_MINOR 1
+#define LXB_CSS_VERSION_MINOR 2
 #define LXB_CSS_VERSION_PATCH 0
 
 #define LXB_CSS_VERSION_STRING                                                 \

ext/dom/lexbor/lexbor/core/array.h

@@ -16,7 +16,7 @@ extern "C" {
 
 
 #define LXB_CSS_SELECTORS_VERSION_MAJOR 1
-#define LXB_CSS_SELECTORS_VERSION_MINOR 0
+#define LXB_CSS_SELECTORS_VERSION_MINOR 1
 #define LXB_CSS_SELECTORS_VERSION_PATCH 0
 
 #define LXB_CSS_SELECTORS_VERSION_STRING                                       \

ext/dom/lexbor/lexbor/core/array_obj.c

@@ -16,7 +16,7 @@ extern "C" {
 
 
 #define LXB_DOM_VERSION_MAJOR 1
-#define LXB_DOM_VERSION_MINOR 6
+#define LXB_DOM_VERSION_MINOR 7
 #define LXB_DOM_VERSION_PATCH 0
 
 #define LXB_DOM_VERSION_STRING                                                 \

ext/dom/lexbor/lexbor/core/array_obj.h

@@ -1239,7 +1239,7 @@ lxb_dom_node_text_content_set(lxb_dom_node_t *node,
 }
 
 bool
-lxb_dom_node_is_empty(lxb_dom_node_t *root)
+lxb_dom_node_is_empty(const lxb_dom_node_t *root)
 {
     lxb_char_t chr;
     lexbor_str_t *str;

ext/dom/lexbor/lexbor/core/avl.c

@@ -166,7 +166,7 @@ lxb_dom_node_text_content_set(lxb_dom_node_t *node,
                               const lxb_char_t *content, size_t len);
 
 LXB_API bool
-lxb_dom_node_is_empty(lxb_dom_node_t *root);
+lxb_dom_node_is_empty(const lxb_dom_node_t *root);
 
 
 /*

ext/dom/lexbor/lexbor/core/avl.h

@@ -15,7 +15,7 @@ extern "C" {
 
 
 #define LXB_HTML_VERSION_MAJOR 2
-#define LXB_HTML_VERSION_MINOR 3
+#define LXB_HTML_VERSION_MINOR 5
 #define LXB_HTML_VERSION_PATCH 0
 
 #define LXB_HTML_VERSION_STRING LEXBOR_STRINGIZE(LXB_HTML_VERSION_MAJOR) "."   \

ext/dom/lexbor/lexbor/core/bst.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Alexander Borisov
+ * Copyright (C) 2018-2024 Alexander Borisov
  *
  * Author: Alexander Borisov <[email protected]>
  */
@@ -631,6 +631,12 @@ lxb_html_document_style_remove_by_rule_cb(lxb_dom_node_t *node,
     lxb_css_rule_style_t *style = ctx;
     lxb_html_document_remove_ctx_t context;
 
+    /* FIXME: we don't have support for anything other than HTML. */
+
+    if (node->ns != LXB_NS_HTML) {
+        return LXB_STATUS_OK;
+    }
+
     el = lxb_html_interface_element(node);
 
     if (el->style == NULL) {
@@ -654,6 +660,10 @@ lxb_html_document_style_remove_avl_cb(lexbor_avl_t *avl,
     lxb_html_document_remove_ctx_t *context = ctx;
     lxb_html_style_node_t *style = (lxb_html_style_node_t *) node;
 
+    if (context->list == NULL) {
+        return LXB_STATUS_OK;
+    }
+
     lxb_html_element_style_remove_by_list(context->doc, root,
                                           style, context->list);
     return LXB_STATUS_OK;
@@ -666,8 +676,10 @@ lxb_html_document_style_attach_by_element(lxb_html_document_t *document,
 {
     lxb_html_document_css_t *css = &document->css;
 
-    return lxb_selectors_find_reverse(css->selectors, lxb_dom_interface_node(element),
-                              style->selector, lxb_html_document_style_cb, style);
+    return lxb_selectors_match_node(css->selectors,
+                                    lxb_dom_interface_node(element),
+                                    style->selector,
+                                    lxb_html_document_style_cb, style);
 }
 
 static lxb_status_t
@@ -682,6 +694,12 @@ lxb_html_document_style_cb(lxb_dom_node_t *node,
         return LXB_STATUS_OK;
     }
 
+    /* Valid behavior when there are no declarations in the style. */
+
+    if (style->declarations == NULL) {
+        return LXB_STATUS_OK;
+    }
+
     return lxb_html_element_style_list_append(lxb_html_interface_element(node),
                                               style->declarations, spec);
 }
@@ -811,13 +829,15 @@ lxb_html_document_parse_fragment_chunk_begin(lxb_html_document_t *document,
                                              lxb_dom_element_t *element)
 {
     lxb_status_t status;
-    lxb_html_parser_t *parser = document->dom_document.parser;
+    lxb_html_parser_t *parser;
 
     status = lxb_html_document_parser_prepare(document);
     if (status != LXB_STATUS_OK) {
         return status;
     }
 
+    parser = document->dom_document.parser;
+
     return lxb_html_parse_fragment_chunk_begin(parser, document,
                                                element->node.local_name,
                                                element->node.ns);

ext/dom/lexbor/lexbor/core/bst.h

@@ -33,8 +33,8 @@ enum lxb_html_token_type {
 typedef struct {
     const lxb_char_t      *begin;
     const lxb_char_t      *end;
-    size_t                 line;
-    size_t                 column;
+    size_t                line;
+    size_t                column;
 
     const lxb_char_t      *text_start;
     const lxb_char_t      *text_end;

ext/dom/lexbor/lexbor/core/bst_map.c

@@ -73,8 +73,8 @@ struct lxb_html_tokenizer {
     const lxb_char_t                 *end;
     const lxb_char_t                 *begin;
     const lxb_char_t                 *last;
-    size_t                            current_line;
-    size_t                            current_column;
+    size_t                           current_line;
+    size_t                           current_column;
 
     /* Entities */
     const lexbor_sbst_entry_static_t *entity;

ext/dom/lexbor/lexbor/core/bst_map.h

@@ -1582,7 +1582,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
 
             /* State 14.9 */
             if (last->parent != NULL) {
-                lxb_dom_node_remove(last);
+                lxb_dom_node_remove_wo_events(last);
             }
 
             lxb_dom_node_insert_child_wo_events(node, last);
@@ -1592,7 +1592,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
         }
 
         if (last->parent != NULL) {
-            lxb_dom_node_remove(last);
+            lxb_dom_node_remove_wo_events(last);
         }
 
         /* State 15 */
@@ -1630,7 +1630,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
         while (node != NULL) {
             next = node->next;
 
-            lxb_dom_node_remove(node);
+            lxb_dom_node_remove_wo_events(node);
             lxb_dom_node_insert_child_wo_events(lxb_dom_interface_node(element),
                                                 node);
             node = next;

ext/dom/lexbor/lexbor/core/def.h

@@ -97,9 +97,9 @@ lxb_html_tree_error_id_t;
 
 typedef struct {
     lxb_html_tree_error_id_t id;
-    size_t                    line;
-    size_t                    column;
-    size_t                    length;
+    size_t                   line;
+    size_t                   column;
+    size_t                   length;
 }
 lxb_html_tree_error_t;
 

ext/dom/lexbor/lexbor/core/diyfp.c

@@ -1320,8 +1320,6 @@ lxb_html_tree_insertion_mode_in_body_textarea(lxb_html_tree_t *tree,
     lxb_html_tokenizer_state_set(tree->tkz_ref,
                                  lxb_html_tokenizer_state_rcdata_before);
 
-    tree->original_mode = tree->mode;
-
     tree->frameset_ok = false;
 
     tree->original_mode = tree->mode;

ext/dom/lexbor/lexbor/core/diyfp.h

@@ -15,7 +15,7 @@ extern "C" {
 
 
 #define LXB_SELECTORS_VERSION_MAJOR 0
-#define LXB_SELECTORS_VERSION_MINOR 2
+#define LXB_SELECTORS_VERSION_MINOR 3
 #define LXB_SELECTORS_VERSION_PATCH 0
 
 #define LXB_SELECTORS_VERSION_STRING LEXBOR_STRINGIZE(LXB_SELECTORS_VERSION_MAJOR) "."   \