From 343698f7eceb7cc3cfdb21da955abd401adc16a8 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 29 May 2019 15:37:18 -0400 Subject: [PATCH] evas_inline: Clean up evas_object_plane_changed 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 D9050 Reviewers: raster, cedric, zmike Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7230 Differential Revision: https://phab.enlightenment.org/D9051 --- src/lib/evas/canvas/evas_render.c | 2 +- src/lib/evas/include/evas_inline.x | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index a0f381b2eb..feaf5b214a 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -3133,7 +3133,7 @@ _evas_planes(Evas_Public_Data *evas) _evas_object_image_plane_release(eo_obj2, obj2, output); } else break; } - if (evas_object_plane_changed(eo_obj2, obj2)) + if (evas_object_plane_changed(obj2)) { /* Since we're lifting this object out of the scene graph * (or putting it back), we need to force redraw of the space diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x index eeea55fbba..a67616e47c 100644 --- a/src/lib/evas/include/evas_inline.x +++ b/src/lib/evas/include/evas_inline.x @@ -126,10 +126,10 @@ evas_object_is_on_plane(Evas_Object_Protected_Data *obj) } static inline int -evas_object_plane_changed(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) +evas_object_plane_changed(Evas_Object_Protected_Data *obj) { if (obj->func->plane_changed) - return obj->func->plane_changed(eo_obj, obj, obj->private_data); + return obj->func->plane_changed(obj->object, obj, obj->private_data); return 0; }