[gtk+] Revert "gtksnapshot: Merge trivial clip duplicates"
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "gtksnapshot: Merge trivial clip duplicates"
- Date: Fri, 1 Dec 2017 08:10:27 +0000 (UTC)
commit 478b1d56f88fdfeeaae6c2efac5be441eb3b5e57
Author: Alexander Larsson <alexl redhat com>
Date: Fri Dec 1 09:08:57 2017 +0100
Revert "gtksnapshot: Merge trivial clip duplicates"
This reverts commit d95cbb275729370a2dd67e24570ac1c68b62b697.
This is better solved by commit 94184eda4214b3162eead554212443b3a0f50481
gtk/gtksnapshot.c | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c
index a5d4c39..702ea03 100644
--- a/gtk/gtksnapshot.c
+++ b/gtk/gtksnapshot.c
@@ -552,21 +552,7 @@ gtk_snapshot_collect_clip (GtkSnapshot *snapshot,
if (graphene_rect_contains_rect (&state->data.clip.bounds, &node->bounds))
return node;
- /* Its not uncommon to produce stacked clip nodes, which are trivial
- to merge, so do that here */
- if (gsk_render_node_get_node_type (node) == GSK_CLIP_NODE)
- {
- GskRenderNode *child = gsk_clip_node_get_child (node);
- const graphene_rect_t *node_clip = gsk_clip_node_peek_clip (node);
- graphene_rect_t merged_clip;
-
- graphene_rect_intersection (&state->data.clip.bounds, node_clip, &merged_clip);
- clip_node = gsk_clip_node_new (child, &state->data.clip.bounds);
- gsk_render_node_unref (node);
- }
- else
- clip_node = gsk_clip_node_new (node, &state->data.clip.bounds);
-
+ clip_node = gsk_clip_node_new (node, &state->data.clip.bounds);
if (name)
gsk_render_node_set_name (clip_node, name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]