From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 13 Apr 2022 12:37:12 +0000 (+0300)
Subject: layout: Make the view mapped at activation completion
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=aecb2e266d3a28772a1d5f81fa09ae4c93149947;p=src%2Fagl-compositor.git

layout: Make the view mapped at activation completion

Instead of tagging it various places just do it a completion phase.
Makes things a bit easier to follow/read.

Bug-AGL: SPEC-4302
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I91ad6b29a786c4c78afa8ff07d104008be7bcb84
(cherry picked from commit b13e185e7214218ca00025a480695392aa5cdee2)
---

diff --git a/src/layout.c b/src/layout.c
index 5541632..6c1df79 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -203,6 +203,7 @@ ivi_layout_activate_complete(struct ivi_output *output,
 				 woutput->y + output->area.y);
 
 	view->is_mapped = true;
+	surf->mapped = true;
 	view->surface->is_mapped = true;
 
 	if (output->active) {
@@ -339,7 +340,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 					weston_desktop_surface_get_app_id(surf->dsurface),
 					ivi_layout_get_surface_role_name(surf));
 				ivi_layout_activate(r_output, app_id);
-				surf->mapped = true;
 			} else if (!app_id) {
 				/*
 				 * applications not setting an app_id, or
@@ -351,7 +351,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 				weston_log("Surface no app_id, role %s activating by default\n",
 					ivi_layout_get_surface_role_name(surf));
 				ivi_layout_activate_by_surf(r_output, surf);
-				surf->mapped = true;
 			}
 		}
 
@@ -376,7 +375,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 					weston_desktop_surface_get_app_id(surf->dsurface),
 					ivi_layout_get_surface_role_name(surf));
 			ivi_layout_activate(output, app_id);
-			surf->mapped = true;
 		}
 		return;
 	}