summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-02-21 12:24:56 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-02-21 12:24:56 +0900
commit51765b8b9f34582e63915da5fc218fb3de507874 (patch)
tree53b103f29b28671624df7ba807cdad7170d8444f /src/lib
parenta55e0ced2604777c97521dddcf09b0421c6ea504 (diff)
evas: Avoid data_scope_get in internal function
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_render.c9
-rw-r--r--src/lib/evas/include/evas_private.h2
3 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 96a37e2fc3..7ff42a6ed1 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -497,7 +497,7 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
497 497
498 if (obj->changed) return; 498 if (obj->changed) return;
499 499
500 evas_render_object_recalc(eo_obj); 500 evas_render_object_recalc(obj);
501 /* set changed flag on all objects this one clips too */ 501 /* set changed flag on all objects this one clips too */
502 if (!((movch) && (obj->is_static_clip))) 502 if (!((movch) && (obj->is_static_clip)))
503 { 503 {
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 54690dc3c9..43085aaf9a 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -3839,15 +3839,8 @@ evas_render_invalidate(Evas *eo_e)
3839} 3839}
3840 3840
3841void 3841void
3842evas_render_object_recalc(Evas_Object *eo_obj) 3842evas_render_object_recalc(Evas_Object_Protected_Data *obj)
3843{ 3843{
3844 Evas_Object_Protected_Data *obj;
3845
3846 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3847 return;
3848 MAGIC_CHECK_END();
3849
3850 obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
3851 if ((!obj->changed) && (obj->delete_me < 2)) 3844 if ((!obj->changed) && (obj->delete_me < 2))
3852 { 3845 {
3853 Evas_Public_Data *e; 3846 Evas_Public_Data *e;
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index eb9a1a0785..69e976c590 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -2000,7 +2000,7 @@ Eina_Bool evas_render_mapped(Evas_Public_Data *e, Evas_Object *obj,
2000 Evas_Proxy_Render_Data *proxy_render_data, 2000 Evas_Proxy_Render_Data *proxy_render_data,
2001 int level, Eina_Bool do_async); 2001 int level, Eina_Bool do_async);
2002void evas_render_invalidate(Evas *e); 2002void evas_render_invalidate(Evas *e);
2003void evas_render_object_recalc(Evas_Object *obj); 2003void evas_render_object_recalc(Evas_Object_Protected_Data *obj);
2004void 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); 2004void 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);
2005void 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); 2005void 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);
2006 2006