enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

remove unnecessary conditional in e_comp_object_render()

This commit is contained in:
Mike Blumenkrantz 2016-04-21 18:06:58 -04:00
parent 2a67b3a899
commit 77e8ab0926
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/e_comp_object.c
View File

@ -3819,31 +3819,26 @@ e_comp_object_render(Evas_Object *obj)
if (e_pixmap_image_is_argb(cw->ec->pixmap)) if (e_pixmap_image_is_argb(cw->ec->pixmap))
{ {
pix = e_pixmap_image_data_get(cw->ec->pixmap); pix = e_pixmap_image_data_get(cw->ec->pixmap);
if (e_comp->comp_type == E_PIXMAP_TYPE_X) EINA_ITERATOR_FOREACH(it, r)
{ {
EINA_ITERATOR_FOREACH(it, r) E_RECTS_CLIP_TO_RECT(r->x, r->y, r->w, r->h, 0, 0, pw, ph);
/* get pixmap data from rect region on display server into memory */
ret = e_pixmap_image_draw(cw->ec->pixmap, r);
if (!ret)
{ {
E_RECTS_CLIP_TO_RECT(r->x, r->y, r->w, r->h, 0, 0, pw, ph); WRN("UPDATE [%p]: %i %i %ix%i FAIL(%u)!!!!!!!!!!!!!!!!!", cw->ec, r->x, r->y, r->w, r->h, cw->failures);
/* get pixmap data from rect region on display server into memory */ if (++cw->failures < FAILURE_MAX)
ret = e_pixmap_image_draw(cw->ec->pixmap, r); e_comp_object_damage(obj, 0, 0, pw, ph);
if (!ret) else
{ {
WRN("UPDATE [%p]: %i %i %ix%i FAIL(%u)!!!!!!!!!!!!!!!!!", cw->ec, r->x, r->y, r->w, r->h, cw->failures); DELD(cw->ec, 2);
if (++cw->failures < FAILURE_MAX) e_object_del(E_OBJECT(cw->ec));
e_comp_object_damage(obj, 0, 0, pw, ph); return EINA_FALSE;
else
{
DELD(cw->ec, 2);
e_object_del(E_OBJECT(cw->ec));
return EINA_FALSE;
}
break;
} }
RENDER_DEBUG("UPDATE [%p] %i %i %ix%i", cw->ec, r->x, r->y, r->w, r->h); break;
} }
RENDER_DEBUG("UPDATE [%p] %i %i %ix%i", cw->ec, r->x, r->y, r->w, r->h);
} }
else
ret = EINA_TRUE;
evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix); evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
goto end; goto end;
} }