[cogl/cogl-1.22] wayland-winsys: Take possible pending resize into account

[Olivier Fourdan <ofourdan src gnome org>]

commit e0fda738232d6a1c69a150d7528a970887fb459f
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Mon Oct 10 17:09:24 2016 +0200

    wayland-winsys: Take possible pending resize into account
    
    When doing two resizes in a row, a pending resize may be different from
    the new size whereas the cogl framebuffer is already of the same size,
    in which case the new resize might be erroneously ignored.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772707

 cogl/winsys/cogl-winsys-egl-wayland.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c
index 2e22052..dad7b1e 100644
--- a/cogl/winsys/cogl-winsys-egl-wayland.c
+++ b/cogl/winsys/cogl-winsys-egl-wayland.c
@@ -785,6 +785,8 @@ cogl_wayland_onscreen_resize (CoglOnscreen *onscreen,
 
       if (cogl_framebuffer_get_width (fb) != width ||
           cogl_framebuffer_get_height (fb) != height ||
+          wayland_onscreen->pending_width != width ||
+          wayland_onscreen->pending_height != height ||
           offset_x ||
           offset_y)
         {