dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: Avoid data_scope_get in internal function

This commit is contained in:
Jean-Philippe Andre 2017-02-21 12:24:56 +09:00
parent a55e0ced26
commit 51765b8b9f
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/evas/canvas/evas_object_main.c
View File

@ -497,7 +497,7 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
if (obj->changed) return;
evas_render_object_recalc(eo_obj);
evas_render_object_recalc(obj);
/* set changed flag on all objects this one clips too */
if (!((movch) && (obj->is_static_clip)))
{

9
src/lib/evas/canvas/evas_render.c
View File

@ -3839,15 +3839,8 @@ evas_render_invalidate(Evas *eo_e)
}
void
evas_render_object_recalc(Evas_Object *eo_obj)
evas_render_object_recalc(Evas_Object_Protected_Data *obj)
{
Evas_Object_Protected_Data *obj;
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if ((!obj->changed) && (obj->delete_me < 2))
{
Evas_Public_Data *e;

2
src/lib/evas/include/evas_private.h
View File

@ -2000,7 +2000,7 @@ Eina_Bool evas_render_mapped(Evas_Public_Data *e, Evas_Object *obj,
Evas_Proxy_Render_Data *proxy_render_data,
int level, Eina_Bool do_async);
void evas_render_invalidate(Evas *e);
void evas_render_object_recalc(Evas_Object *obj);
void evas_render_object_recalc(Evas_Object_Protected_Data *obj);
void evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas_Object_Protected_Data *proxy_obj, Eina_Bool source_clip, Eina_Bool do_async);
void evas_render_mask_subrender(Evas_Public_Data *e, Evas_Object_Protected_Data *mask, Evas_Object_Protected_Data *prev_mask, int level, Eina_Bool do_async);