ivi-shell: remove unnecesary code in ivi_layout_surface_configure

Submitted by Nobuhiko Tanibata on April 27, 2015, 7:54 a.m.

Details

Message ID 1430121241-11236-1-git-send-email-nobuhiko_tanibata@xddp.denso.co.jp
State Accepted
Commit e6cc997097ede3f67892be916ac0afd25698afb6
Headers show

Not browsing as part of any series.

Commit Message

Nobuhiko Tanibata April 27, 2015, 7:54 a.m.
ivi_layout_surface_configure is called from ivi-shell when configure
listener of weston surface is triggered. This function shall do,
- emit signal to hmi-controller to notify the configuration change

Other unnecesary logics are cleaned up.

Signed-off-by: Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
---
 ivi-shell/ivi-layout.c | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

Patch hide | download patch | download mbox

diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index cd4a171..dc6053d 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -2691,29 +2691,10 @@  ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
 			     int32_t width, int32_t height)
 {
 	struct ivi_layout *layout = get_instance();
-	int32_t in_init = 0;
-	ivisurf->surface->width_from_buffer  = width;
-	ivisurf->surface->height_from_buffer = height;
 
-	if (ivisurf->prop.source_width == 0 || ivisurf->prop.source_height == 0) {
-		in_init = 1;
-	}
-
-	/* FIXME: when sourceHeight/Width is used as clipping range in image buffer */
-	/* if (ivisurf->prop.sourceWidth == 0 || ivisurf->prop.sourceHeight == 0) { */
-		ivisurf->pending.prop.source_width = width;
-		ivisurf->pending.prop.source_height = height;
-		ivisurf->prop.source_width = width;
-		ivisurf->prop.source_height = height;
-	/* } */
-
-	ivisurf->event_mask |= IVI_NOTIFICATION_CONFIGURE;
-
-	if (in_init) {
-		wl_signal_emit(&layout->surface_notification.configure_changed, ivisurf);
-	} else {
-		ivi_layout_commit_changes();
-	}
+	/* emit callback which is set by ivi-layout api user */
+	wl_signal_emit(&layout->surface_notification.configure_changed,
+		       ivisurf);
 }
 
 static int32_t