Skip to content

Update Lexbor #14735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Update Lexbor #14735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ext/dom/lexbor/lexbor/css/log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ lxb_css_log_init(lxb_css_log_t *log, lexbor_mraw_t *mraw)
status = lexbor_array_obj_init(&log->messages, 64,
sizeof(lxb_css_log_message_t));
if (status != LXB_STATUS_OK) {
memset(&log->mraw, 0, sizeof(lexbor_mraw_t));
return status;
}

Expand Down
1 change: 0 additions & 1 deletion ext/dom/lexbor/lexbor/css/syntax/syntax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ lxb_css_syntax_ident_serialize(const lxb_char_t *data, size_t length,

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

p = data;
end = data + length;
hex_map = lexbor_str_res_char_to_two_hex_value_lowercase;

Expand Down
2 changes: 1 addition & 1 deletion ext/dom/lexbor/lexbor/css/syntax/tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ lxb_css_syntax_tokenizer_cache_expand(lxb_css_syntax_tokenizer_cache_t *cache,
new_size = cache->length + up_to;
list = lexbor_realloc(cache->list,
sizeof(lxb_css_syntax_token_t *) * new_size);
if (cache == NULL) {
if (list == NULL) {
return NULL;
}

Expand Down
23 changes: 7 additions & 16 deletions ext/dom/lexbor/lexbor/html/tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,22 +398,16 @@ lxb_html_tree_insert_foreign_element(lxb_html_tree_t *tree,
lxb_html_tree_insertion_position_t ipos;

pos = lxb_html_tree_appropriate_place_inserting_node(tree, NULL, &ipos);

if (ipos == LXB_HTML_TREE_INSERTION_POSITION_CHILD) {
element = lxb_html_tree_create_element_for_token(tree, token, ns, pos);
}
else {
element = lxb_html_tree_create_element_for_token(tree, token, ns,
pos->parent);
if (pos == NULL) {
return NULL;
}

element = lxb_html_tree_create_element_for_token(tree, token, ns);
if (element == NULL) {
return NULL;
}

if (pos != NULL) {
lxb_html_tree_insert_node(pos, lxb_dom_interface_node(element), ipos);
}
lxb_html_tree_insert_node(pos, lxb_dom_interface_node(element), ipos);

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

lxb_html_element_t *
lxb_html_tree_create_element_for_token(lxb_html_tree_t *tree,
lxb_html_token_t *token, lxb_ns_id_t ns,
lxb_dom_node_t *parent)
lxb_html_token_t *token, lxb_ns_id_t ns)
{
lxb_dom_node_t *node = lxb_html_tree_create_node(tree, token->tag_id, ns);
if (node == NULL) {
Expand Down Expand Up @@ -1560,8 +1553,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
fake_token.base_element = node;

element = lxb_html_tree_create_element_for_token(tree, &fake_token,
LXB_NS_HTML,
common_ancestor);
LXB_NS_HTML);
if (element == NULL) {
*status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;

Expand Down Expand Up @@ -1615,8 +1607,7 @@ lxb_html_tree_adoption_agency_algorithm(lxb_html_tree_t *tree,
fake_token.base_element = formatting_element;

element = lxb_html_tree_create_element_for_token(tree, &fake_token,
LXB_NS_HTML,
furthest_block);
LXB_NS_HTML);
if (element == NULL) {
*status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;

Expand Down
3 changes: 1 addition & 2 deletions ext/dom/lexbor/lexbor/html/tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ lxb_html_tree_insert_foreign_element(lxb_html_tree_t *tree,

LXB_API lxb_html_element_t *
lxb_html_tree_create_element_for_token(lxb_html_tree_t *tree,
lxb_html_token_t *token, lxb_ns_id_t ns,
lxb_dom_node_t *parent);
lxb_html_token_t *token, lxb_ns_id_t ns);

LXB_API lxb_status_t
lxb_html_tree_append_attributes(lxb_html_tree_t *tree,
Expand Down
3 changes: 1 addition & 2 deletions ext/dom/lexbor/lexbor/html/tree/insertion_mode/before_html.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ lxb_html_tree_insertion_mode_before_html_open(lxb_html_tree_t *tree,
lxb_html_element_t *element;

element = lxb_html_tree_create_element_for_token(tree, token,
LXB_NS_HTML,
&tree->document->dom_document.node);
LXB_NS_HTML);
if (element == NULL) {
tree->status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;

Expand Down
11 changes: 1 addition & 10 deletions ext/dom/lexbor/lexbor/html/tree/insertion_mode/in_head.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,7 @@ lxb_html_tree_insertion_mode_in_head_script(lxb_html_tree_t *tree,
return lxb_html_tree_process_abort(tree);
}

if (ipos == LXB_HTML_TREE_INSERTION_POSITION_CHILD) {
element = lxb_html_tree_create_element_for_token(tree, token,
LXB_NS_HTML, ap_node);
}
else {
element = lxb_html_tree_create_element_for_token(tree, token,
LXB_NS_HTML,
ap_node->parent);
}

element = lxb_html_tree_create_element_for_token(tree, token, LXB_NS_HTML);
if (element == NULL) {
tree->status = LXB_STATUS_ERROR_MEMORY_ALLOCATION;

Expand Down
Loading