surface: Accumulate commit state on surface_state_move

Instead of having replaced commit state with next one, this patch
accumulates commit state. Otherwise, cached state would be replaced by
the pending state.

If a state needs to be replaced, then caller can initialie the commit
state before the call to surface_state_move().

Change-Id: I92072b38989f14fa4db84d95329d058cab6614f2

diff --git a/src/compositor/surface.c b/src/compositor/surface.c
index ebf2a6e..aa3c9fa 100644 (file)
--- a/src/compositor/surface.c
+++ b/src/compositor/surface.c
@@ -363,9 +363,7 @@ surface_state_move(struct ds_surface_state *state, struct ds_surface_state *next
         wl_list_init(&next->frame_callback_list);
     }
 
-    // FIXME
-    // state->committed |= next->committed; ??
-    state->committed = next->committed;
+    state->committed |= next->committed;
     next->committed = 0;
 }