X11Window::resize wait for the window to be resized before returning

util/x11/X11Window.cpp

@@ -8,6 +8,9 @@
 
 #include "x11/X11Window.h"
 
+#include "system_utils.h"
+#include "Timer.h"
+
 namespace {
 
 Bool WaitForMapNotify(Display *dpy, XEvent *event, XPointer window)
@@ -289,6 +292,19 @@ bool X11Window::resize(int width, int height)
 {
     XResizeWindow(mDisplay, mWindow, width, height);
     XFlush(mDisplay);
+
+    Timer* timer = CreateTimer();
+    timer->start();
+
+    // Wait until the window as actually been resized so that the code calling resize
+    // can assume the window has been resized.
+    const double kResizeWaitDelay = 0.2;
+    while (mHeight != height && mWidth != width && timer->getElapsedTime() < kResizeWaitDelay)
+    {
+        messageLoop();
+        angle::Sleep(10);
+    }
+
     return true;
 }