Backing out 78b16bbb25ff. Wrong Patch. r=blassey. CLOSED TREE
authorDoug Turner <dougt@dougt.org>
Thu, 15 Apr 2010 15:01:53 -0700
changeset 40905 d4b7d97017c38bce70d8614ca2b8916f63a0abb6
parent 40904 78b16bbb25ffd2e02b78289ddebdfc52beee4a3d
child 40906 c4a3c240ab5e8a3d363eafa06bf6a5a75d07017e
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Backing out 78b16bbb25ff. Wrong Patch. r=blassey. CLOSED TREE
widget/src/qt/nsWindow.cpp
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -553,20 +553,16 @@ nsWindow::SetSizeMode(PRInt32 aMode)
     switch (aMode) {
     case nsSizeMode_Maximized:
         widget->showMaximized();
         break;
     case nsSizeMode_Minimized:
         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;
 
     default:
         // nsSizeMode_Normal, really.
         widget->showNormal();
         break;
     }
@@ -1931,20 +1927,16 @@ nsWindow::MakeFullScreen(PRBool aFullScr
 {
     QWidget *widget = GetViewWidget();
     NS_ENSURE_TRUE(widget, NS_ERROR_FAILURE);
     if (aFullScreen) {
         if (mSizeMode != nsSizeMode_Fullscreen)
             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 {
         mSizeMode = mLastSizeMode;
 
         switch (mSizeMode) {
         case nsSizeMode_Maximized:
             widget->showMaximized();