summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_render.c
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-12-08 03:14:14 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-12-08 03:14:14 +0900
commit3c58b3ebeb896281a24ba9143fc64df03510631c (patch)
tree75048b227137a277755b323e2e8a20c8cc587a47 /src/lib/evas/canvas/evas_render.c
parentb113f555e0ea0b0261ad870fca35d427a415c20e (diff)
Revert "evas/render - make sure render pre in proxy rendering."
This reverts commit b113f555e0ea0b0261ad870fca35d427a415c20e. found side effect... revert this code until fix them.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/canvas/evas_render.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index a60026e7ff..d33cd42421 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -313,22 +313,6 @@ _evas_proxy_redraw_set(Evas_Public_Data *e, Evas_Object_Protected_Data *obj,
313} 313}
314 314
315static void 315static void
316_evas_proxy_render_pre(Evas_Object_Protected_Data *obj)
317{
318 Evas_Object_Protected_Data *obj2;
319
320 /* render_pre() won't be called if the children were the invisible
321 mapped object. So here make sure render_pre() for the children. */
322 obj->func->render_pre(obj->object, obj, obj->private_data);
323
324 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj->object),
325 obj2)
326 {
327 if (obj2->changed) _evas_proxy_render_pre(obj2);
328 }
329}
330
331static void
332_evas_render_phase1_direct(Evas_Public_Data *e, 316_evas_render_phase1_direct(Evas_Public_Data *e,
333 Eina_Array *active_objects, 317 Eina_Array *active_objects,
334 Eina_Array *restack_objects EINA_UNUSED, 318 Eina_Array *restack_objects EINA_UNUSED,
@@ -370,13 +354,9 @@ _evas_render_phase1_direct(Evas_Public_Data *e,
370 if (obj->changed) 354 if (obj->changed)
371 { 355 {
372 evas_object_clip_recalc(obj); 356 evas_object_clip_recalc(obj);
357 obj->func->render_pre(eo_obj, obj, obj->private_data);
373 if (obj->proxy->redraw) 358 if (obj->proxy->redraw)
374 { 359 _evas_render_prev_cur_clip_cache_add(e, obj);
375 _evas_proxy_render_pre(obj);
376 _evas_render_prev_cur_clip_cache_add(e, obj);
377 }
378 else obj->func->render_pre(eo_obj, obj, obj->private_data);
379
380 if (obj->proxy->proxies) 360 if (obj->proxy->proxies)
381 { 361 {
382 if (obj->smart.smart && evas_object_smart_changed_get(eo_obj)) 362 if (obj->smart.smart && evas_object_smart_changed_get(eo_obj))