mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor: refactor more into weston_surface_attach 

Merge more code into a common function. No functional changes.

At every site where weston_surface_set_size_from_buffer() was called,
weston_surface_attach() was called first. Move all calls of
set_size_from_buffer into weston_surface_attach.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Pekka Paalanen 2014-03-14 14:38:11 +02:00 committed by Kristian Høgsberg
parent b2c86363b8
commit bb2f3f2f91
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/compositor.c
View File

@ -1478,6 +1478,8 @@ weston_surface_attach(struct weston_surface *surface,
}
surface->compositor->renderer->attach(surface, buffer);
weston_surface_set_size_from_buffer(surface);
}
WL_EXPORT void
@ -2010,10 +2012,8 @@ weston_surface_commit(struct weston_surface *surface)
surface->buffer_viewport = surface->pending.buffer_viewport;
/* wl_surface.attach */
if (surface->pending.buffer || surface->pending.newly_attached) {
if (surface->pending.buffer || surface->pending.newly_attached)
weston_surface_attach(surface, surface->pending.buffer);
weston_surface_set_size_from_buffer(surface);
}
if (surface->configure && surface->pending.newly_attached)
surface->configure(surface,
@ -2236,10 +2236,8 @@ weston_subsurface_commit_from_cache(struct weston_subsurface *sub)
surface->buffer_viewport = sub->cached.buffer_viewport;
/* wl_surface.attach */
if (sub->cached.buffer_ref.buffer || sub->cached.newly_attached) {
if (sub->cached.buffer_ref.buffer || sub->cached.newly_attached)
weston_surface_attach(surface, sub->cached.buffer_ref.buffer);
weston_surface_set_size_from_buffer(surface);
}
weston_buffer_reference(&sub->cached.buffer_ref, NULL);
if (surface->configure && sub->cached.newly_attached)