summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-06-25 21:56:28 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-06-25 21:56:28 +0900
commit44568ef01d30c384b5b9e67f602f39c705391aa6 (patch)
tree42d308d82b3b94d5a64483b7b04f11dbecd6e604
parentede5390258afa4c999a2a01906fd50f3e6d78a60 (diff)
efl/evas - removed duplicated lines and apply clipping only when clip values are available.
-rw-r--r--src/lib/evas/canvas/evas_render.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 575e116391..72a30281a2 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1335,11 +1335,11 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1335 { 1335 {
1336 int x, y, w, h; 1336 int x, y, w, h;
1337 1337
1338 if (_evas_render_has_map(eo_obj, obj))
1339 evas_object_clip_recalc(obj);
1340
1338 if (proxy_src_clip) 1341 if (proxy_src_clip)
1339 { 1342 {
1340 if (_evas_render_has_map(eo_obj, obj))
1341 evas_object_clip_recalc(obj);
1342
1343 x = obj->cur->cache.clip.x + off_x; 1343 x = obj->cur->cache.clip.x + off_x;
1344 y = obj->cur->cache.clip.y + off_y; 1344 y = obj->cur->cache.clip.y + off_y;
1345 w = obj->cur->cache.clip.w; 1345 w = obj->cur->cache.clip.w;
@@ -1356,9 +1356,6 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1356 } 1356 }
1357 else 1357 else
1358 { 1358 {
1359 if (_evas_render_has_map(eo_obj, obj))
1360 evas_object_clip_recalc(obj);
1361
1362 //FIXME: Consider to clip by the proxy clipper. 1359 //FIXME: Consider to clip by the proxy clipper.
1363 if (proxy_render_data->eo_src != eo_obj) 1360 if (proxy_render_data->eo_src != eo_obj)
1364 { 1361 {
@@ -1366,6 +1363,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1366 y = obj->cur->clipper->cur->geometry.y + off_y; 1363 y = obj->cur->clipper->cur->geometry.y + off_y;
1367 w = obj->cur->clipper->cur->geometry.w; 1364 w = obj->cur->clipper->cur->geometry.w;
1368 h = obj->cur->clipper->cur->geometry.h; 1365 h = obj->cur->clipper->cur->geometry.h;
1366 e->engine.func->context_clip_set(e->engine.data.output, ctx, x, y, w, h);
1369 } 1367 }
1370 else 1368 else
1371 { 1369 {
@@ -1379,10 +1377,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1379 off_y; 1377 off_y;
1380 w = proxy->cur->clipper->cur->geometry.w; 1378 w = proxy->cur->clipper->cur->geometry.w;
1381 h = proxy->cur->clipper->cur->geometry.h; 1379 h = proxy->cur->clipper->cur->geometry.h;
1380 e->engine.func->context_clip_set(e->engine.data.output, ctx, x, y, w, h);
1382 } 1381 }
1383 } 1382 }
1384 e->engine.func->context_clip_set(e->engine.data.output,
1385 ctx, x, y, w, h);
1386 } 1383 }
1387 } 1384 }
1388 obj->func->render(eo_obj, obj, e->engine.data.output, ctx, 1385 obj->func->render(eo_obj, obj, e->engine.data.output, ctx,