Backing out patch for bug 261074 again due to failing tests in popup windows.

content/events/src/nsEventStateManager.cpp

@@ -840,7 +840,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
         break;
 
       if (mDocument) {
-        PRBool isAlreadySuppressed = PR_FALSE;
         if (gLastFocusedDocument && gLastFocusedPresContext) {
           nsCOMPtr<nsPIDOMWindow> ourWindow =
             gLastFocusedDocument->GetWindow();
@@ -854,6 +853,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
           // Hold a strong ref to the focus controller, since we need
           // it after event dispatch.
           nsCOMPtr<nsIFocusController> focusController;
+          PRBool isAlreadySuppressed = PR_FALSE;
 
           if (ourWindow) {
             focusController = ourWindow->GetRootFocusController();
@@ -922,7 +922,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
 
         nsCOMPtr<nsPIDOMWindow> window(mDocument->GetWindow());
 
-        if (window && !isAlreadySuppressed) {
+        if (window) {
           // We don't want there to be a focused content node while we're
           // dispatching the focus event.