From 7eeb60855e1acda964f42dd5fe6cf039b17ff8b3 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Thu, 15 Apr 2010 21:48:04 -0700
Subject: [PATCH] Bug 556971 - Fix MOZ_USE_IMAGE_EXPOSE use of shared memory.
 r=jrmuizel

---
 widget/src/qt/nsWindow.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index f65a79cebfd0..5759273fc78f 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -558,6 +558,10 @@ nsWindow::SetSizeMode(PRInt32 aMode)
         widget->showMinimized();
         break;
     case nsSizeMode_Fullscreen:
+        // Some versions of Qt (4.6.x) crash in XSetInputFocus due to
+        // unsynchronized window activation.  Sync here to avoid such
+        // cases.
+        XSync(QX11Info().display(), False);
         widget->showFullScreen();
         break;
 
@@ -1932,6 +1936,10 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
             mLastSizeMode = mSizeMode;
 
         mSizeMode = nsSizeMode_Fullscreen;
+        // Some versions of Qt (4.6.x) crash in XSetInputFocus due to
+        // unsynchronized window activation.  Sync here to avoid such
+        // cases.
+        XSync(QX11Info().display(), False);
         widget->showFullScreen();
     }
     else {