summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <cp.michael@samsung.com>2019-05-29 09:42:17 -0400
committerChristopher Michael <cp.michael@samsung.com>2019-05-29 09:48:51 -0400
commit61488e424ca7560487af6d9fbb33fcb37a635bdc (patch)
tree0d5235fe6feb8ad8a98b516d79f40ef5fbabaea6
parent37a7b49e9e05b38c5656cd9647b82d28c76c7505 (diff)
evas_inline: Clean up evas_inline.x
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
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_render.c4
-rw-r--r--src/lib/evas/include/evas_inline.x4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 35556cbf77..1305ee3009 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -766,7 +766,7 @@ evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *eo_obj, in
766 766
767 if (obj->is_smart) goto end; 767 if (obj->is_smart) goto end;
768 768
769 if (evas_object_is_on_plane(eo_obj, obj)) 769 if (evas_object_is_on_plane(obj))
770 { 770 {
771 /* We need some damage to occur if only planes are being updated, 771 /* We need some damage to occur if only planes are being updated,
772 or nothing will provoke a page flip. 772 or nothing will provoke a page flip.
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index fe77fa7eba..a0f381b2eb 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1236,7 +1236,7 @@ _evas_render_phase1_process(Phase1_Context *p1ctx)
1236 1236
1237 EINA_INLIST_FOREACH(lay->objects, obj) 1237 EINA_INLIST_FOREACH(lay->objects, obj)
1238 { 1238 {
1239 if (evas_object_is_on_plane(obj->object, obj)) continue; 1239 if (evas_object_is_on_plane(obj)) continue;
1240 clean_them |= _evas_render_phase1_object_process 1240 clean_them |= _evas_render_phase1_object_process
1241 (p1ctx, obj, EINA_FALSE, EINA_FALSE, EINA_FALSE, 2); 1241 (p1ctx, obj, EINA_FALSE, EINA_FALSE, EINA_FALSE, 2);
1242 } 1242 }
@@ -3147,7 +3147,7 @@ _evas_planes(Evas_Public_Data *evas)
3147 3147
3148 /* We also need to clean its previously drawn position 3148 /* We also need to clean its previously drawn position
3149 * but only if we're removing it */ 3149 * but only if we're removing it */
3150 if (evas_object_is_on_plane(eo_obj2, obj2)) 3150 if (evas_object_is_on_plane(obj2))
3151 _evas_canvas_damage_rectangle_add(NULL, evas, 3151 _evas_canvas_damage_rectangle_add(NULL, evas,
3152 obj2->prev->geometry.x, 3152 obj2->prev->geometry.x,
3153 obj2->prev->geometry.y, 3153 obj2->prev->geometry.y,
diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x
index c5e7fa5323..eeea55fbba 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -118,10 +118,10 @@ evas_object_is_opaque(Evas_Object_Protected_Data *obj)
118} 118}
119 119
120static inline int 120static inline int
121evas_object_is_on_plane(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 121evas_object_is_on_plane(Evas_Object_Protected_Data *obj)
122{ 122{
123 if (obj->func->is_on_plane) 123 if (obj->func->is_on_plane)
124 return obj->func->is_on_plane(eo_obj, obj, obj->private_data); 124 return obj->func->is_on_plane(obj->object, obj, obj->private_data);
125 return 0; 125 return 0;
126} 126}
127 127