From 77684dc53a5bdaf59fa70917c5f6680825484204 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Tue, 5 Jun 2018 20:58:35 +0900 Subject: [PATCH] Revert "evas: fix a map rendering problem." This reverts commit 9fcd03952ee51d34871794cb95585f3e589a3bb9. Just noticed from ManMower, this caused a side-effect that drops enlightenment performance. I need to check it seriously then decide again how this patch to be. --- src/lib/evas/canvas/evas_object_main.c | 1 + src/lib/evas/canvas/evas_object_smart.c | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 84b43179c5..d23c8ece03 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -838,6 +838,7 @@ evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *eo_obj, in if (!obj) return; if (!obj->layer) return; + if (obj->is_smart) goto end; /* FIXME: was_v isn't used... why? */ if (!obj->clip.clipees) { diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 73f156effa..37c8868479 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -1710,19 +1710,11 @@ evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data EINA_UNUSED) { - int is_v, was_v; - if (obj->pre_render_done) return; if (obj->changed_map || obj->changed_src_visible) - { - evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, - eo_obj, obj); - is_v = evas_object_is_visible(eo_obj, obj); - was_v = evas_object_was_visible(eo_obj,obj); - evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, - eo_obj, is_v, was_v); - } + evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, + eo_obj, obj); obj->pre_render_done = EINA_TRUE; }