[PATCH weston 1/3] ivi-shell: remove ivi_layout_get_weston_view

Ucan, Emre (ADITG/SW1) eucan at de.adit-jv.com
Tue Jun 7 09:40:17 UTC 2016


A surface could have more than one views.
Therefore, it is not possible to map a surface to
a specific view. The implementation of the API
iterates the list of views of the surface, and
returns the first found view.

It is not necessary to have this API to found
a view of the surface. Therefore, I removed the API.

Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
 ivi-shell/ivi-layout-shell.h |    3 ---
 ivi-shell/ivi-layout.c       |    8 --------
 ivi-shell/ivi-shell.c        |    8 --------
 3 files changed, 19 deletions(-)

diff --git a/ivi-shell/ivi-layout-shell.h b/ivi-shell/ivi-layout-shell.h
index 3221a0a..68ca68b 100644
--- a/ivi-shell/ivi-layout-shell.h
+++ b/ivi-shell/ivi-layout-shell.h
@@ -39,9 +39,6 @@ struct weston_view;
 struct weston_surface;
 struct ivi_layout_surface;
 
-struct weston_view *
-ivi_layout_get_weston_view(struct ivi_layout_surface *surface);
-
 void
 ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
 			     int32_t width, int32_t height);
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 81e5621..9ce0ab0 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1875,14 +1875,6 @@ ivi_layout_surface_dump(struct weston_surface *surface,
 /**
  * methods of interaction between ivi-shell with ivi-layout
  */
-struct weston_view *
-ivi_layout_get_weston_view(struct ivi_layout_surface *surface)
-{
-	if (surface == NULL)
-		return NULL;
-
-	return get_weston_view(surface);
-}
 
 void
 ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index c1af78c..6ecb32f 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -339,19 +339,11 @@ bind_ivi_application(struct wl_client *client,
 struct weston_view *
 get_default_view(struct weston_surface *surface)
 {
-	struct ivi_shell_surface *shsurf;
 	struct weston_view *view;
 
 	if (!surface || wl_list_empty(&surface->views))
 		return NULL;
 
-	shsurf = get_ivi_shell_surface(surface);
-	if (shsurf && shsurf->layout_surface) {
-		view = ivi_layout_get_weston_view(shsurf->layout_surface);
-		if (view)
-			return view;
-	}
-
 	wl_list_for_each(view, &surface->views, surface_link) {
 		if (weston_view_is_mapped(view))
 			return view;
-- 
1.7.9.5



More information about the wayland-devel mailing list