mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-08 09:40:10 +00:00
Merge branch 'wip/otte/for-main' into 'main'
rendrenodeparser: Use simpler function See merge request GNOME/gtk!7564
This commit is contained in:
commit
fde8c6df79
@ -3030,11 +3030,9 @@ parse_node (GtkCssParser *parser,
|
||||
{ "subsurface", parse_subsurface_node },
|
||||
};
|
||||
GskRenderNode **node_p = out_node;
|
||||
const GtkCssToken *token;
|
||||
guint i;
|
||||
|
||||
token = gtk_css_parser_get_token (parser);
|
||||
if (gtk_css_token_is (token, GTK_CSS_TOKEN_STRING))
|
||||
if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_STRING))
|
||||
{
|
||||
GskRenderNode *node;
|
||||
char *node_name;
|
||||
|
@ -8221,7 +8221,7 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
|
||||
GtkTextAttributes*
|
||||
gtk_text_view_get_default_attributes (GtkTextView *text_view)
|
||||
{
|
||||
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), NULL);
|
||||
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), gtk_text_attributes_new());
|
||||
|
||||
gtk_text_view_ensure_layout (text_view);
|
||||
|
||||
|
@ -9724,7 +9724,7 @@ roaring_bitmap_t *roaring_bitmap_lazy_xor(const roaring_bitmap_t *x1,
|
||||
container_lazy_xor(c1, container_type_1, c2, container_type_2,
|
||||
&container_result_type);
|
||||
|
||||
if (container_nonzero_cardinality(c, container_result_type)) {
|
||||
if (c && container_nonzero_cardinality(c, container_result_type)) {
|
||||
ra_append(&answer->high_low_container, s1, c,
|
||||
container_result_type);
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user