Skip to content

Commit 445c1c9

Browse files
authored
Update Lexbor (#14735)
Until commit aaa722f9a44a486f361e4266ff322afcf7d6421a This pulls in some upstream fixes, including some of mine.
1 parent c97885b commit 445c1c9

File tree

7 files changed

+11
-33
lines changed

7 files changed

+11
-33
lines changed

ext/dom/lexbor/lexbor/css/log.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ lxb_css_log_init(lxb_css_log_t *log, lexbor_mraw_t *mraw)
4242
status = lexbor_array_obj_init(&log->messages, 64,
4343
sizeof(lxb_css_log_message_t));
4444
if (status != LXB_STATUS_OK) {
45-
memset(&log->mraw, 0, sizeof(lexbor_mraw_t));
4645
return status;
4746
}
4847

ext/dom/lexbor/lexbor/css/syntax/syntax.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ lxb_css_syntax_ident_serialize(const lxb_char_t *data, size_t length,
152152

153153
static const lexbor_str_t str_s = lexbor_str("\\");
154154

155-
p = data;
156155
end = data + length;
157156
hex_map = lexbor_str_res_char_to_two_hex_value_lowercase;
158157

ext/dom/lexbor/lexbor/css/syntax/tokenizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ lxb_css_syntax_tokenizer_cache_expand(lxb_css_syntax_tokenizer_cache_t *cache,
232232
new_size = cache->length + up_to;
233233
list = lexbor_realloc(cache->list,
234234
sizeof(lxb_css_syntax_token_t *) * new_size);
235-
if (cache == NULL) {
235+
if (list == NULL) {
236236
return NULL;
237237
}
238238

ext/dom/lexbor/lexbor/html/tree.c

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -398,22 +398,16 @@ lxb_html_tree_insert_foreign_element(lxb_html_tree_t *tree,
398398
lxb_html_tree_insertion_position_t ipos;
399399

400400
pos = lxb_html_tree_appropriate_place_inserting_node(tree, NULL, &ipos);
401-
402-
if (ipos == LXB_HTML_TREE_INSERTION_POSITION_CHILD) {
403-
element = lxb_html_tree_create_element_for_token(tree, token, ns, pos);
404-
}
405-
else {
406-
element = lxb_html_tree_create_element_for_token(tree, token, ns,
407-
pos->parent);
401+
if (pos == NULL) {
402+
return NULL;
408403
}
409404

405+
element = lxb_html_tree_create_element_for_token(tree, token, ns);
410406
if (element == NULL) {
411407
return NULL;
412408
}
413409

414-
if (pos != NULL) {
415-
lxb_html_tree_insert_node(pos, lxb_dom_interface_node(element), ipos);
416-
}
410+
lxb_html_tree_insert_node(pos, lxb_dom_interface_node(element), ipos);
417411

418412
status = lxb_html_tree_open_elements_push(tree,
419413
lxb_dom_interface_node(element));
@@ -426,8 +420,7 @@ lxb_html_tree_insert_foreign_element(lxb_html_tree_t *tree,
426420

427421
lxb_html_element_t *
428422
lxb_html_tree_create_element_for_token(lxb_html_tree_t *tree,
429-
lxb_html_token_t *token, lxb_ns_id_t ns,
430-
lxb_dom_node_t *parent)
423+
lxb_html_token_t *token, lxb_ns_id_t ns)
431424
{
432425
lxb_dom_node_t *node = lxb_html_tree_create_node(tree, token->tag_id, ns);
433426
if (node == NULL) {
@@ -1560,8 +1553,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
15601553
fake_token.base_element = node;
15611554

15621555
element = lxb_html_tree_create_element_for_token(tree, &fake_token,
1563-
LXB_NS_HTML,
1564-
common_ancestor);
1556+
LXB_NS_HTML);
15651557
if (element == NULL) {
15661558
*status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;
15671559

@@ -1615,8 +1607,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
16151607
fake_token.base_element = formatting_element;
16161608

16171609
element = lxb_html_tree_create_element_for_token(tree, &fake_token,
1618-
LXB_NS_HTML,
1619-
furthest_block);
1610+
LXB_NS_HTML);
16201611
if (element == NULL) {
16211612
*status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;
16221613

ext/dom/lexbor/lexbor/html/tree.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ lxb_html_tree_insert_foreign_element(lxb_html_tree_t *tree,
118118

119119
LXB_API lxb_html_element_t *
120120
lxb_html_tree_create_element_for_token(lxb_html_tree_t *tree,
121-
lxb_html_token_t *token, lxb_ns_id_t ns,
122-
lxb_dom_node_t *parent);
121+
lxb_html_token_t *token, lxb_ns_id_t ns);
123122

124123
LXB_API lxb_status_t
125124
lxb_html_tree_append_attributes(lxb_html_tree_t *tree,

ext/dom/lexbor/lexbor/html/tree/insertion_mode/before_html.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ lxb_html_tree_insertion_mode_before_html_open(lxb_html_tree_t *tree,
6363
lxb_html_element_t *element;
6464

6565
element = lxb_html_tree_create_element_for_token(tree, token,
66-
LXB_NS_HTML,
67-
&tree->document->dom_document.node);
66+
LXB_NS_HTML);
6867
if (element == NULL) {
6968
tree->status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;
7069

ext/dom/lexbor/lexbor/html/tree/insertion_mode/in_head.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,7 @@ lxb_html_tree_insertion_mode_in_head_script(lxb_html_tree_t *tree,
252252
return lxb_html_tree_process_abort(tree);
253253
}
254254

255-
if (ipos == LXB_HTML_TREE_INSERTION_POSITION_CHILD) {
256-
element = lxb_html_tree_create_element_for_token(tree, token,
257-
LXB_NS_HTML, ap_node);
258-
}
259-
else {
260-
element = lxb_html_tree_create_element_for_token(tree, token,
261-
LXB_NS_HTML,
262-
ap_node->parent);
263-
}
264-
255+
element = lxb_html_tree_create_element_for_token(tree, token, LXB_NS_HTML);
265256
if (element == NULL) {
266257
tree->status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;
267258

0 commit comments

Comments
 (0)