From 4f21ff2fe0b862882a7ef78856657cb46bd1685d Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 29 May 2019 15:36:59 -0400 Subject: [PATCH] evas_inline: Clean up evas_object_is_proxy_visible function Summary: This file is full of functions called as: foo(eo_obj, obj); Most of them can be reduced to foo(obj); and internally get the eo_obj with obj->object This would make it impossible to screw up calling them passing an unrelated pair, and make calling code a little more readable. ref T7230 Depends on D9046 Reviewers: raster, cedric, zmike Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7230 Differential Revision: https://phab.enlightenment.org/D9048 --- src/lib/evas/canvas/evas_render.c | 4 ++-- src/lib/evas/include/evas_inline.x | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index aeb0caf..99c9f03 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -1885,10 +1885,10 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj, } } } - else if (!evas_object_is_proxy_visible(eo_obj, obj) || + else if (!evas_object_is_proxy_visible(obj) || (obj->clip.clipees) || (obj->cur->have_clipees)) { - IFRD(!evas_object_is_proxy_visible(eo_obj, obj), level, " proxy not visible\n"); + IFRD(!evas_object_is_proxy_visible(obj), level, " proxy not visible\n"); IFRD(obj->clip.clipees || obj->cur->have_clipees, level, " has clippees\n"); RD(level, "}\n"); eina_evlog("-render_object", eo_obj, 0.0, NULL); diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x index ad6fca2..b9989ee 100644 --- a/src/lib/evas/include/evas_inline.x +++ b/src/lib/evas/include/evas_inline.x @@ -209,7 +209,7 @@ evas_object_clippers_is_visible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro } static inline int -evas_object_is_proxy_visible(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) +evas_object_is_proxy_visible(Evas_Object_Protected_Data *obj) { if ((obj->cur->visible) && //FIXME: Check the cached clipper visible properly. @@ -218,7 +218,7 @@ evas_object_is_proxy_visible(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob || obj->cur->render_op != EVAS_RENDER_BLEND)) { if (obj->func->is_visible) - return obj->func->is_visible(eo_obj); + return obj->func->is_visible(obj->object); return 1; } return 0; -- 2.7.4