Backout of bug 580564 due to regression bug 663586.

widget/src/windows/nsWindow.cpp

@@ -4308,6 +4308,7 @@ DisplaySystemMenu(HWND hWnd, nsSizeMode sizeMode, PRBool isRtl, PRInt32 x, PRInt
     mii.fState = MF_GRAYED;
     switch(sizeMode) {
       case nsSizeMode_Fullscreen:
+        SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
         // intentional fall through
       case nsSizeMode_Maximized:
         SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
@@ -5227,13 +5228,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
                           MOZ_SYSCONTEXT_Y_POS);
         result = PR_TRUE;
       }
-      if (filteredWParam == SC_RESTORE &&
-          mSizeMode == nsSizeMode_Fullscreen) {
-        // Windows can handle restoring a normal window, but it doesn't
-        // understand our full screen mode.
-        MakeFullScreen(PR_FALSE);
-        result = PR_TRUE;
-      }
     }
     break;
 

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -125,7 +125,6 @@ static NS_DEFINE_CID(kWindowCID,           NS_WINDOW_CID);
 nsWebShellWindow::nsWebShellWindow(PRUint32 aChromeFlags)
   : nsXULWindow(aChromeFlags)
   , mSPTimerLock("nsWebShellWindow.mSPTimerLock")
-  , mSizeMode(-1)
 {
 }
 
@@ -386,15 +385,12 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         // min, max, and normal are all the same to apps, but for
         // fullscreen we need to let them know so they can update
         // their ui. 
-        if (modeEvent->mSizeMode == nsSizeMode_Fullscreen ||
-            eventWindow->mSizeMode == nsSizeMode_Fullscreen) {
+        if (modeEvent->mSizeMode == nsSizeMode_Fullscreen) {
           nsCOMPtr<nsIDOMWindowInternal> ourWindow = do_GetInterface(docShell);
           if (ourWindow)
-            ourWindow->SetFullScreen(modeEvent->mSizeMode == nsSizeMode_Fullscreen);
+            ourWindow->SetFullScreen(PR_TRUE);
         }
 
-        eventWindow->mSizeMode = modeEvent->mSizeMode;
-
         // Note the current implementation of SetSizeMode just stores
         // the new state; it doesn't actually resize. So here we store
         // the state and pass the event on to the OS. The day is coming

xpfe/appshell/src/nsWebShellWindow.h

@@ -91,7 +91,6 @@ protected:
 
   nsCOMPtr<nsITimer>      mSPTimer;
   mozilla::Mutex          mSPTimerLock;
-  PRInt32                 mSizeMode;
 
   void        SetPersistenceTimer(PRUint32 aDirtyFlags);
   static void FirePersistenceTimer(nsITimer *aTimer, void *aClosure);