Backout of bug 110718 to fix Tp regression and raise-on-load issues.

git-svn-id: svn://10.0.0.236/trunk@135333 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/docshell/base/nsDocShell.cpp

@@ -117,7 +117,6 @@
 #include "nsIExternalProtocolService.h"
 
 #include "nsIFocusController.h"
-#include "nsIEventStateManager.h"
 
 #include "nsITextToSubURI.h"
 
@@ -4615,22 +4614,6 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
         }
     }
 
-    // Eliminate the focus ring in the current docshell, which is 
-    // now a zombie. If we key navigate, it won't be within this
-    // docshell, until the newly loading document is displayed.
-    if (mItemType == typeContent) {
-        nsCOMPtr<nsIPresContext> presContext;
-        GetPresContext(getter_AddRefs(presContext));
-        if (presContext) {
-            nsCOMPtr<nsIEventStateManager> esm;
-            presContext->GetEventStateManager(getter_AddRefs(esm));
-            if (esm) {
-                esm->SetFocusedContent(nsnull);
-                esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-            }
-        }
-    }
-
     // It is necessary to obtain the focus controller to utilize its ability
     // to suppress focus.  This is necessary to fix Win32-only bugs related to
     // a loss of focus when mContentViewer is set to null.  The internal window