summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2018-08-06 07:23:48 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-06 07:23:48 -0400
commit31b6e87495d21b25e6f9f19c0560856d0f4ea7c3 (patch)
tree4b0ec90801dcb401ff19d0c3a552c0603eb015bd
parentd9225877641b8e25a1e21920c9c2b39a72db9c79 (diff)
downloadefl-31b6e87495d21b25e6f9f19c0560856d0f4ea7c3.tar.gz
evas image: code refactoring.
Summary: remove duplicated, no logical changes. Reviewers: #committers, zmike Reviewed By: #committers, zmike Subscribers: cedric, #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6738
-rw-r--r--src/lib/evas/canvas/evas_object_image.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 2d217e3ad7..c5bdc58184 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -2331,14 +2331,8 @@ evas_object_image_render_pre(Evas_Object *eo_obj,
evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
goto done;
}
- /* if it changed render op */
- if (obj->cur->render_op != obj->prev->render_op)
- {
- evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
- goto done;
- }
- /* if it changed anti_alias */
- if (obj->cur->anti_alias != obj->prev->anti_alias)
+ if ((obj->cur->render_op != obj->prev->render_op) || /* if it changed render op */
+ (obj->cur->anti_alias != obj->prev->anti_alias)) /* if it changed anti_alias */
{
evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
goto done;
@@ -2373,19 +2367,11 @@ evas_object_image_render_pre(Evas_Object *eo_obj,
evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
goto done;
}
- if (o->dirty_pixels && !o->pixels->pixel_updates)
- {
+ if ((o->cur->frame != o->prev->frame) ||
+ (o->cur->orient != o->prev->orient) ||
/* Legacy compatibility (invalid behaviour): dirty_set() used to
* trigger full image redraw, even though this was not correct. */
- evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
- goto done;
- }
- if (o->cur->frame != o->prev->frame)
- {
- evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
- goto done;
- }
- if (o->cur->orient != o->prev->orient)
+ (o->dirty_pixels && !o->pixels->pixel_updates))
{
evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
goto done;