aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Michael <cp.michael@samsung.com>2019-05-29 09:43:59 -0400
committerChristopher Michael <cp.michael@samsung.com>2019-05-29 09:48:51 -0400
commitd70ed852698ac7b789407d6c8a03e514597f7ec5 (patch)
tree4d93c9639f43cb0212f16e278a9c4ffddac47154
parentevas_inline: Clean up evas_inline.x (diff)
downloadefl-devs/devilhorns/evas_inline.tar.gz
evas_inline: Clean up evas_inline.xdevs/devilhorns/evas_inline
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 https://phab.enlightenment.org/T7230
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/include/evas_inline.x4
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;
}