libweston-desktop: Rename _destroy_view to _unlink_view

It doesn't destroy the view per se (except for internal surfaces) and
require the caller to also destroy the view itself at the appropriate
time.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
dev
Quentin Glidic 8 years ago
parent 729c7fa788
commit f01ecee75a
No known key found for this signature in database
GPG Key ID: AC203F96E2C34BB7
  1. 2
      desktop-shell/shell.c
  2. 2
      libweston-desktop/libweston-desktop.h
  3. 2
      libweston-desktop/surface.c
  4. 4
      libweston-desktop/xwayland.c

@ -2364,7 +2364,7 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface,
weston_desktop_surface_set_user_data(shsurf->desktop_surface, NULL); weston_desktop_surface_set_user_data(shsurf->desktop_surface, NULL);
shsurf->desktop_surface = NULL; shsurf->desktop_surface = NULL;
weston_desktop_surface_destroy_view(shsurf->view); weston_desktop_surface_unlink_view(shsurf->view);
if (weston_surface_is_mapped(surface) && if (weston_surface_is_mapped(surface) &&
shsurf->shell->win_close_animation_type == ANIMATION_FADE) { shsurf->shell->win_close_animation_type == ANIMATION_FADE) {
pixman_region32_fini(&surface->pending.input); pixman_region32_fini(&surface->pending.input);

@ -111,7 +111,7 @@ weston_desktop_surface_set_user_data(struct weston_desktop_surface *self,
struct weston_view * struct weston_view *
weston_desktop_surface_create_view(struct weston_desktop_surface *surface); weston_desktop_surface_create_view(struct weston_desktop_surface *surface);
void void
weston_desktop_surface_destroy_view(struct weston_view *view); weston_desktop_surface_unlink_view(struct weston_view *view);
void void
weston_desktop_surface_propagate_layer(struct weston_desktop_surface *surface); weston_desktop_surface_propagate_layer(struct weston_desktop_surface *surface);
void void

@ -404,7 +404,7 @@ weston_desktop_surface_create_view(struct weston_desktop_surface *surface)
} }
WL_EXPORT void WL_EXPORT void
weston_desktop_surface_destroy_view(struct weston_view *wview) weston_desktop_surface_unlink_view(struct weston_view *wview)
{ {
struct weston_desktop_surface *surface; struct weston_desktop_surface *surface;
struct weston_desktop_view *view; struct weston_desktop_view *view;

@ -80,7 +80,7 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf
if (surface->state != state) { if (surface->state != state) {
if (surface->state == XWAYLAND) { if (surface->state == XWAYLAND) {
weston_desktop_surface_destroy_view(surface->view); weston_desktop_surface_unlink_view(surface->view);
surface->view = NULL; surface->view = NULL;
} }
@ -153,7 +153,7 @@ weston_desktop_xwayland_surface_destroy(struct weston_desktop_surface *dsurface,
weston_desktop_api_surface_removed(surface->desktop, weston_desktop_api_surface_removed(surface->desktop,
surface->surface); surface->surface);
else if (surface->state == XWAYLAND) else if (surface->state == XWAYLAND)
weston_desktop_surface_destroy_view(surface->view); weston_desktop_surface_unlink_view(surface->view);
free(surface); free(surface);
} }

Loading…
Cancel
Save