AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

rendernodes: Fix unconditionally impossible diffs

Browse Source 
Some of the _diff implementations did a whole bunch of work just to
throw it away afterwards and invalidate the entire union of the two
render nodes, most notably the two clip nodes. Fix this to only call
gsk_render_node_diff_impossible if the previous if-condition is FALSE
and not always.
This commit is contained in:
Timm Bäder 2018-07-08 12:50:21 +02:00
parent 50f76eb8cc
commit a0b8e32462
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gsk/gskrendernodeimpl.c
View File

@ -3565,7 +3565,7 @@ gsk_clip_node_diff (GskRenderNode *node1,
{
cairo_region_t *sub;
cairo_rectangle_int_t clip_rect;
sub = cairo_region_create();
gsk_render_node_diff (self1->child, self2->child, sub);
rectangle_init_from_graphene (&clip_rect, &self1->clip);
@ -3573,8 +3573,10 @@ gsk_clip_node_diff (GskRenderNode *node1,
cairo_region_union (region, sub);
cairo_region_destroy (sub);
}
gsk_render_node_diff_impossible (node1, node2, region);
else
{
gsk_render_node_diff_impossible (node1, node2, region);
}
}
#define GSK_CLIP_NODE_VARIANT_TYPE "(dddduv)"
@ -3737,7 +3739,7 @@ gsk_rounded_clip_node_diff (GskRenderNode *node1,
{
cairo_region_t *sub;
cairo_rectangle_int_t clip_rect;
sub = cairo_region_create();
gsk_render_node_diff (self1->child, self2->child, sub);
rectangle_init_from_graphene (&clip_rect, &self1->clip.bounds);
@ -3745,8 +3747,10 @@ gsk_rounded_clip_node_diff (GskRenderNode *node1,
cairo_region_union (region, sub);
cairo_region_destroy (sub);
}
gsk_render_node_diff_impossible (node1, node2, region);
else
{
gsk_render_node_diff_impossible (node1, node2, region);
}
}
#define GSK_ROUNDED_CLIP_NODE_VARIANT_TYPE "(dddddddddddduv)"
@ -4262,8 +4266,10 @@ gsk_blend_node_diff (GskRenderNode *node1,
gsk_render_node_diff (self1->top, self2->top, region);
gsk_render_node_diff (self1->bottom, self2->bottom, region);
}
gsk_render_node_diff_impossible (node1, node2, region);
else
{
gsk_render_node_diff_impossible (node1, node2, region);
}
}
#define GSK_BLEND_NODE_VARIANT_TYPE "(uvuvu)"