enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

evas_render: Make some code easier to read 

Summary:
The variable "clean_them" can only ever be EINA_FALSE for much of this
function, but using it as a return value ensures that anyone not
intimately familiar with the code will have to read a lot of code
to figure out that this is so.

Instead, return EINA_FALSE up until the point clean_them can actually
be something else.

No functional change.

Reviewers: devilhorns, zmike

Reviewed By: zmike

Subscribers: cedric, #committers, zmike

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6464
This commit is contained in:
Derek Foreman 2018-06-28 13:11:59 -05:00
parent c43850eed4
commit 024d38074c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1741,7 +1741,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
{
/* don't render if the source is invisible */
if ((evas_object_is_source_invisible(eo_obj, obj)))
return clean_them;
return EINA_FALSE;
}
else
proxy_src_clip = proxy_render_data->source_clip;
@ -1751,7 +1751,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
/* leave early if clipper is not visible */
if ((obj->cur->clipper) && (!obj->cur->clipper->cur->visible))
return clean_them;
return EINA_FALSE;
eina_evlog("+render_object", eo_obj, 0.0, NULL);
#ifdef REND_DBG
@ -1798,7 +1798,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
RD(level, " not rendering mask surface\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
// else don't return: draw mask in its surface
}
@ -1814,7 +1814,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
IFRD(!evas_object_is_visible(eo_obj, obj), level, " not visible\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
}
else
@ -1829,7 +1829,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
IFRD(!obj->cur->color.a && (obj->cur->render_op == EVAS_RENDER_BLEND), level, " proxy_src_clip + 0 alpha\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
else if (proxy_render_data && (surface != obj->proxy->surface) &&
obj->proxy->src_invisible)
@ -1837,7 +1837,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
RD(level, " src_invisible + not proxy surface (recursive proxies)\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
}
}
@ -1848,14 +1848,14 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
IFRD(obj->clip.clipees || obj->cur->have_clipees, level, " has clippees\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
else if (obj->no_render && (surface != obj->proxy->surface))
{
RD(level, " no_render\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
}
else if (!(((evas_object_is_active(eo_obj, obj) && (!obj->clip.clipees) &&
@ -1867,7 +1867,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
IFRD(obj->clip.clipees, level, " has clippees\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
return clean_them;
return EINA_FALSE;
}
// set render_pre - for child objs that may not have gotten it.