diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp
index d33a4b0e8e39..5afe85fe49ff 100644
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -66,7 +66,7 @@
 #include "nsIStringBundle.h"
 #include "nsITimer.h"
 #include "nsRootAccessible.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIObserverService.h"
 
 #ifdef MOZ_ACCESSIBILITY_ATK
@@ -776,33 +776,24 @@ already_AddRefed<nsIDOMNode> nsAccessNode::GetCurrentFocus()
   nsCOMPtr<nsIDocument> doc = shell->GetDocument();
   NS_ENSURE_TRUE(doc, nsnull);
 
-  nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(doc->GetWindow()));
-  if (!privateDOMWindow) {
-    return nsnull;
-  }
-  nsIFocusController *focusController = privateDOMWindow->GetRootFocusController();
-  if (!focusController) {
-    return nsnull;
-  }
+  nsIDOMWindow* win = doc->GetWindow();
+
+  nsCOMPtr<nsIDOMWindow> focusedWindow;
   nsCOMPtr<nsIDOMElement> focusedElement;
-  focusController->GetFocusedElement(getter_AddRefs(focusedElement));
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  if (fm)
+    fm->GetFocusedElementForWindow(win, PR_TRUE, getter_AddRefs(focusedWindow),
+                                   getter_AddRefs(focusedElement));
+
   nsIDOMNode *focusedNode = nsnull;
-  if (!focusedElement) {
-    // Document itself has focus
-    nsCOMPtr<nsIDOMWindowInternal> focusedWinInternal;
-    focusController->GetFocusedWindow(getter_AddRefs(focusedWinInternal));
-    if (!focusedWinInternal) {
-      return nsnull;
-    }
-    nsCOMPtr<nsIDOMDocument> focusedDOMDocument;
-    focusedWinInternal->GetDocument(getter_AddRefs(focusedDOMDocument));
-    if (!focusedDOMDocument) {
-      return nsnull;
-    }
-    focusedDOMDocument->QueryInterface(NS_GET_IID(nsIDOMNode), (void**)&focusedNode);
+  if (focusedElement) {
+    CallQueryInterface(focusedElement, &focusedNode);
   }
-  else {
-    focusedElement->QueryInterface(NS_GET_IID(nsIDOMNode), (void**)&focusedNode);
+  else if (focusedWindow) {
+    nsCOMPtr<nsIDOMDocument> doc;
+    focusedWindow->GetDocument(getter_AddRefs(doc));
+    if (doc)
+      CallQueryInterface(doc, &focusedNode);
   }
 
   return focusedNode;
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index 3e31eb7def00..cd5fbdec201b 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -74,6 +74,7 @@
 #include "nsIViewManager.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIScrollableFrame.h"
+#include "nsFocusManager.h"
 
 #include "nsXPIDLString.h"
 #include "nsUnicharUtils.h"
@@ -1469,14 +1470,11 @@ nsAccessible::TakeFocus()
     }
   }
 
-  nsCOMPtr<nsIDOMNSHTMLElement> htmlElement(do_QueryInterface(content));
-  if (htmlElement) {
-    // HTML Elements also set the caret position
-    // in order to affect tabbing order
-    return htmlElement->Focus();
-  }
+  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(content));
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  if (fm)
+    fm->SetFocus(element, 0);
 
-  content->SetFocus(GetPresContext());
   return NS_OK;
 }
 
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index 96d2290e10ea..219c8a134dcc 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -68,7 +68,7 @@
 #include "nsUnicharUtils.h"
 #include "nsIURI.h"
 #include "nsIWebNavigation.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #ifdef MOZ_XUL
 #include "nsIXULDocument.h"
 #endif
@@ -350,6 +350,7 @@ nsDocAccessible::GetAttributes(nsIPersistentProperties **aAttributes)
 
 NS_IMETHODIMP nsDocAccessible::GetFocusedChild(nsIAccessible **aFocusedChild)
 {
+  // XXXndeakin P3 accessibility shouldn't be caching the focus
   if (!gLastFocusedNode) {
     *aFocusedChild = nsnull;
     return NS_OK;
@@ -371,25 +372,18 @@ NS_IMETHODIMP nsDocAccessible::TakeFocus()
     return NS_ERROR_FAILURE; // Not focusable
   }
 
-  nsCOMPtr<nsIDocShellTreeItem> treeItem =
-    nsCoreUtils::GetDocShellTreeItemFor(mDOMNode);
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(treeItem);
-  NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIPresShell> shell(GetPresShell());
-  if (!shell) {
-    NS_WARNING("Was not shutdown properly via InvalidateCacheSubtree()");
-    return NS_ERROR_FAILURE;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  if (fm) {
+    nsCOMPtr<nsIDOMDocument> domDocument;
+    mDOMNode->GetOwnerDocument(getter_AddRefs(domDocument));
+    nsCOMPtr<nsIDocument> document(do_QueryInterface(domDocument));
+    if (document) {
+      // focus the document
+      nsCOMPtr<nsIDOMElement> newFocus;
+      fm->MoveFocus(document->GetWindow(), nsnull, nsIFocusManager::MOVEFOCUS_ROOT, 0,
+                    getter_AddRefs(newFocus));
+    }
   }
-  nsIEventStateManager *esm = shell->GetPresContext()->EventStateManager();
-  NS_ENSURE_TRUE(esm, NS_ERROR_FAILURE);
-
-  // Focus the document
-  nsresult rv = docShell->SetHasFocus(PR_TRUE);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Clear out any existing focus state
-  return esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
 }
 
 // ------- nsIAccessibleDocument Methods (5) ---------------
diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp
index da0658122330..ed71434f86ce 100644
--- a/accessible/src/base/nsRootAccessible.cpp
+++ b/accessible/src/base/nsRootAccessible.cpp
@@ -60,7 +60,6 @@
 #include "nsIDOMXULPopupElement.h"
 #include "nsIDocument.h"
 #include "nsIEventListenerManager.h"
-#include "nsIFocusController.h"
 #include "nsIFrame.h"
 #include "nsIMenuFrame.h"
 #include "nsIHTMLDocument.h"
@@ -75,6 +74,7 @@
 #include "nsRootAccessible.h"
 #include "nsIDOMNSEventTarget.h"
 #include "nsIDOMDocumentEvent.h"
+#include "nsFocusManager.h"
 
 #ifdef MOZ_XUL
 #include "nsXULTreeAccessible.h"
@@ -234,16 +234,18 @@ nsRootAccessible::GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState)
 
   nsCOMPtr<nsIDOMWindow> domWin;
   GetWindow(getter_AddRefs(domWin));
-  nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(domWin));
-  if (privateDOMWindow) {
-    nsIFocusController *focusController =
-      privateDOMWindow->GetRootFocusController();
-    if (focusController) {
-      PRBool isActive = PR_FALSE;
-      focusController->GetActive(&isActive);
-      if (isActive) {
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_GetInterface(domWin);
+  if (dsti) {
+    nsCOMPtr<nsIDocShellTreeItem> root;
+    dsti->GetRootTreeItem(getter_AddRefs(root));
+    nsCOMPtr<nsIDOMWindow> rootWindow = do_GetInterface(root);
+
+    nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+    if (fm && rootWindow) {
+      nsCOMPtr<nsIDOMWindow> activeWindow;
+      fm->GetActiveWindow(getter_AddRefs(activeWindow));
+      if (activeWindow == rootWindow)
         *aExtraState |= nsIAccessibleStates::EXT_STATE_ACTIVE;
-      }
     }
   }
 #ifdef MOZ_XUL
diff --git a/accessible/tests/mochitest/grid.js b/accessible/tests/mochitest/grid.js
index 5c8987cbc46b..7c4cf60b2edd 100644
--- a/accessible/tests/mochitest/grid.js
+++ b/accessible/tests/mochitest/grid.js
@@ -78,7 +78,7 @@ function grid(aTableIdentifier)
 
   this.handleKeyEvent = function handleKeyEvent(aEvent)
   {
-    if (aEvent.target.localName != "TD")
+    if (aEvent.target.localName != "td")
       return;
 
     var cell = aEvent.target;
@@ -131,7 +131,7 @@ function grid(aTableIdentifier)
 
   this.handleClickEvent = function handleClickEvent(aEvent)
   {
-    if (aEvent.target.localName != "TD")
+    if (aEvent.target.localName != "td")
       return;
     
     var curCell = this.getCurrentCell();
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
old mode 100644
new mode 100755
index af4adeaaac71..797196f02017
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -51,9 +51,16 @@ toolbarpaletteitem[place="palette"] > toolbaritem > hbox[type="places"] {
   visibility: collapse;
 }
 
-#identity-box > hbox {
-  max-width: 22em;
-  min-width: 1px;
+#identity-icon-labels {
+  max-width: 18em;
+}
+
+#identity-icon-country-label {
+  direction: ltr;
+}
+
+#identity-box.verifiedIdentity > hbox > #identity-icon-labels > #identity-icon-label {
+  -moz-margin-end: 0.25em !important;
 }
 
 /* ::::: Unified Back-/Forward Button ::::: */
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0f0de3277b12..eabce963d4d5 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1237,7 +1237,7 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
     focusElement(content);
 
   if (gURLBar)
-    gURLBar.setAttribute("emptytext", gURLBarEmptyText.value);
+    gURLBar.emptyText = gURLBarEmptyText.value;
 
   gNavToolbox.customizeDone = BrowserToolboxCustomizeDone;
   gNavToolbox.customizeChange = BrowserToolboxCustomizeChange;
@@ -6569,6 +6569,10 @@ var gIdentityHandler = {
     delete this._identityIconLabel;
     return this._identityIconLabel = document.getElementById("identity-icon-label");
   },
+  get _identityIconCountryLabel () {
+    delete this._identityIconCountryLabel;
+    return this._identityIconCountryLabel = document.getElementById("identity-icon-country-label");
+  },
 
   /**
    * Rebuild cache of the elements that may or may not exist depending
@@ -6577,8 +6581,10 @@ var gIdentityHandler = {
   _cacheElements : function() {
     delete this._identityBox;
     delete this._identityIconLabel;
+    delete this._identityIconCountryLabel;
     this._identityBox = document.getElementById("identity-box");
     this._identityIconLabel = document.getElementById("identity-icon-label");
+    this._identityIconCountryLabel = document.getElementById("identity-icon-country-label");
   },
 
   /**
@@ -6700,6 +6706,8 @@ var gIdentityHandler = {
       // let's just use that. Check the pref to determine how much of the verified
       // hostname to show
       var icon_label = "";
+      var icon_country_label = "";
+      var icon_labels_dir = "ltr";
       switch (gPrefService.getIntPref("browser.identity.ssl_domain_display")) {
         case 2 : // Show full domain
           icon_label = this._lastLocation.hostname;
@@ -6738,20 +6746,34 @@ var gIdentityHandler = {
       iData = this.getIdentityData();  
       tooltip = this._stringBundle.getFormattedString("identity.identified.verifier",
                                                       [iData.caOrg]);
+      icon_label = iData.subjectOrg;
       if (iData.country)
-        icon_label = this._stringBundle.getFormattedString("identity.identified.title_with_country",
-                                                           [iData.subjectOrg, iData.country]);
-      else
-        icon_label = iData.subjectOrg;
+        icon_country_label = "(" + iData.country + ")";
+      // If the organization name starts with an RTL character, then
+      // swap the positions of the organization and country code labels.
+      // The Unicode ranges reflect the definition of the UCS2_CHAR_IS_BIDI
+      // macro in intl/unicharutil/util/nsBidiUtils.h. When bug 218823 gets
+      // fixed, this test should be replaced by one adhering to the
+      // Unicode Bidirectional Algorithm proper (at the paragraph level).
+      icon_labels_dir = /^[\u0590-\u08ff\ufb1d-\ufdff\ufe70-\ufefc]/.test(icon_label) ?
+                        "rtl" : "ltr";
     }
     else {
       tooltip = this._stringBundle.getString("identity.unknown.tooltip");
       icon_label = "";
+      icon_country_label = "";
+      icon_labels_dir = "ltr";
     }
     
     // Push the appropriate strings out to the UI
     this._identityBox.tooltipText = tooltip;
     this._identityIconLabel.value = icon_label;
+    this._identityIconCountryLabel.value = icon_country_label;
+    // Set cropping and direction
+    this._identityIconLabel.crop = icon_country_label ? "end" : "center";
+    this._identityIconLabel.parentNode.style.direction = icon_labels_dir;
+    // Hide completely if the organization label is empty
+    this._identityIconLabel.parentNode.hidden = icon_label ? false : true;
   },
   
   /**
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
old mode 100644
new mode 100755
index 32f6f38ae7be..a2f17f83107c
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -370,7 +370,7 @@
                  onsearchbegin="LocationBarHelpers._searchBegin();"
                  onsearchcomplete="LocationBarHelpers._searchComplete();"
                  onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-                 onblur="document.getElementById('identity-box').style.MozUserFocus = 'ignore';">
+                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
           <!-- Use onclick instead of normal popup= syntax since the popup
                code fires onmousedown, and hence eats our favicon drag events.
                We only add the identity-box button to the tab order when the location bar
@@ -388,7 +388,10 @@
                        ondraggesture="PageProxyDragGesture(event);"
                        onerror="this.removeAttribute('src');"/>
               </stack>
-              <label id="identity-icon-label" crop="center" flex="1"/>
+              <hbox id="identity-icon-labels">
+                <label id="identity-icon-label" class="plain" flex="1"/>
+                <label id="identity-icon-country-label" class="plain"/>
+              </hbox>
             </hbox>
           </box>
           <hbox id="urlbar-icons">
diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml
index dea1f5cdea7f..1d1a61f8e0c6 100644
--- a/browser/base/content/credits.xhtml
+++ b/browser/base/content/credits.xhtml
@@ -222,6 +222,7 @@
             <li>Robert Accettura</li>
             <li>Ehsan Akhgari</li>
             <li>Sean Alamares</li>
+            <li>David Anderson</li>
             <li>Harvey Anderson</li>
             <li>Smokey Ardisson</li>
             <li>Rob Arnold</li>
@@ -230,9 +231,11 @@
             <li>Mitchell Baker</li>
             <li>Rhian Baker</li>
             <li>Jan Bambas</li>
+            <li>Mark Banner</li>
             <li>Jason Barnabe</li>
             <li>David Baron</li>
             <li>Colin Barrett</li>
+            <li>Curtis Bartley</li>
             <li>Bo Bayles</li>
             <li>Christopher Beard</li>
             <li>Glen Beasley</li>
@@ -244,13 +247,17 @@
             <li>Christian Biesinger</li>
             <li>Al Billings</li>
             <li>Seth Bindernagel</li>
+            <li>Jim Blandy</li>
             <li>Chris Blizzard</li>
             <li>Jamey Boje</li>
+            <li>David Bolter</li>
             <li>Nelson Bolyard</li>
             <li>Marco Bonardo</li>
             <li>Carsten Book</li>
             <li>Paul Booker</li>
+            <li>Jennifer Boriss</li>
             <li>Dan Born</li>
+            <li>Arpad Borsos</li>
             <li>Ondřej Brablc</li>
             <li>Catherine Brady</li>
             <li>Dave Bragsalla</li>
@@ -283,6 +290,8 @@
             <li>Stephen Donner</li>
             <li>Asa Dotzler</li>
             <li>Chris Double</li>
+            <li>Joe Drew</li>
+            <li>Karsten Düsterloh</li>
             <li>Brendan Eich</li>
             <li>Kai Engert</li>
             <li>Steve England</li>
@@ -300,7 +309,9 @@
             <li>Ryan Flint</li>
             <li>Alix Franquet</li>
             <li>Eli Friedman</li>
+            <li>Andreas Gal</li>
             <li>Steven Garrity</li>
+            <li>Serge Gautherie</li>
             <li>Kevin Gerich</li>
             <li>Taras Glek</li>
             <li>Aravind Gottipati</li>
@@ -323,6 +334,7 @@
             <li>Chris Hofmann</li>
             <li>Timothy Hogan</li>
             <li>Daniel Holbert</li>
+            <li>Bobby Holley</li>
             <li>Mike Hommey</li>
             <li>Stephen Horlander</li>
             <li>David Humphrey</li>
@@ -331,13 +343,16 @@
             <li>Eri Inoue </li>
             <li>Joichi Ito</li>
             <li>Laurent Jouanneau</li>
+            <li>Robert Kaiser</li>
             <li>Gen Kanai</li>
             <li>Masanori Kaneko</li>
             <li>Blake Kaplan</li>
+            <li>Mike Kaplinskiy</li>
             <li>Michael Kaply</li>
             <li>Mitch Kapor</li>
             <li>Kazuyoshi Kato</li>
             <li>Alfred Kayser</li>
+            <li>Jonathan Kew</li>
             <li>Paul Kim</li>
             <li>Masatoshi Kimura</li>
             <li>Ria Klaassen</li>
@@ -346,6 +361,7 @@
             <li>Michael Kohler</li>
             <li>Gary Kwong</li>
             <li>David Lanham</li>
+            <li>Brad Lassey</li>
             <li>Edward Lee</li>
             <li>Raymond Lee</li>
             <li>Garrett LeSage</li>
@@ -361,11 +377,14 @@
             <li>Phil Machalski</li>
             <li>Joel Maher</li>
             <li>Ere Maijala</li>
+            <li>David Mandelin</li>
             <li>Gervase Markham</li>
             <li>Sean Martell</li>
             <li>Jim Mathies</li>
             <li>Graeme McCutcheon</li>
+            <li>Patrick McManus</li>
             <li>Heather Meeker</li>
+            <li>Walter Meinl</li>
             <li>Myk Melez</li>
             <li>Federico Mena-Quintero</li>
             <li>Mark Mentovai</li>
@@ -380,14 +399,18 @@
             <li>Mike Morgan</li>
             <li>Dan Mosedale</li>
             <li>Michael Moy</li>
+            <li>Jeff Muizelaar</li>
             <li>Masayuki Nakano</li>
             <li>Marria Nazif</li>
             <li>Kev Needham</li>
             <li>Kaori Negoro</li>
+            <li>Ben Newman</li>
             <li>Johnathan Nightingale</li>
             <li>Andreas Nilsson</li>
+            <li>Timothy Nikkel</li>
             <li>Tristan Nitot</li>
             <li>Alice Nodelman</li>
+            <li>Matthew Noorenberghe </li>
             <li>Michal Novotny</li>
             <li>Robert O'Callahan</li>
             <li>John O'Duinn</li>
@@ -395,6 +418,7 @@
             <li>Jan Odvárko</li>
             <li>Tomoyuki Okazaki</li>
             <li>Jeremy Orem</li>
+            <li>Jason Orendorff</li>
             <li>Hideo Oshima</li>
             <li>Mats Palmgren</li>
             <li>Stuart Parmenter</li>
@@ -423,16 +447,20 @@
             <li>Julien Rivaud</li>
             <li>David Rolnitzky</li>
             <li>Asaf Romano</li>
+            <li>Oleg Romashin</li>
             <li>Tim Rowley</li>
             <li>Jesse Ruderman</li>
             <li>Brian Ryner</li>
             <li>Alexander Sack</li>
             <li>Hideo Saito</li>
+            <li>Atsushi Sakai</li>
             <li>Eiko Sakuma</li>
+            <li>Andrei Saprykin</li>
             <li>Ken Saunders</li>
             <li>Robert Sayre</li>
             <li>Mike Schroepfer</li>
             <li>Kurt Schultz</li>
+            <li>Keith Schwarz</li>
             <li>Justin Scott</li>
             <li>Hiroshi Sekiya</li>
             <li>Tara Shahian</li>
@@ -451,6 +479,7 @@
             <li>John Slater</li>
             <li>Benjamin Smedberg</li>
             <li>Andrew Smith</li>
+            <li>Edwin Smith</li>
             <li>Mark Smith</li>
             <li>Window Snyder</li>
             <li>Josh Soref</li>
@@ -464,6 +493,7 @@
             <li>Rob Stradling</li>
             <li>Robert Strong</li>
             <li>Vicky Sun</li>
+            <li>Alexander Surkov</li>
             <li>Clint Talbert</li>
             <li>David Tenser</li>
             <li>Chris Thomas</li>
@@ -488,12 +518,15 @@
             <li>Martijn Wargers</li>
             <li>Jonathan Watt</li>
             <li>Peter Weilbacher</li>
+            <li>Zack Weinberg</li>
             <li>Frédéric Wenzel</li>
             <li>Steffen Wilberg</li>
             <li>Drew Willcoxon</li>
             <li>Shawn Wilsher</li>
             <li>Dan Witte</li>
+            <li>John Wolfe</li>
             <li>Steve Won</li>
+            <li>Justin Wood</li>
             <li>Michael Wu</li>
             <li>Masahiro Yamada</li>
             <li>Satoko Takita Yamaguchi (Chibi)</li>
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index e73b53cbf36a..d8525e42f810 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1402,5 +1402,11 @@ nsContextMenu.prototype = {
     var clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
                     getService(Ci.nsIClipboardHelper);
     clipboard.copyString(this.mediaURL);
+  },
+
+  get imageURL() {
+    if (this.onImage)
+      return this.mediaURL;
+    return "";
   }
 };
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index e1d784addc04..800990ed5317 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -813,62 +813,18 @@
             if (this.mCurrentTab != this.selectedTab)
               this.mCurrentTab.owner = null;
 
-            if (this.mCurrentBrowser) {
-              // Only save the focused element if it is in our content window
-              // or in an ancestor window.
-              var focusedWindow = document.commandDispatcher.focusedWindow;
-              var saveFocus = false;
+            var fm = Components.classes["@mozilla.org/focus-manager;1"].
+                       getService(Components.interfaces.nsIFocusManager);
+            var focusedChromeElement = fm.getFocusedElementForWindow(window, false, {});
 
-              if (focusedWindow && focusedWindow.top == window.content) {
-                saveFocus = true;
-              } else {
-                var contentWindow = window;
-
-                while (contentWindow) {
-                  if (contentWindow == focusedWindow) {
-                    saveFocus = true;
-                    break;
-                  }
-
-                  if (contentWindow.parent == contentWindow) {
-                    break;
-                  }
-
-                  contentWindow = contentWindow.parent;
-                }
-              }
-
-              if (saveFocus) {
-                // Preserve the currently-focused element or DOM window for
-                // this tab.
-
-                this.mCurrentBrowser.focusedWindow = focusedWindow;
-                this.mCurrentBrowser.focusedElement = document.commandDispatcher.focusedElement;
-              }
-
-              if (this.mCurrentBrowser.focusedElement &&
-                  this.mCurrentBrowser.focusedElement.parentNode !=
-                  this.mCurrentTab.parentNode) {
-                // Clear focus outline before we draw on top of it.
-                // Only blur the focused element if it isn't a tab, 
-                // to avoid breaking keyboard tab navigation
-                var elem = this.mCurrentBrowser.focusedElement;
-                if (elem instanceof HTMLElement || elem instanceof XULElement) {
-                  elem.blur();
-                }
-                else {
-                  var content = elem.ownerDocument.defaultView;
-                  if (content instanceof Components.interfaces.nsIInterfaceRequestor)
-                    content.getInterface(Components.interfaces.nsIDOMWindowUtils).focus(null);
-                }
-              }
-              this.mCurrentBrowser.setAttribute("type", "content-targetable");
-            }
+            var oldBrowser = this.mCurrentBrowser;
+            if (oldBrowser)
+              oldBrowser.setAttribute("type", "content-targetable");
 
             var updatePageReport = false;
-            if (!this.mCurrentBrowser ||
-                (this.mCurrentBrowser.pageReport && !newBrowser.pageReport) ||
-                (!this.mCurrentBrowser.pageReport && newBrowser.pageReport))
+            if (!oldBrowser ||
+                (oldBrowser.pageReport && !newBrowser.pageReport) ||
+                (!oldBrowser.pageReport && newBrowser.pageReport))
               updatePageReport = true;
 
             newBrowser.setAttribute("type", "content-primary");
@@ -951,64 +907,13 @@
             event.initEvent("TabSelect", true, false);
             this.mCurrentTab.dispatchEvent(event);
 
-            if (document.commandDispatcher.focusedElement &&
-                document.commandDispatcher.focusedElement.parentNode ==
-                this.mCurrentTab.parentNode) {
-              // The focus is on a tab in the same tab panel
-              return;  // If focus was on a tab, switching tabs focuses the new tab
-            }
-
-            var whatToFocus = window.content;
-
-            // Focus the previously focused element or window, but make sure
-            // the focused element is still part of the document
-            let focusedElem = newBrowser.focusedElement;
-            if (focusedElem && focusedElem.ownerDocument &&
-                !(focusedElem.ownerDocument.compareDocumentPosition(focusedElem) &
-                  Node.DOCUMENT_POSITION_DISCONNECTED)) {
-              if (newBrowser.focusedElement.parentNode !=
-                  this.mCurrentTab.parentNode) {
-                // Focus the remembered element unless it's in the current tab panel
-                whatToFocus = newBrowser.focusedElement;
-              }
-            }
-            else if (newBrowser.focusedWindow) {
-              whatToFocus = newBrowser.focusedWindow;
-            }
- 
-            // Change focus for this window to |whatToFocus|, without
-            // focusing the window itself.
-            var cmdDispatcher = document.commandDispatcher;
-
-            var ww =
-              Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                        .getService(Components.interfaces.nsIWindowWatcher);
-            if (ww.activeWindow == window) {
-              cmdDispatcher.suppressFocusScroll = true;
-              if (whatToFocus instanceof HTMLElement ||
-                  whatToFocus instanceof XULElement ||
-                  whatToFocus instanceof Window) {
-                whatToFocus.focus();
-              }
-              else if (whatToFocus instanceof Node) {
-                var content = window.content;
-                if (content instanceof Components.interfaces.nsIInterfaceRequestor)
-                  content.getInterface(Components.interfaces.nsIDOMWindowUtils).focus(whatToFocus);
-              }
-              cmdDispatcher.suppressFocusScroll = false;
-            }
-            else {
-              // set the element in command dispatcher so focus will restore
-              // properly when the window does become active
-              if (whatToFocus instanceof Window) {
-                cmdDispatcher.focusedWindow = whatToFocus;
-                cmdDispatcher.focusedElement = null;
-              }
-              else {
-                cmdDispatcher.focusedWindow = whatToFocus.ownerDocument.defaultView;
-                cmdDispatcher.focusedElement = whatToFocus;
-              }
-            }
+            // change focus to the new tab if nothing is focused, the old tab
+            // is focused or there is something in the new tab to focus. One
+            // specific case where focus is not changed is when the new tab
+            // has no focused element and a chrome element is focused.
+            if (!focusedChromeElement || focusedChromeElement == oldBrowser ||
+                fm.getFocusedElementForWindow(window.content, true, {}))
+              fm.setFocus(newBrowser, fm.FLAG_NOSCROLL);
           ]]>
         </body>
       </method>
@@ -1627,9 +1532,7 @@
             // destroyed until the document goes away.  So we force a
             // cleanup ourselves.
             // This has to happen before we remove the child so that the
-            // XBL implementation of nsIObserver still works.  But
-            // clearing focusedWindow happens below because it gets
-            // reset by updateCurrentBrowser.
+            // XBL implementation of nsIObserver still works.
             browser.destroy();
 
             if (browser == this.mCurrentBrowser)
@@ -1662,10 +1565,6 @@
             if (this.mTabBox)
               this.mTabBox.selectedPanel = this.getBrowserForTab(this.mCurrentTab).parentNode;
 
-            // see comment about destroy above
-            browser.focusedWindow = null;
-            browser.focusedElement = null;
-
             if (aCloseWindow)
               this._windowIsClosing = closeWindow(true);
           ]]>
@@ -2997,14 +2896,8 @@
                                tooltiptext="&listAllTabs.label;"
                                oncommand="ctrlTab.open(true);"/>
           </xul:stack>
-#ifdef XP_MACOSX
-          <xul:hbox anonid="tabstrip-closebutton" class="tabs-closebutton-box" align="center" pack="end" chromedir="&locale.dir;">
-#endif
           <xul:toolbarbutton anonid="tabs-closebutton"
                              class="close-button tabs-closebutton" chromedir="&locale.dir;"/>
-#ifdef XP_MACOSX
-          </xul:hbox>
-#endif
         </xul:hbox>
       </xul:stack>
     </content>
@@ -3065,11 +2958,7 @@
       </field>
 
       <field name="mTabstripClosebutton">
-#ifdef XP_MACOSX
-        document.getAnonymousElementByAttribute(this, "anonid", "tabstrip-closebutton");
-#else
         document.getAnonymousElementByAttribute(this, "anonid", "tabs-closebutton");
-#endif
       </field>
 
       <field name="_prefObserver">({
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index c3df2ac33db3..853994703c12 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -82,7 +82,9 @@ _BROWSER_FILES = browser_sanitize-timespans.js \
                  browser_bug462673.js \
                  browser_bug481560.js \
                  browser_bug477014.js \
+                 browser_bug495058.js \
                  browser_discovery.js \
+                 browser_tabfocus.js \
                  discovery.html \
                  moz.png \
                  test_bug462673.html \
diff --git a/browser/base/content/test/browser_bug481560.js b/browser/base/content/test/browser_bug481560.js
index 199dfad127dc..6ad697ad95df 100644
--- a/browser/base/content/test/browser_bug481560.js
+++ b/browser/base/content/test/browser_bug481560.js
@@ -1,19 +1,30 @@
 function test() {
   waitForExplicitFinish();
 
+  // focus the url field so that it will can ensure the focus is there when
+  // the window is refocused after the dialog closes
+  gURLBar.focus();
+
+  window.addEventListener("focus", function () {
+    window.removeEventListener("focus", arguments.callee, false);
+    finish();
+  }, false);
+
   var win = openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no");
 
   win.addEventListener("load", function () {
     win.removeEventListener("load", arguments.callee, false);
 
+    win.content.addEventListener("focus", function () {
+      win.content.removeEventListener("focus", arguments.callee, false);
+
+      EventUtils.synthesizeKey("w", { accelKey: true }, win);
+      ok(win.closed, "accel+w closed the window immediately");
+    }, false);
+
     win.gBrowser.selectedTab.addEventListener("TabClose", function () {
       ok(false, "shouldn't have gotten the TabClose event for the last tab");
     }, false);
 
-    EventUtils.synthesizeKey("w", { accelKey: true }, win);
-
-    ok(win.closed, "accel+w closed the window immediately");
-
-    finish();
   }, false);
 }
diff --git a/browser/base/content/test/browser_bug495058.js b/browser/base/content/test/browser_bug495058.js
new file mode 100644
index 000000000000..6cf9d06c7ea0
--- /dev/null
+++ b/browser/base/content/test/browser_bug495058.js
@@ -0,0 +1,52 @@
+function test() {
+  waitForExplicitFinish();
+  next();
+}
+
+var uris = [
+  "about:blank",
+  "about:sessionrestore",
+  "about:privatebrowsing",
+];
+
+function next() {
+  var tab = gBrowser.addTab();
+  var uri = uris.shift();
+
+  if (uri == "about:blank") {
+    detach();
+  } else {
+    let browser = tab.linkedBrowser;
+    browser.addEventListener("load", function () {
+      browser.removeEventListener("load", arguments.callee, true);
+      detach();
+    }, true);
+    browser.loadURI(uri);
+  }
+
+  function detach() {
+    var win = gBrowser.replaceTabWithWindow(tab);
+    win.addEventListener("load", function () {
+      win.removeEventListener("load", arguments.callee, false);
+
+      win.gBrowser.addEventListener("pageshow", function() {
+        win.gBrowser.removeEventListener("pageshow", arguments.callee, false);
+
+        // wait for delayedStartup
+        win.setTimeout(function () {
+          is(win.gBrowser.currentURI.spec, uri, uri + ": uri loaded in detached tab");
+          is(win.document.activeElement, win.gBrowser.selectedBrowser, uri + ": browser is focused");
+          is(win.gURLBar.value, "", uri + ": urlbar is empty");
+          ok(win.gURLBar.emptyText, uri + ": emptytext is present");
+          ok(win.gURLBar.hasAttribute("isempty"), uri + ": emptytext is displayed");
+
+          win.close();
+          if (uris.length)
+            next();
+          else
+            executeSoon(finish);
+        }, 100);
+      }, false);
+    }, false);
+  }
+}
diff --git a/browser/base/content/test/browser_ctrlTab.js b/browser/base/content/test/browser_ctrlTab.js
index da16f3b8e06b..b10eccde163e 100644
--- a/browser/base/content/test/browser_ctrlTab.js
+++ b/browser/base/content/test/browser_ctrlTab.js
@@ -67,7 +67,7 @@ function test() {
     pressCtrlTab();
     document.removeEventListener("keypress", detectKeyEvent, false);
     ok(eventConsumed, "Ctrl+Tab consumed by the tabbed browser if one tab is open");
-    is(focusedWindow.location, document.commandDispatcher.focusedWindow.location,
+    is(focusedWindow, document.commandDispatcher.focusedWindow,
        "Ctrl+Tab doesn't change focus if one tab is open");
   }
 
diff --git a/browser/base/content/test/browser_sanitizeDialog.js b/browser/base/content/test/browser_sanitizeDialog.js
index f049ab9f7a58..a8ba90dc4b79 100644
--- a/browser/base/content/test/browser_sanitizeDialog.js
+++ b/browser/base/content/test/browser_sanitizeDialog.js
@@ -282,11 +282,11 @@ var gAllTests = [
   },
 
   /**
-   * Ensures that toggling details persists across dialog openings.
+   * These next two tests together ensure that toggling details persists
+   * across dialog openings.
    */
   function () {
     let wh = new WindowHelper();
-
     wh.onload = function () {
       // Show details
       this.toggleDetails();
@@ -294,7 +294,9 @@ var gAllTests = [
       this.cancelDialog();
     };
     wh.open();
-
+  },
+  function () {
+    let wh = new WindowHelper();
     wh.onload = function () {
       // Details should have remained open
       this.checkDetails(true);
diff --git a/browser/base/content/test/browser_tabfocus.js b/browser/base/content/test/browser_tabfocus.js
new file mode 100644
index 000000000000..c9fad70faa62
--- /dev/null
+++ b/browser/base/content/test/browser_tabfocus.js
@@ -0,0 +1,216 @@
+/*
+ * This test checks that focus is adjusted properly when switching tabs.
+ */
+
+let testPage1 = "data:text/html,<html id='tab1'><body><button id='button1'>Tab 1</button></body></html>";
+let testPage2 = "data:text/html,<html id='tab2'><body><button id='button2'>Tab 2</button></body></html>";
+
+function test() {
+  waitForExplicitFinish();
+
+  var tab1 = gBrowser.addTab();
+  var tab2 = gBrowser.addTab();
+  var browser1 = gBrowser.getBrowserForTab(tab1);
+  var browser2 = gBrowser.getBrowserForTab(tab2);
+
+  gURLBar.focus();
+
+  var loadCount = 0;
+  function check()
+  {
+    // wait for both tabs to load
+    if (++loadCount != 2)
+      return;
+
+    window.focus();
+
+    _browser_tabfocus_test_lastfocus = gURLBar;
+    _browser_tabfocus_test_lastfocuswindow = window;
+
+    window.addEventListener("focus", _browser_tabfocus_test_eventOccured, true);
+    window.addEventListener("blur", _browser_tabfocus_test_eventOccured, true);
+
+    gBrowser.selectedTab = tab2;
+
+    var fm = Components.classes["@mozilla.org/focus-manager;1"].
+               getService(Components.interfaces.nsIFocusManager);
+    is(fm.focusedWindow, window, "focusedWindow after tab load");
+    is(fm.focusedElement, gURLBar.inputField, "focusedElement after tab load");
+
+    // make sure that the focus initially starts out blank
+    var focusedWindow = {};
+    is(fm.getFocusedElementForWindow(browser1.contentWindow, false, focusedWindow), null, "initial focus in tab 1");
+    is(focusedWindow.value, browser1.contentWindow, "initial frame focus in tab 1");
+    is(fm.getFocusedElementForWindow(browser2.contentWindow, false, focusedWindow), null, "initial focus in tab 2");
+    is(focusedWindow.value, browser2.contentWindow, "initial frame focus in tab 2");
+
+    // switching tabs when the urlbar is focused and nothing in the new tab is focused
+    // should keep focus in the urlbar
+    expectFocusShift(function () gBrowser.selectedTab = tab1,
+                     window, gURLBar.inputField, false,
+                     "focusedElement after tab change, focus in url field, no focus in new tab");
+
+    // focusing a button in the current tab should focus it
+    var button1 = browser1.contentWindow.document.getElementById("button1");
+    expectFocusShift(function () button1.focus(),
+                     browser1.contentWindow, button1, true,
+                     "focusedWindow after focus in focused tab");
+
+    // focusing a button in a background tab should not change the actual
+    // focus, but should set the focus that would be in that background tab to
+    // that button.
+    var button2 = browser2.contentWindow.document.getElementById("button2");
+    button2.focus();
+
+    expectFocusShift(function () button2.focus(),
+                     browser1.contentWindow, button1, false,
+                     "focusedWindow after focus in unfocused tab");
+    is(fm.getFocusedElementForWindow(browser2.contentWindow, false, {}), button2, "focus in unfocused tab");
+
+    // switching tabs should now make the button in the other tab focused
+    expectFocusShift(function () gBrowser.selectedTab = tab2,
+                     browser2.contentWindow, button2, true,
+                     "focusedWindow after tab change");
+
+    // blurring an element in a background tab should not change the active
+    // focus, but should clear the focus in that tab.
+    expectFocusShift(function () button1.blur(),
+                     browser2.contentWindow, button2, false,
+                     "focusedWindow after blur in unfocused tab");
+    is(fm.getFocusedElementForWindow(browser1.contentWindow, false, {}), null, "blur in unfocused tab");
+
+    // focusing the url field should switch active focus away from the tab but
+    // not clear what would be the focus in the tab 
+    button1.focus();
+    expectFocusShift(function () gURLBar.focus(),
+                     window, gURLBar.inputField, true,
+                     "focusedWindow after url field focused");
+    is(fm.getFocusedElementForWindow(browser2.contentWindow, false, {}), button2, "url field focused, button in tab");
+
+    // when a chrome element is focused, switching tabs to a tab with a button
+    // with the current focus should focus the button
+    expectFocusShift(function () gBrowser.selectedTab = tab1,
+                     browser1.contentWindow, button1, true,
+                     "focusedWindow after tab change, focus in url field, button focused in new tab");
+    is(fm.getFocusedElementForWindow(browser2.contentWindow, false, {}), button2, "after switch tab, focus in unfocused tab");
+
+    // blurring an element in the current tab should clear the active focus
+    expectFocusShift(function () button1.blur(),
+                     browser1.contentWindow, null, true,
+                     "focusedWindow after blur in focused tab");
+
+    // blurring an non-focused url field should have no effect
+    expectFocusShift(function () gURLBar.blur(),
+                     browser1.contentWindow, null, false,
+                     "focusedWindow after blur in unfocused url field");
+
+    // switch focus to a tab with a currently focused element
+    expectFocusShift(function () gBrowser.selectedTab = tab2,
+                     browser2.contentWindow, button2, true,
+                     "focusedWindow after switch from unfocused to focused tab");
+
+    // clearing focus on the chrome window should switch the focus to the
+    // chrome window
+    expectFocusShift(function () fm.clearFocus(window),
+                     window, null, true,
+                     "focusedWindow after switch to chrome with no focused element");
+
+    // switch focus to another tab when neither have an active focus
+    expectFocusShift(function () gBrowser.selectedTab = tab1,
+                     browser1.contentWindow, null, true,
+                     "focusedWindow after tab switch from no focus to no focus");
+    
+    gBrowser.removeCurrentTab();
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+
+  browser1.addEventListener("load", check, true);
+  browser2.addEventListener("load", check, true);
+  browser1.contentWindow.location = testPage1;
+  browser2.contentWindow.location = testPage2;
+}
+
+var _browser_tabfocus_test_lastfocus;
+var _browser_tabfocus_test_lastfocuswindow = null;
+var _browser_tabfocus_test_events = "";
+
+function _browser_tabfocus_test_eventOccured(event)
+{
+  var id;
+  if (event.target instanceof Window)
+    id = event.originalTarget.document.documentElement.id + "-window";
+  else if (event.target instanceof Document)
+    id = event.originalTarget.documentElement.id + "-document";
+  else if (event.target.id == "urlbar" && event.originalTarget.localName == "input")
+    id = "urlbar";
+  else
+    id = event.originalTarget.id;
+
+  if (_browser_tabfocus_test_events)
+    _browser_tabfocus_test_events += " ";
+  _browser_tabfocus_test_events += event.type + ": " + id;
+}
+
+function getId(element)
+{
+  return (element.localName == "input") ? "urlbar" : element.id;
+}
+
+function expectFocusShift(callback, expectedWindow, expectedElement, focusChanged, testid)
+{
+  var expectedEvents = "";
+  if (focusChanged) {
+    if (_browser_tabfocus_test_lastfocus)
+      expectedEvents += "blur: " + getId(_browser_tabfocus_test_lastfocus);
+
+    if (_browser_tabfocus_test_lastfocuswindow &&
+        _browser_tabfocus_test_lastfocuswindow != expectedWindow) {
+      if (expectedEvents)
+        expectedEvents += " ";
+      var windowid = _browser_tabfocus_test_lastfocuswindow.document.documentElement.id;
+      expectedEvents += "blur: " + windowid + "-document " +
+                        "blur: " + windowid + "-window";
+    }
+
+    if (expectedWindow && _browser_tabfocus_test_lastfocuswindow != expectedWindow) {
+      if (expectedEvents)
+        expectedEvents += " ";
+      var windowid = expectedWindow.document.documentElement.id;
+      expectedEvents += "focus: " + windowid + "-document " +
+                        "focus: " + windowid + "-window";
+    }
+
+    if (expectedElement) {
+      if (expectedEvents)
+        expectedEvents += " ";
+      expectedEvents += "focus: " + getId(expectedElement);
+    }
+
+    _browser_tabfocus_test_lastfocus = expectedElement;
+    _browser_tabfocus_test_lastfocuswindow = expectedWindow;
+  }
+
+  callback();
+
+  is(_browser_tabfocus_test_events, expectedEvents, testid + " events");
+  _browser_tabfocus_test_events = "";
+
+  var fm = Components.classes["@mozilla.org/focus-manager;1"].
+             getService(Components.interfaces.nsIFocusManager);
+
+  var focusedElement = fm.focusedElement;
+  is(focusedElement ? getId(focusedElement) : "none",
+     expectedElement ? getId(expectedElement) : "none", testid + " focusedElement");
+  is(fm.focusedWindow, expectedWindow, testid + " focusedWindow");
+  var focusedWindow = {};
+  is(fm.getFocusedElementForWindow(expectedWindow, false, focusedWindow),
+     expectedElement, testid + " getFocusedElementForWindow");
+  is(focusedWindow.value, expectedWindow, testid + " getFocusedElementForWindow frame");
+  is(expectedWindow.document.hasFocus(), true, testid + " hasFocus");
+  var expectedActive = expectedElement;
+  if (!expectedActive)
+    expectedActive = expectedWindow.document instanceof XULDocument ?
+                     expectedWindow.document.documentElement : expectedWindow.document.body;
+  is(expectedWindow.document.activeElement, expectedActive, testid + " activeElement");
+}
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 9122b063af24..5469983d2422 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -93,24 +93,17 @@ function getBoolPref ( prefname, def )
 
 // Change focus for this browser window to |aElement|, without focusing the
 // window itself.
-function focusElement(aElement) {
-  // This is a redo of the fix for jag bug 91884
-  var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                     .getService(Components.interfaces.nsIWindowWatcher);
-  if (window == ww.activeWindow)
-    aElement.focus();
+function focusElement(aElement)
+{
+  // if a content window, focus the <browser> instead as window.focus()
+  // raises the window
+  if (aElement instanceof Window) {
+    var browser = getBrowserFromContentWindow(aElement);
+    if (browser)
+      browser.focus();
+  }
   else {
-    // set the element in command dispatcher so focus will restore properly
-    // when the window does become active
-    var cmdDispatcher = document.commandDispatcher;
-    if (aElement instanceof Window) {
-      cmdDispatcher.focusedWindow = aElement;
-      cmdDispatcher.focusedElement = null;
-    }
-    else if (aElement instanceof Element) {
-      cmdDispatcher.focusedWindow = aElement.ownerDocument.defaultView;
-      cmdDispatcher.focusedElement = aElement;
-    }
+    aElement.focus();
   }
 }
 
@@ -255,10 +248,11 @@ function openUILinkIn( url, where, allowThirdPartyFixup, postData, referrerUrl )
     break;
   }
 
-  // Call focusElement(w.content) instead of w.content.focus() to make sure
-  // that we don't raise the old window, since the URI we just loaded may have
-  // resulted in a new frontmost window (e.g. "javascript:window.open('');").
-  focusElement(w.content);
+  // Focus the content but don't raise the window, since the URI we just loaded
+  // may have resulted in a new frontmost window (e.g. "javascript:window.open('');").
+  var browser = w.getBrowserFromContentWindow(w.content);
+  if (browser)
+    browser.focus();
 }
 
 // Used as an onclick handler for UI elements with link-like behavior.
diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index 24613790c723..4c3594e29dab 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -127,6 +127,7 @@ PlacesController.prototype = {
     case "cmd_redo":
       return PlacesUIUtils.ptm.numberOfRedoItems > 0;
     case "cmd_cut":
+    case "placesCmd_cut":
       var nodes = this._view.getSelectionNodes();
       // If selection includes history nodes there's no reason to allow cut.
       for (var i = 0; i < nodes.length; i++) {
@@ -135,6 +136,7 @@ PlacesController.prototype = {
       }
       // Otherwise fallback to cmd_delete check.
     case "cmd_delete":
+    case "placesCmd_delete":
       return this._hasRemovableSelection(false);
     case "placesCmd_deleteDataHost":
       return this._hasRemovableSelection(false) &&
@@ -142,8 +144,10 @@ PlacesController.prototype = {
     case "placesCmd_moveBookmarks":
       return this._hasRemovableSelection(true);
     case "cmd_copy":
+    case "placesCmd_copy":
       return this._view.hasSelection;
     case "cmd_paste":
+    case "placesCmd_paste":
       return this._canInsert(true) && this._isClipboardDataPasteable();
     case "cmd_selectAll":
       if (this._view.selType != "single") {
@@ -229,15 +233,19 @@ PlacesController.prototype = {
       PlacesUIUtils.ptm.redoTransaction();
       break;
     case "cmd_cut":
+    case "placesCmd_cut":
       this.cut();
       break;
     case "cmd_copy":
+    case "placesCmd_copy":
       this.copy();
       break;
     case "cmd_paste":
+    case "placesCmd_paste":
       this.paste();
       break;
     case "cmd_delete":
+    case "placesCmd_delete":
       this.remove("Remove Selection");
       break;
     case "placesCmd_deleteDataHost":
@@ -1604,19 +1612,13 @@ var PlacesControllerDragHelper = {
 };
 
 function goUpdatePlacesCommands() {
-  var placesController;
-  try {
-    // Or any other command...
-    placesController = top.document.commandDispatcher
-                          .getControllerForCommand("placesCmd_open");
-  }
-  catch(ex) { return; }
+  // Get the controller for one of the places commands.
+  var placesController = doGetPlacesControllerForCommand("placesCmd_open");
+  if (!placesController)
+    return;
 
   function updatePlacesCommand(aCommand) {
-    var enabled = false;
-    if (placesController)
-      enabled = placesController.isCommandEnabled(aCommand);
-    goSetCommandEnabled(aCommand, enabled);
+    goSetCommandEnabled(aCommand, placesController.isCommandEnabled(aCommand));
   }
 
   updatePlacesCommand("placesCmd_open");
@@ -1631,4 +1633,39 @@ function goUpdatePlacesCommands() {
   updatePlacesCommand("placesCmd_reload");
   updatePlacesCommand("placesCmd_reloadMicrosummary");
   updatePlacesCommand("placesCmd_sortBy:name");
+  updatePlacesCommand("placesCmd_cut");
+  updatePlacesCommand("placesCmd_copy");
+  updatePlacesCommand("placesCmd_paste");
+  updatePlacesCommand("placesCmd_delete");
 }
+
+function doGetPlacesControllerForCommand(aCommand)
+{
+  var placesController = top.document.commandDispatcher
+                            .getControllerForCommand(aCommand);
+  if (!placesController) {
+    // If building commands for a context menu, look for an element in the
+    // current popup.
+    var element = document.popupNode;
+    while (element) {
+      var isContextMenuShown = ("_contextMenuShown" in element) && element._contextMenuShown;
+      // Check for the parent menupopup or the hbox used for toolbars
+      if ((element.localName == "menupopup" || element.localName == "hbox") &&
+          isContextMenuShown) {
+        placesController = element.controllers.getControllerForCommand(aCommand);
+        break;
+      }
+      element = element.parentNode;
+    }
+  }
+
+  return placesController;
+}
+
+function goDoPlacesCommand(aCommand)
+{
+  var controller = doGetPlacesControllerForCommand(aCommand);
+  if (controller && controller.isCommandEnabled(aCommand))
+    controller.doCommand(aCommand);
+}
+
diff --git a/browser/components/places/content/menu.xml b/browser/components/places/content/menu.xml
index 5409b397aa0d..e3bd01b95f88 100644
--- a/browser/components/places/content/menu.xml
+++ b/browser/components/places/content/menu.xml
@@ -1024,11 +1024,7 @@
         <body><![CDATA[
           this._ensureInitialized();
           this._contextMenuShown = true;
-          // Activate the controller
-          this.focus();
-          // The above call may not always fire a consumable event for
-          // commandUpdater, so we force a command update.
-          window.updateCommands("focus");
+          window.updateCommands("places");
           return this.controller.buildContextMenu(aPopup);
         ]]></body>
       </method>
diff --git a/browser/components/places/content/placesOverlay.xul b/browser/components/places/content/placesOverlay.xul
index b39cbe1ede6e..a6a0cbd9735a 100644
--- a/browser/components/places/content/placesOverlay.xul
+++ b/browser/components/places/content/placesOverlay.xul
@@ -62,40 +62,50 @@
 
   <commandset id="placesCommands"
               commandupdater="true"
-              events="focus,sort"
+              events="focus,sort,places"
               oncommandupdate="goUpdatePlacesCommands();">
     <command id="placesCmd_open"
-             oncommand="goDoCommand('placesCmd_open');"/>
+             oncommand="goDoPlacesCommand('placesCmd_open');"/>
     <command id="placesCmd_open:window"
-             oncommand="goDoCommand('placesCmd_open:window');"/>
+             oncommand="goDoPlacesCommand('placesCmd_open:window');"/>
     <command id="placesCmd_open:tab"
-             oncommand="goDoCommand('placesCmd_open:tab');"/>
+             oncommand="goDoPlacesCommand('placesCmd_open:tab');"/>
 
     <command id="placesCmd_new:bookmark"
-             oncommand="goDoCommand('placesCmd_new:bookmark');"/>
+             oncommand="goDoPlacesCommand('placesCmd_new:bookmark');"/>
     <command id="placesCmd_new:livemark"
-             oncommand="goDoCommand('placesCmd_new:livemark');"/>
+             oncommand="goDoPlacesCommand('placesCmd_new:livemark');"/>
     <command id="placesCmd_new:folder"
-             oncommand="goDoCommand('placesCmd_new:folder');"/>
+             oncommand="goDoPlacesCommand('placesCmd_new:folder');"/>
     <command id="placesCmd_new:separator"
-             oncommand="goDoCommand('placesCmd_new:separator');"/>
+             oncommand="goDoPlacesCommand('placesCmd_new:separator');"/>
     <command id="placesCmd_show:info" 
-             oncommand="goDoCommand('placesCmd_show:info');"/>
+             oncommand="goDoPlacesCommand('placesCmd_show:info');"/>
     <command id="placesCmd_rename"
-             oncommand="goDoCommand('placesCmd_show:info');"
+             oncommand="goDoPlacesCommand('placesCmd_show:info');"
              observes="placesCmd_show:info"/>
     <command id="placesCmd_reload"
-             oncommand="goDoCommand('placesCmd_reload');"/>
+             oncommand="goDoPlacesCommand('placesCmd_reload');"/>
     <command id="placesCmd_reloadMicrosummary"
-             oncommand="goDoCommand('placesCmd_reloadMicrosummary');"/>
+             oncommand="goDoPlacesCommand('placesCmd_reloadMicrosummary');"/>
     <command id="placesCmd_sortBy:name"
-             oncommand="goDoCommand('placesCmd_sortBy:name');"/>
+             oncommand="goDoPlacesCommand('placesCmd_sortBy:name');"/>
     <command id="placesCmd_moveBookmarks"
-             oncommand="goDoCommand('placesCmd_moveBookmarks');"/>
+             oncommand="goDoPlacesCommand('placesCmd_moveBookmarks');"/>
     <command id="placesCmd_deleteDataHost"
-             oncommand="goDoCommand('placesCmd_deleteDataHost');"/>
+             oncommand="goDoPlacesCommand('placesCmd_deleteDataHost');"/>
     <command id="placesCmd_createBookmark"
-             oncommand="goDoCommand('placesCmd_createBookmark');"/>
+             oncommand="goDoPlacesCommand('placesCmd_createBookmark');"/>
+
+    <!-- Special versions of cut/copy/paste/delete which check for an open context menu. -->
+    <command id="placesCmd_cut"
+             oncommand="goDoPlacesCommand('placesCmd_cut');"/>
+    <command id="placesCmd_copy"
+             oncommand="goDoPlacesCommand('placesCmd_copy');"/>
+    <command id="placesCmd_paste"
+             oncommand="goDoPlacesCommand('placesCmd_paste');"/>
+    <command id="placesCmd_delete"
+             oncommand="goDoPlacesCommand('placesCmd_delete');"/>
   </commandset>
 
   <popup id="placesContext"
@@ -165,20 +175,20 @@
               selection="link"
               forcehideselection="bookmark|tagChild"/>
     <menuitem id="placesContext_cut"
-              command="cmd_cut"
+              command="placesCmd_cut"
               label="&cutCmd.label;"
               accesskey="&cutCmd.accesskey;" 
               closemenu="single"
               selection="bookmark|folder|separator|query"
               forcehideselection="tagChild|livemarkChild"/>
     <menuitem id="placesContext_copy"
-              command="cmd_copy"
+              command="placesCmd_copy"
               label="&copyCmd.label;"
               closemenu="single"
               accesskey="&copyCmd.accesskey;" 
               selection="any"/>
     <menuitem id="placesContext_paste"
-              command="cmd_paste"
+              command="placesCmd_paste"
               label="&pasteCmd.label;"
               closemenu="single"
               accesskey="&pasteCmd.accesskey;"
@@ -186,13 +196,13 @@
               hideifnoinsertionpoint="true"/>
     <menuseparator id="placesContext_editSeparator"/>
     <menuitem id="placesContext_delete"
-              command="cmd_delete"
+              command="placesCmd_delete"
               label="&deleteCmd.label;"
               accesskey="&deleteCmd.accesskey;"
               closemenu="single"
               selection="bookmark|tagChild|folder|query|dynamiccontainer|separator|host"/>
     <menuitem id="placesContext_delete_history"
-              command="cmd_delete"
+              command="placesCmd_delete"
               label="&cmd.delete.label;"
               accesskey="&cmd.delete.accesskey;"
               closemenu="single"
diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml
index 2e8fec079ed4..8e1b315695d3 100644
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@@ -725,11 +725,7 @@
         <parameter name="aPopup"/>
         <body><![CDATA[
           this._contextMenuShown = true;
-          // Activate the controller
-          this.focus();
-          // The above call may not always fire a consumable event for
-          // commandUpdater, so we force a command update.
-          window.updateCommands("focus");
+          window.updateCommands("places");
           return this.controller.buildContextMenu(aPopup);
         ]]></body>
       </method>
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 6b858d29db4a..9bf0745168c3 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -78,21 +78,23 @@
                    showcommentcolumn="true"
                    tabscrolling="true"
                    xbl:inherits="disabled,disableautocomplete,searchengine,src,newlines">
-        <xul:button class="searchbar-engine-button"
-                    type="menu"
-                    anonid="searchbar-engine-button"
-                    chromedir="&locale.dir;">
-          <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
-          <xul:image class="searchbar-dropmarker-image"/>
-          <xul:menupopup class="searchbar-popup"
-                         anonid="searchbar-popup">
-            <xul:menuseparator/>
-            <xul:menuitem class="open-engine-manager"
-                          anonid="open-engine-manager"
-                          label="&cmd_engineManager.label;"
-                          oncommand="openManager(event);"/>
-          </xul:menupopup>
-        </xul:button>
+        <xul:box>
+          <xul:button class="searchbar-engine-button"
+                      type="menu"
+                      anonid="searchbar-engine-button"
+                      chromedir="&locale.dir;">
+            <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
+            <xul:image class="searchbar-dropmarker-image"/>
+            <xul:menupopup class="searchbar-popup"
+                           anonid="searchbar-popup">
+              <xul:menuseparator/>
+              <xul:menuitem class="open-engine-manager"
+                            anonid="open-engine-manager"
+                            label="&cmd_engineManager.label;"
+                            oncommand="openManager(event);"/>
+            </xul:menupopup>
+          </xul:button>
+        </xul:box>
         <xul:hbox class="search-go-container" chromedir="&locale.dir;">
           <xul:image class="search-go-button"
                      anonid="search-go-button"
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index c578a0a0e667..a0486367d7fc 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -141,7 +141,6 @@ offlineApps.manageUsageAccessKey=S
 identity.identified.verifier=Verified by: %S
 identity.identified.verified_by_you=You have added a security exception for this site
 identity.identified.state_and_country=%S, %S
-identity.identified.title_with_country=%S (%S)
 
 identity.encrypted=Your connection to this web site is encrypted to prevent eavesdropping.
 identity.unencrypted=Your connection to this web site is not encrypted.
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 78f2f31033d8..f441f04af314 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -892,13 +892,8 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   background-color: rgba(0, 0, 0, .1);
 }
 
-#identity-icon-label {
+#identity-icon-labels {
   padding: 0 2px;
-  margin: 0;
-}
-
-#identity-icon-label[value=""] {
-  display: none;
 }
 
 #identity-box.verifiedDomain {
diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css
index d034e68922ad..8198c68addf6 100644
--- a/browser/themes/gnomestripe/browser/searchbar.css
+++ b/browser/themes/gnomestripe/browser/searchbar.css
@@ -5,6 +5,10 @@
   background-color: -moz-field;
 }
 
+.autocomplete-textbox-container {
+  -moz-box-align: stretch;
+}
+
 .textbox-input-box {
   margin: 0;
 }
diff --git a/browser/themes/pinstripe/browser/Geo.png b/browser/themes/pinstripe/browser/Geo.png
index 41e3a46e3dc2..566a8ae74d6c 100644
Binary files a/browser/themes/pinstripe/browser/Geo.png and b/browser/themes/pinstripe/browser/Geo.png differ
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 6931e4bedd8d..dd16384de695 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -779,48 +779,131 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 /* ::::: nav-bar-inner ::::: */
 
 #urlbar {
-  -moz-appearance: none;
-  direction: ltr !important;
-  border: none;
-  background: url("chrome://browser/skin/urlbar/endcap.png") transparent right center no-repeat;
-  margin: 0 3px 1px;
-  -moz-padding-end: 11px;
-  font: icon !important;
+  direction: ltr;
+}
+
+.searchbar-textbox,
+#urlbar {
+  font: icon;
   width: 7em;
   min-width: 7em;
-  height: 28px;
+  -moz-appearance: none;
+  -moz-background-clip: padding;
+  -moz-border-radius: 100%;
+  border: 1px solid;
+  -moz-border-top-colors: #666;
+  -moz-border-right-colors: #777;
+  -moz-border-bottom-colors: #888;
+  -moz-border-left-colors: #777;
+  -moz-box-shadow: 0 1px 1px rgba(0,0,0,.3) inset,
+                   0 1px 0 rgba(255,255,255,.3);
+  margin-top: 0;
+  margin-bottom: 1px;
+  -moz-padding-end: 6px;
 }
 
+.searchbar-textbox[focused="true"],
 #urlbar[focused="true"] {
-  background: url("chrome://browser/skin/urlbar/endcap-focused.png") transparent right center no-repeat;
+  -moz-border-top-colors: rgba(0,0,0,.3);
+  -moz-border-right-colors: rgba(0,0,0,.2);
+  -moz-border-bottom-colors: rgba(0,0,0,.15);
+  -moz-border-left-colors: rgba(0,0,0,.2);
+  -moz-box-shadow: 0 1px 1px rgba(0,0,0,.3) inset,
+                   0 0 1px -moz-mac-focusring inset,
+                   0 0 4px 1px -moz-mac-focusring,
+                   0 0 2px 1px -moz-mac-focusring;
 }
 
-#urlbar[focused="true"]:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
+.searchbar-engine-button,
+#identity-box {
+  background: #fff url(navbar-textbox-button.png) bottom repeat-x;
+  -moz-background-clip: padding;
+  color: black;
+  -moz-padding-start: 6px;
+  -moz-padding-end: 16px;
+  -moz-border-radius: 100%;
+  border-top: 1px solid rgba(0,0,0,.35);
+  -moz-border-start: 1px solid rgba(0,0,0,.25);
+  border-bottom: 1px solid rgba(0,0,0,.2);
+  margin-top: -1px;
+  margin-bottom: -1px;
+  -moz-margin-start: -1px;
+  -moz-margin-end: 0;
 }
 
-#urlbar .textbox-input-box,
-#urlbar-icons {
-  margin: 0;
-  background: url("chrome://browser/skin/urlbar/textfield-mid.png") transparent left center  repeat-x;
+#identity-box:focus:not(:active):not([open="true"]) #page-proxy-stack {
+  -moz-border-radius: 4px;
+  -moz-box-shadow: 0 0 3px 1px -moz-mac-focusring inset,
+                   0 0 3px 2px -moz-mac-focusring;
 }
 
-#urlbar[focused="true"] .textbox-input-box,
-#urlbar[focused="true"] #urlbar-icons {
-  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
+.searchbar-textbox[focused="true"] .searchbar-engine-button,
+#urlbar[focused="true"] > #identity-box {
+  -moz-box-shadow: 0 0 1px -moz-mac-focusring inset;
 }
 
-#urlbar[focused="true"] .textbox-input-box:-moz-system-metric(mac-graphite-theme),
-#urlbar[focused="true"] #urlbar-icons:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused-graphite.png");
-}
-
-#urlbar .textbox-input-box {
+.searchbar-engine-button[open="true"],
+.searchbar-engine-button:hover:active,
+#identity-box[open="true"],
+#identity-box:hover:active {
+  border-style: none;
   padding-top: 1px;
+  padding-bottom: 1px;
+  -moz-padding-start: 7px;
+  -moz-box-shadow: 0 0 50px rgba(0,0,0,.3) inset,
+                   0 3px 3px rgba(0,0,0,.6) inset,
+                   2px 0 2px rgba(0,0,0,.3) inset,
+                   0 -2px 2px rgba(0,0,0,.1) inset !important;
 }
 
-.autocomplete-textbox {
-  background-image: inherit !important;
+#identity-box.verifiedDomain {
+  background-image: url(navbar-textbox-button-verifiedDomain.png);
+}
+
+#identity-box.verifiedIdentity {
+  background-image: url(navbar-textbox-button-verifiedIdentity.png);
+}
+
+#identity-icon-labels {
+  margin: 0 4px;
+}
+
+.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box,
+#urlbar > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-margin-end: 0;
+  -moz-margin-start: -16px;
+  background-color: -moz-field;
+  -moz-padding-start: 10px;
+}
+
+.searchbar-textbox[chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box,
+#urlbar > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-border-radius-topleft: 100%;
+  -moz-border-radius-bottomleft: 100%;
+  -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset,
+                   1px 0 0 rgba(0,0,0,.2) inset;
+}
+
+.searchbar-textbox[chromedir="rtl"] > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-border-radius-topright: 100%;
+  -moz-border-radius-bottomright: 100%;
+  -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset,
+                   -1px 0 0 rgba(0,0,0,.2) inset;
+}
+
+.searchbar-textbox[focused="true"][chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box,
+#urlbar[focused="true"] > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset,
+                   1px 0 0 rgba(0,0,0,.2) inset,
+                   2px 0 0 -moz-field inset,
+                   1px 0 1px -moz-mac-focusring inset;
+}
+
+.searchbar-textbox[focused="true"][chromedir="rtl"] > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset,
+                   -1px 0 0 rgba(0,0,0,.2) inset,
+                   -2px 0 0 -moz-field inset,
+                   -1px 0 1px -moz-mac-focusring inset;
 }
 
 #urlbar-icons {
@@ -828,13 +911,10 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 }
 
 #urlbar-search-splitter {
-  /* This is a bit of a mess, because the location bar and the search bar are bigger
-     than they look. For example, -moz-margin-start: -6px should really be -4px.
-     Bug 482086 and bug 482105 will solve this. */
   min-width: 8px;
   width: 8px;
   background-image: none;
-  -moz-margin-start: -6px;
+  -moz-margin-start: -4px;
 }
 
 #urlbar-search-splitter + #urlbar-container > #urlbar,
@@ -842,34 +922,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-margin-start: 0;
 }
 
-#wrapper-urlbar-container #urlbar,
-#urlbar[readonly="true"] {
-  -moz-padding-end: 12px;
-}
-
-#wrapper-urlbar-container[place="palette"] {
-  max-width: 20em;
-}
-
-#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box > hbox > #identity-icon-label,
-#wrapper-urlbar-container #urlbar > .autocomplete-history-dropmarker {
-  display: none;
-}
-
-#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedIdentity  > hbox > #identity-icon-label,
-#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedDomain > hbox > #identity-icon-label {
-  display: -moz-box;
-}
-
-/* Keep the URL bar LTR */
-
-#PopupAutoCompleteRichResult {
-  direction: ltr !important;
-  margin-top: -2px;
-}
-
-/* ----- PAGE PROXY ICON ----- */
-
 #page-proxy-favicon,
 #urlbar-throbber {
   width: 16px;
@@ -879,11 +931,14 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 }
 
 #page-proxy-stack {
-  -moz-margin-start: 10px;
   width: 24px;
   height: 20px;
   padding: 2px 4px;
-  opacity: 1.0;
+}
+
+#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
+#identity-box.verifiedDomain > hbox > #page-proxy-stack {
+  background: url(urlbar-favicon-glow.png) center center no-repeat;
 }
 
 #page-proxy-favicon:not([src]) {
@@ -898,6 +953,19 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   list-style-image: url("chrome://browser/skin/places/searching_16.png");
 }
 
+#wrapper-urlbar-container[place="palette"] {
+  max-width: 20em;
+}
+
+#wrapper-urlbar-container #identity-icon-labels,
+#wrapper-urlbar-container .autocomplete-history-dropmarker {
+  display: none;
+}
+
+#PopupAutoCompleteRichResult {
+  direction: ltr !important;
+  margin-top: 2px;
+}
 
 statusbarpanel#statusbar-display {
   -moz-padding-start: 0;
@@ -1763,19 +1831,13 @@ tabbrowser > tabbox > tabpanels {
 }
 
 .tabs-closebutton {
-  padding-right: 4px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
-  list-style-image: none;
+  -moz-padding-end: 4px;
+  list-style-image: url("chrome://global/skin/icons/closetab.png");
   border: none;
-  -moz-box-align: stretch;
-}
-
-.tabs-closebutton:hover > .toolbarbutton-icon {
-	background-image: none !important;
 }
 
 .tabs-closebutton:hover:active {
-	list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
 }
 
 tabpanels.plain {
@@ -1833,179 +1895,6 @@ tabpanels.plain {
   -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight !important;
 }
 
-/* ::::: Identity Indicator Styling ::::: */
-/* Location bar visuals*/
-
-#identity-box {
-  background: url("chrome://browser/skin/urlbar/startcap.png") left center no-repeat;
-  min-width: 45px;
-}
-
-#urlbar[focused="true"] > #identity-box {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
-}
-
-#identity-box:focus > hbox > #page-proxy-deck {
-  outline: 2px solid #4F8EC9;
-  -moz-outline-radius: 2px;
-}
-
-#identity-box:hover:active,
-#identity-box[open="true"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active.png");
-}
-
-#identity-icon-label {
-  margin: 0;
-  color: black;
-  padding: 4px 6px 3px;
-  -moz-padding-end: 14px;
-}
-
-#identity-box.unknownIdentity > hbox > #identity-icon-label {
-  display: none;
-}
-
-
-/* Verified domain */
-/* - Normal state */
-#identity-box.verifiedDomain {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start.png");
-  -moz-padding-start: 13px;
-}
-
-#identity-box.verifiedDomain > hbox {
-  padding: 0;
-  background: url("chrome://browser/skin/urlbar/startcap-secure-mid.png") repeat-x center center;
-  -moz-box-pack: center;
-}
-
-#identity-box.verifiedDomain > hbox > #identity-icon-label {
-  background: url("chrome://browser/skin/urlbar/startcap-secure-end.png") no-repeat center right;
-}
-
-/* - Active state */
-#identity-box.verifiedDomain[open="true"],
-#identity-box.verifiedDomain:hover:active {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-active.png");
-}
-
-#identity-box.verifiedDomain[open="true"] > hbox,
-#identity-box.verifiedDomain:hover:active > hbox {
-  padding: 0;
-  background: url("chrome://browser/skin/urlbar/startcap-secure-mid-active.png") repeat-x center center;
-  -moz-box-pack: center;
-}
-
-#identity-box.verifiedDomain[open="true"] > hbox > #identity-icon-label,
-#identity-box.verifiedDomain:hover:active > hbox > #identity-icon-label {
-  background: url("chrome://browser/skin/urlbar/startcap-secure-end-active.png") no-repeat center right;
-}
-
-/* - Focus state */
-#urlbar[focused="true"] > #identity-box.verifiedDomain {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox > #identity-icon-label {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedDomain:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused-graphite.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused-graphite.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox > #identity-icon-label:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused-graphite.png");
-}
-
-#identity-box.verifiedDomain > hbox > #identity-icon-label[value=""] {
-  -moz-padding-start: 3px !important;
-  -moz-padding-end: 8px !important;
-}
-
-
-/* Verified Identity */
-/* - Normal state */
-#identity-box.verifiedIdentity {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start.png");
-  -moz-padding-start: 13px;
-}
-
-#identity-box.verifiedIdentity > hbox {
-  padding: 0;
-  background: url("chrome://browser/skin/urlbar/startcap-verified-mid.png") repeat-x center center;
-  -moz-box-pack: center;
-}
-
-#identity-box.verifiedIdentity > hbox > #identity-icon-label {
-  background: url("chrome://browser/skin/urlbar/startcap-verified-end.png") no-repeat center right;
-}
-
-/* - Active state */
-#identity-box.verifiedIdentity[open="true"],
-#identity-box.verifiedIdentity:hover:active {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-active.png");
-}
-
-#identity-box.verifiedIdentity[open="true"] > hbox,
-#identity-box.verifiedIdentity:hover:active > hbox {
-  background: url("chrome://browser/skin/urlbar/startcap-verified-mid-active.png") repeat-x center center;
-}
-
-#identity-box.verifiedIdentity[open="true"] > hbox > #identity-icon-label,
-#identity-box.verifiedIdentity:hover:active > hbox > #identity-icon-label {
-  background: url("chrome://browser/skin/urlbar/startcap-verified-end-active.png") no-repeat center right;
-}
-
-/* - Focus state */
-#urlbar[focused="true"] > #identity-box.verifiedIdentity {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox > #identity-icon-label {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedIdentity:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused-graphite.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused-graphite.png");
-}
-
-#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox > #identity-icon-label:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused-graphite.png");
-}
-
-/* Favicon Glow */
-#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
-#identity-box.verifiedDomain > hbox > #page-proxy-stack {
-  -moz-margin-start: -3px;
-  width: 24px;
-  height: 20px;
-  padding: 2px 4px;
-  background: url("chrome://browser/skin/urlbar/urlbar-favicon-glow.png") center center no-repeat;
-}
-
-
 /* Popup Icons */
 #identity-popup-icon {
   height: 64px;
@@ -2075,7 +1964,7 @@ tabpanels.plain {
   -moz-window-shadow: none;
   background-color: transparent;
   margin-top: -4px;
-  margin-left: -13px;
+  margin-left: -15px;
   min-width: 280px;
   -moz-border-image: url(chrome://browser/skin/hud-panel.png) 26 18 22 50 / 26px 18px 22px 50px repeat; 
 }
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index 311eacb7e480..8ffd59b568f1 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -32,6 +32,9 @@ classic.jar:
   skin/classic/browser/KUI-background.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
+  skin/classic/browser/navbar-textbox-button.png
+  skin/classic/browser/navbar-textbox-button-verifiedDomain.png
+  skin/classic/browser/navbar-textbox-button-verifiedIdentity.png
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/livemark-item.png
   skin/classic/browser/pageInfo.css
@@ -50,6 +53,7 @@ classic.jar:
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-rtl.png
+  skin/classic/browser/urlbar-favicon-glow.png
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
@@ -121,53 +125,5 @@ classic.jar:
   skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png              (tabbrowser/tabbrowser-tabs-bkgnd.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabbrowser/tab-bkgnd.png                          (tabbrowser/tab-bkgnd.png)
-  skin/classic/browser/urlbar/endcap.png                                 (urlbar/endcap.png)
-  skin/classic/browser/urlbar/endcap-rtl.png                             (urlbar/endcap-rtl.png)
-  skin/classic/browser/urlbar/endcap-focused.png                         (urlbar/endcap-focused.png)
-  skin/classic/browser/urlbar/endcap-focused-graphite.png                (urlbar/endcap-focused-graphite.png)
-  skin/classic/browser/urlbar/endcap-focused-graphite-rtl.png            (urlbar/endcap-focused-graphite-rtl.png)
-  skin/classic/browser/urlbar/endcap-focused-rtl.png                     (urlbar/endcap-focused-rtl.png)
-  skin/classic/browser/urlbar/startcap.png                               (urlbar/startcap.png)
-  skin/classic/browser/urlbar/startcap-rtl.png                           (urlbar/startcap-rtl.png)
-  skin/classic/browser/urlbar/startcap-focused.png                       (urlbar/startcap-focused.png)
-  skin/classic/browser/urlbar/startcap-focused-graphite.png              (urlbar/startcap-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-focused-graphite-rtl.png          (urlbar/startcap-focused-graphite-rtl.png)
-  skin/classic/browser/urlbar/startcap-focused-rtl.png                   (urlbar/startcap-focused-rtl.png)
-  skin/classic/browser/urlbar/startcap-secure-start.png                  (urlbar/startcap-secure-start.png)
-  skin/classic/browser/urlbar/startcap-secure-mid.png                    (urlbar/startcap-secure-mid.png)
-  skin/classic/browser/urlbar/startcap-secure-end.png                    (urlbar/startcap-secure-end.png)
-  skin/classic/browser/urlbar/startcap-secure-start-active.png           (urlbar/startcap-secure-start-active.png)
-  skin/classic/browser/urlbar/startcap-secure-mid-active.png             (urlbar/startcap-secure-mid-active.png)
-  skin/classic/browser/urlbar/startcap-secure-end-active.png             (urlbar/startcap-secure-end-active.png)
-  skin/classic/browser/urlbar/startcap-secure-start-focused.png          (urlbar/startcap-secure-start-focused.png)
-  skin/classic/browser/urlbar/startcap-secure-start-focused-graphite.png (urlbar/startcap-secure-start-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-secure-mid-focused.png            (urlbar/startcap-secure-mid-focused.png)
-  skin/classic/browser/urlbar/startcap-secure-mid-focused-graphite.png   (urlbar/startcap-secure-mid-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-secure-end-focused.png            (urlbar/startcap-secure-end-focused.png)
-  skin/classic/browser/urlbar/startcap-secure-end-focused-graphite.png   (urlbar/startcap-secure-end-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-verified-start.png                (urlbar/startcap-verified-start.png)
-  skin/classic/browser/urlbar/startcap-verified-mid.png                  (urlbar/startcap-verified-mid.png)
-  skin/classic/browser/urlbar/startcap-verified-end.png                  (urlbar/startcap-verified-end.png)
-  skin/classic/browser/urlbar/startcap-verified-start-active.png         (urlbar/startcap-verified-start-active.png)
-  skin/classic/browser/urlbar/startcap-verified-mid-active.png           (urlbar/startcap-verified-mid-active.png)
-  skin/classic/browser/urlbar/startcap-verified-end-active.png           (urlbar/startcap-verified-end-active.png)
-  skin/classic/browser/urlbar/startcap-verified-start-focused.png        (urlbar/startcap-verified-start-focused.png)
-  skin/classic/browser/urlbar/startcap-verified-start-focused-graphite.png (urlbar/startcap-verified-start-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-verified-mid-focused.png          (urlbar/startcap-verified-mid-focused.png)
-  skin/classic/browser/urlbar/startcap-verified-mid-focused-graphite.png (urlbar/startcap-verified-mid-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-verified-end-focused.png          (urlbar/startcap-verified-end-focused.png)
-  skin/classic/browser/urlbar/startcap-verified-end-focused-graphite.png (urlbar/startcap-verified-end-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-secure.png                        (urlbar/startcap-secure.png)
-  skin/classic/browser/urlbar/startcap-active.png                        (urlbar/startcap-active.png)
-  skin/classic/browser/urlbar/startcap-active-rtl.png                    (urlbar/startcap-active-rtl.png)
-  skin/classic/browser/urlbar/startcap-active-focused.png                (urlbar/startcap-active-focused.png)
-  skin/classic/browser/urlbar/startcap-active-focused-graphite.png       (urlbar/startcap-active-focused-graphite.png)
-  skin/classic/browser/urlbar/startcap-active-focused-graphite-rtl.png   (urlbar/startcap-active-focused-graphite-rtl.png)
-  skin/classic/browser/urlbar/startcap-active-focused-rtl.png            (urlbar/startcap-active-focused-rtl.png)
-  skin/classic/browser/urlbar/startcap-secure-active.png                 (urlbar/startcap-secure-active.png)
-  skin/classic/browser/urlbar/urlbar-favicon-glow.png                    (urlbar/urlbar-favicon-glow.png)
-  skin/classic/browser/urlbar/textfield-mid.png                          (urlbar/textfield-mid.png)
-  skin/classic/browser/urlbar/textfield-mid-focused.png                  (urlbar/textfield-mid-focused.png)
-  skin/classic/browser/urlbar/textfield-mid-focused-graphite.png         (urlbar/textfield-mid-focused-graphite.png)
   icon.png
   preview.png
diff --git a/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedDomain.png b/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedDomain.png
new file mode 100755
index 000000000000..fddb8a5f4e06
Binary files /dev/null and b/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedDomain.png differ
diff --git a/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedIdentity.png b/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedIdentity.png
new file mode 100755
index 000000000000..5f12a48ae341
Binary files /dev/null and b/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedIdentity.png differ
diff --git a/browser/themes/pinstripe/browser/navbar-textbox-button.png b/browser/themes/pinstripe/browser/navbar-textbox-button.png
new file mode 100755
index 000000000000..9d509365f958
Binary files /dev/null and b/browser/themes/pinstripe/browser/navbar-textbox-button.png differ
diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css
index ef80b3b52770..70080c09066a 100644
--- a/browser/themes/pinstripe/browser/searchbar.css
+++ b/browser/themes/pinstripe/browser/searchbar.css
@@ -1,31 +1,3 @@
-/* *** pinstripe *** */
-
-.searchbar-textbox {
-  -moz-appearance: none;
-  font: icon;
-  height: 28px;
-  width: 5em;
-  margin: 0 3px 1px;
-  min-width: 5em;
-  border: none;
-  background-color: transparent;
-}
-
-.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
-  background: url("chrome://browser/skin/urlbar/textfield-mid.png") repeat-x;
-  padding: 0;
-  margin: 0;
-  -moz-margin-start: 45px;
-}
-
-.searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box {
-  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
-}
-
-.searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused-graphite.png");
-}
-
 .searchbar-engine-image {
   width: 16px;
   height: 16px;
@@ -34,65 +6,8 @@
 }
 
 .searchbar-engine-button {
-  background: url("chrome://browser/skin/urlbar/startcap.png") center center no-repeat;
   -moz-appearance: none;
-  height: 28px;
-  min-width: 45px;
-  border: 0;
-  -moz-box-align: center;
-  margin: 0;
-  -moz-margin-start: -45px;
-  padding: 0;
-}
-
-.searchbar-engine-button[chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-rtl.png");
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png");
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite-rtl.png");
-}
-
-.searchbar-engine-button:hover:active,
-.searchbar-engine-button[open="true"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
-}
-
-.searchbar-engine-button:hover:active[chromedir="rtl"],
-.searchbar-engine-button[open="true"][chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-rtl.png") !important;
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button:active,
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused.png") !important;
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active,
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important;
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button:active:-moz-system-metric(mac-graphite-theme),
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite.png") !important;
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active:-moz-system-metric(mac-graphite-theme),
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite-rtl.png") !important;
+  min-width: 0;
 }
 
 .searchbar-engine-button > .button-box {
@@ -103,7 +18,11 @@
 }
 
 .searchbar-engine-button[addengines="true"] > .button-box {
-  background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat 25px 50%;
+  background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat right center;
+}
+
+.searchbar-textbox[chromedir="rtl"] .searchbar-engine-button[addengines="true"] > .button-box {
+  background-position: left center;
 }
 
 .searchbar-dropmarker-image {
@@ -114,36 +33,10 @@
 
 .search-go-container {
   -moz-box-align: center;
-  background: url("chrome://browser/skin/urlbar/endcap.png") no-repeat right top;
-  -moz-padding-end: 5px;
-}
-
-.search-go-container[chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/endcap-rtl.png");
-}
-
-.searchbar-textbox[focused="true"] > .search-go-container {
-  background-image: url("chrome://browser/skin/urlbar/endcap-focused.png");
-}
-
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"] {
-  background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top;
-}
-
-.searchbar-textbox[focused="true"] > .search-go-container:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
-}
-
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
-  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite-rtl.png");
 }
 
 .search-go-button {
-  padding: 1px;
   list-style-image: url("chrome://browser/skin/Search.png");
-  margin: 0;
-  padding: 0;
-  -moz-padding-end: 6px;
 }
 
 .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
diff --git a/browser/themes/pinstripe/browser/urlbar/urlbar-favicon-glow.png b/browser/themes/pinstripe/browser/urlbar-favicon-glow.png
similarity index 100%
rename from browser/themes/pinstripe/browser/urlbar/urlbar-favicon-glow.png
rename to browser/themes/pinstripe/browser/urlbar-favicon-glow.png
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused-graphite-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused-graphite-rtl.png
deleted file mode 100644
index 10c9e89529d3..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused-graphite-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused-graphite.png
deleted file mode 100644
index 4e27f08439cb..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png
deleted file mode 100644
index b7cb9c63c0f5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused.png
deleted file mode 100644
index 786fd2979e57..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png
deleted file mode 100644
index e26eaebf8a15..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-secure.png b/browser/themes/pinstripe/browser/urlbar/endcap-secure.png
deleted file mode 100644
index 7e50ee4f6e11..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-secure.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap.png b/browser/themes/pinstripe/browser/urlbar/endcap.png
deleted file mode 100644
index 60069850d307..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-graphite-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-graphite-rtl.png
deleted file mode 100644
index 0cca6565c49e..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-graphite-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-graphite.png
deleted file mode 100644
index 311cef8aefad..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png
deleted file mode 100644
index ed2bb4403068..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png
deleted file mode 100644
index 7076d1df6cd2..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png
deleted file mode 100644
index 2047ada0fc5c..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-active.png
deleted file mode 100644
index 33603dea2499..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused-graphite-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused-graphite-rtl.png
deleted file mode 100644
index 289c0fbd5d15..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused-graphite-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused-graphite.png
deleted file mode 100644
index 5e5194d0204b..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png
deleted file mode 100644
index 26909af696fc..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused.png
deleted file mode 100644
index 499d1c4df50b..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png
deleted file mode 100644
index a73a41e50a63..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-active.png
deleted file mode 100644
index df39fe20da43..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png
deleted file mode 100644
index aa4183cac7cc..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused-graphite.png
deleted file mode 100644
index b85590b32d0f..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png
deleted file mode 100644
index 9dc0637949be..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png
deleted file mode 100644
index 8fc0939b8b6f..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png
deleted file mode 100644
index 6bfe1260248f..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused-graphite.png
deleted file mode 100644
index e26ee4decdc5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png
deleted file mode 100644
index ebe4f69e5bcc..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png
deleted file mode 100644
index e9fc57660b22..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png
deleted file mode 100644
index 8c8fd080b236..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused-graphite.png
deleted file mode 100644
index 284f3b0a5b5b..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png
deleted file mode 100644
index bc0e4064da20..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png
deleted file mode 100644
index 46a282fee1e5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure.png
deleted file mode 100644
index e7f85b9b1a29..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png
deleted file mode 100644
index ca0bad20bd3f..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused-graphite.png
deleted file mode 100644
index be03cdbc2d0e..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png
deleted file mode 100644
index 65e097bb2701..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-invalid.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-invalid.png
deleted file mode 100644
index bb84890a4729..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-invalid.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png
deleted file mode 100644
index bcee816e211d..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png
deleted file mode 100644
index 853aa7d8407e..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused-graphite.png
deleted file mode 100644
index 1250613dd15a..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png
deleted file mode 100644
index b7c85e8f5ad5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png
deleted file mode 100644
index e135410df021..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png
deleted file mode 100644
index 73e26174bc09..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused-graphite.png
deleted file mode 100644
index 83a3d55929f8..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png
deleted file mode 100644
index 3e1a2f6c129e..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png
deleted file mode 100644
index e5d3752a2016..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap.png b/browser/themes/pinstripe/browser/urlbar/startcap.png
deleted file mode 100644
index 5d822e9c0745..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused-graphite.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused-graphite.png
deleted file mode 100644
index 16be713c7446..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused-graphite.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png
deleted file mode 100644
index 0d8706580557..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-secure-focused.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-secure-focused.png
deleted file mode 100644
index 13a4a669f176..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid-secure-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-secure.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-secure.png
deleted file mode 100644
index 3f1cdcc3f2bd..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid-secure.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid.png
deleted file mode 100644
index b1ba5e9343a5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png and /dev/null differ
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
old mode 100644
new mode 100755
index aaeb81080dc7..272d0eeb30af
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1551,7 +1551,6 @@ tabpanels {
 }
 
 .tabs-newtab-button {
-  opacity: .8;
   list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
@@ -1868,13 +1867,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   outline: 1px dotted white;
 }
 
-#identity-icon-label {
+#identity-icon-labels {
   padding: 0 2px;
-  margin: 0;
-}
-
-#identity-icon-label[value=""] {
-  display: none;
 }
 
 /* Popup Icons */
diff --git a/browser/themes/winstripe/browser/searchbar.css b/browser/themes/winstripe/browser/searchbar.css
index 7684ba79fa6d..c855c4dd6641 100644
--- a/browser/themes/winstripe/browser/searchbar.css
+++ b/browser/themes/winstripe/browser/searchbar.css
@@ -4,6 +4,10 @@
   min-width: 6em;
 }
 
+.autocomplete-textbox-container {
+  -moz-box-align: stretch;
+}
+
 .searchbar-textbox:-moz-system-metric(windows-default-theme) {
   -moz-appearance: none;
   border-width: 1px;
@@ -33,8 +37,6 @@
   margin: 0;
   -moz-margin-end: 3px;
   padding: 0;
-  height: 1.23em;
-  min-height: 20px;
   -moz-box-align: center;
   background: -moz-dialog url(navbar-textbox-buttons.png) repeat-x;
   border: 0 solid;
diff --git a/build/automation.py.in b/build/automation.py.in
index 68bf1133da09..a9e59f6c403f 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -257,6 +257,7 @@ user_pref("svg.smil.enabled", true); // Needed for SMIL mochitests until bug 482
 user_pref("media.cache_size", 100);
 user_pref("security.warn_viewing_mixed", false);
 
+user_pref("geo.wifi.uri", "http://localhost:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs");
 user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others
 """
   
diff --git a/content/base/public/nsIContent.h b/content/base/public/nsIContent.h
index 52af43260d67..f592c7fcfbfc 100644
--- a/content/base/public/nsIContent.h
+++ b/content/base/public/nsIContent.h
@@ -42,10 +42,10 @@
 #include "nsCaseTreatment.h"
 #include "nsChangeHint.h"
 #include "nsINode.h"
+#include "nsIDocument.h" // for IsInHTMLDocument
 
 // Forward declarations
 class nsIAtom;
-class nsIDocument;
 class nsPresContext;
 class nsIDOMEvent;
 class nsIContent;
@@ -63,8 +63,8 @@ class nsISMILAttr;
 
 // IID for the nsIContent interface
 #define NS_ICONTENT_IID       \
-{ 0x3ca5afbe, 0x1052, 0x4682, \
-  { 0x9f, 0xa0, 0x0e, 0x39, 0xe4, 0xf8, 0xef, 0x9d } }
+{ 0x08dadcc4, 0x057a, 0x4b8d, \
+  { 0x89, 0x43, 0x30, 0x0e, 0x61, 0xc6, 0x9d, 0x36 } }
 
 /**
  * A node of content in a document's content model. This interface
@@ -202,6 +202,17 @@ public:
     return IsInNativeAnonymousSubtree() || GetBindingParent() != nsnull;
   }
 
+  /**
+   * Return true iff this node is in an HTML document (in the HTML5 sense of
+   * the term, i.e. not in an XHTML/XML document).
+   */
+  inline PRBool IsInHTMLDocument() const
+  {
+    nsIDocument* doc = GetOwnerDoc();
+    return doc && // XXX clean up after bug 335998 lands
+           !doc->IsCaseSensitive();
+  }
+
   /**
    * Get the namespace that this element's tag is defined in
    * @return the namespace
@@ -456,36 +467,6 @@ public:
    */
   virtual void AppendTextTo(nsAString& aResult) = 0;
 
-  /**
-   * Set the focus on this content.  This is generally something for the event
-   * state manager to do, not ordinary people.  Ordinary people should do
-   * something like nsGenericHTMLElement::SetElementFocus().  This method is
-   * the end result, the point where the content finds out it has been focused.
-   * 
-   * All content elements are potentially focusable.
-   *
-   * @param aPresContext the pres context
-   * @see nsGenericHTMLElement::SetElementFocus()
-   */
-  virtual void SetFocus(nsPresContext* aPresContext)
-  {
-  }
-
-  /**
-   * Remove the focus on this content.  This is generally something for the
-   * event state manager to do, not ordinary people.  Ordinary people should do
-   * something like nsGenericHTMLElement::SetElementFocus().  This method is
-   * the end result, the point where the content finds out it has been focused.
-   * 
-   * All content elements are potentially focusable.
-   *
-   * @param aPresContext the pres context
-   * @see nsGenericHTMLElement::SetElementFocus()
-   */
-  virtual void RemoveFocus(nsPresContext* aPresContext)
-  {
-  }
-
   /**
    * Check if this content is focusable and in the current tab order.
    * Note: most callers should use nsIFrame::IsFocusable() instead as it 
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 2e2b9b813438..3115c506b89a 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -115,6 +115,7 @@
 #include "nsIDOMWindowInternal.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMElement.h"
+#include "nsFocusManager.h"
 
 // for radio group stuff
 #include "nsIDOMHTMLInputElement.h"
@@ -2493,28 +2494,15 @@ nsDocument::HasFocus(PRBool* aResult)
 {
   *aResult = PR_FALSE;
 
-  nsPIDOMWindow* window = GetWindow();
-  nsIFocusController* focusController = window ?
-    window->GetRootFocusController() : nsnull;
-  if (!focusController) {
-    return NS_OK;
-  }
-
-  // Does the top-level window have focus?
-  PRBool active;
-  nsresult rv = focusController->GetActive(&active);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!active){
-    return NS_OK;
-  }
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return NS_ERROR_NOT_AVAILABLE;
 
   // Is there a focused DOMWindow?
-  nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-  rv = focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!focusedWindow) {
-    return NS_ERROR_FAILURE;
-  }
+  nsCOMPtr<nsIDOMWindow> focusedWindow;
+  fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
+  if (!focusedWindow)
+    return NS_OK;
 
   // Are we an ancestor of the focused DOMWindow?
   nsCOMPtr<nsIDOMDocument> domDocument;
@@ -2546,56 +2534,29 @@ nsDocument::GetActiveElement(nsIDOMElement **aElement)
   *aElement = nsnull;
 
   // Get the focused element.
-  nsPIDOMWindow* window = GetWindow();
+  nsCOMPtr<nsPIDOMWindow> window = GetWindow();
   if (!window) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  nsIFocusController* focusController = window->GetRootFocusController();
-  if (!focusController) {
-    return NS_ERROR_FAILURE;
-  }
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return NS_ERROR_NOT_AVAILABLE;
 
-  nsCOMPtr<nsIDOMElement> focusedElement;
-  focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-  nsCOMPtr<nsIContent> content = do_QueryInterface(focusedElement);
-  if (content) {
-    // Found a focused element.  See if it's in this document.
-    nsIDocument* currentDoc = content->GetCurrentDoc();
-    if (currentDoc == this) {
-      focusedElement.swap(*aElement);
-      return NS_OK;
+  nsCOMPtr<nsPIDOMWindow> focusedWindow;
+  nsIContent* focusedContent =
+    nsFocusManager::GetFocusedDescendant(window, PR_FALSE, getter_AddRefs(focusedWindow));
+
+  // an element in this document is focused, so return it
+  if (focusedContent) {
+    // be safe and make sure the element is from this document
+    if (focusedContent->GetOwnerDoc() != this) {
+      NS_WARNING("Focused element found from another document");
+      return NS_ERROR_FAILURE;
     }
 
-    // Not in this document.  If it's in a child document, return the iframe in
-    // this document that's an ancestor of the child.
-    if (currentDoc) {
-      *aElement = CheckAncestryAndGetFrame(currentDoc).get();
-      if (*aElement) {
-        return NS_OK;
-      }
-    }
-  }
-
-  // Couldn't find a focused element.  Check if something like an IFRAME is
-  // focused, which will give us a focused window rather than a focused
-  // element.
-  nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-  focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-  if (focusedWindow) {
-    // Found a focused window.  See if it's in a child of this document.  (If
-    // the window's document is this, then we should just fall through to
-    // returning the BODY below).
-    nsCOMPtr<nsIDOMDocument> domDocument;
-    focusedWindow->GetDocument(getter_AddRefs(domDocument));
-    nsCOMPtr<nsIDocument> document = do_QueryInterface(domDocument);
-
-    if (document && (document != this)) {
-      *aElement = CheckAncestryAndGetFrame(document).get();
-      if (*aElement) {
-        return NS_OK;
-      }
-    }
+    CallQueryInterface(focusedContent, aElement);
+    return NS_OK;
   }
 
   // No focused element anywhere in this document.  Try to get the BODY.
@@ -7502,8 +7463,13 @@ static void
 FireOrClearDelayedEvents(nsTArray<nsCOMPtr<nsIDocument> >& aDocuments,
                          PRBool aFireEvents)
 {
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return;
+
   for (PRUint32 i = 0; i < aDocuments.Length(); ++i) {
     if (!aDocuments[i]->EventHandlingSuppressed()) {
+      fm->FireDelayedEvents(aDocuments[i]);
       nsPresShellIterator iter(aDocuments[i]);
       nsCOMPtr<nsIPresShell> shell;
       while ((shell = iter.GetNextShell())) {
diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp
index 29e85fca2442..7bf0b16ea448 100644
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -817,9 +817,7 @@ nsFrameLoader::EnsureDocShell()
   nsAutoString frameName;
 
   PRInt32 namespaceID = mOwnerContent->GetNameSpaceID();
-  if (namespaceID == kNameSpaceID_XHTML
-      && mOwnerContent->GetOwnerDoc() // clean up after bug 335998
-      && mOwnerContent->GetOwnerDoc()->IsCaseSensitive()) {
+  if (namespaceID == kNameSpaceID_XHTML && !mOwnerContent->IsInHTMLDocument()) {
     mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::id, frameName);
   } else {
     mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::name, frameName);
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 82143c3cc652..1e6054fbd8b0 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -54,7 +54,7 @@
 #include "nsIDOMText.h"
 #include "nsIContentIterator.h"
 #include "nsIEventListenerManager.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsILinkHandler.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIURL.h"
@@ -124,7 +124,6 @@
 #include "nsIEditorDocShell.h"
 #include "nsEventDispatcher.h"
 #include "nsContentCreatorFunctions.h"
-#include "nsIFocusController.h"
 #include "nsIControllers.h"
 #include "nsLayoutUtils.h"
 #include "nsIView.h"
@@ -3072,84 +3071,29 @@ nsGenericElement::IsLink(nsIURI** aURI) const
   return PR_FALSE;
 }
 
-void
-nsGenericElement::SetFocus(nsPresContext* aPresContext)
-{
-  // Traditionally focusable elements can take focus as long as they don't set
-  // the disabled attribute
-
-  nsCOMPtr<nsIPresShell> presShell = aPresContext->PresShell();
-  if (!presShell) {
-    return;
-  }
-  nsIFrame* frame = presShell->GetPrimaryFrameFor(this);
-  if (frame && frame->IsFocusable() &&
-      aPresContext->EventStateManager()->SetContentState(this,
-                                                         NS_EVENT_STATE_FOCUS)) {
-    presShell->ScrollContentIntoView(this, NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
-                                     NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-  }
-}
-
-// static
-PRBool
-nsGenericElement::ShouldFocus(nsIContent *aContent)
-{
-  // Default to false, since if the document is not attached to a window,
-  // we should not focus any of its content.
-  PRBool visible = PR_FALSE;
-
-  // Figure out if we're focusing an element in an inactive (hidden)
-  // tab (whose docshell is not visible), if so, drop this focus
-  // request on the floor
-
-  nsIDocument *document = aContent->GetDocument();
-
-  if (document) {
-    nsIScriptGlobalObject *sgo = document->GetScriptGlobalObject();
-
-    if (sgo) {
-      nsCOMPtr<nsIWebNavigation> webNav(do_GetInterface(sgo));
-      nsCOMPtr<nsIBaseWindow> baseWin(do_QueryInterface(webNav));
-
-      if (baseWin) {
-        baseWin->GetVisibility(&visible);
-      }
-    }
-  }
-
-  return visible;
-}
-
 // static
 PRBool
 nsGenericElement::ShouldBlur(nsIContent *aContent)
 {
   // Determine if the current element is focused, if it is not focused
   // then we should not try to blur
-  PRBool isFocused = PR_FALSE;
-
   nsIDocument *document = aContent->GetDocument();
+  if (!document)
+    return PR_FALSE;
 
-  if (document) {
-    nsPIDOMWindow *win = document->GetWindow();
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(document->GetWindow());
+  if (!window)
+    return PR_FALSE;
 
-    if (win) {
-      nsCOMPtr<nsIFocusController> focusController =
-           win->GetRootFocusController();
+  nsCOMPtr<nsPIDOMWindow> focusedFrame;
+  nsIContent* contentToBlur =
+    nsFocusManager::GetFocusedDescendant(window, PR_FALSE, getter_AddRefs(focusedFrame));
+  if (contentToBlur == aContent)
+    return PR_TRUE;
 
-      if (focusController) {
-        nsCOMPtr<nsIDOMElement> focusedElement;
-        focusController->GetFocusedElement(getter_AddRefs(focusedElement));    
-        nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(aContent);
-        //when the element is the same as the focused element, blur it
-        if (domElement == focusedElement)
-          isFocused = PR_TRUE;
-      }
-    }
-  }
-
-  return isFocused;
+  // if focus on this element would get redirected, then check the redirected
+  // content as well when blurring.
+  return (contentToBlur && nsFocusManager::GetRedirectedFocus(aContent) == contentToBlur);
 }
 
 nsIContent*
@@ -4999,28 +4943,15 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
         // don't make the link grab the focus if there is no link handler
         nsILinkHandler *handler = aVisitor.mPresContext->GetLinkHandler();
         nsIDocument *document = GetCurrentDoc();
-        if (handler && document && ShouldFocus(this)) {
-          // If the window is not active, do not allow the focus to bring the
-          // window to the front. We update the focus controller, but do nothing
-          // else.
-          nsPIDOMWindow *win = document->GetWindow();
-          if (win) {
-            nsIFocusController *focusController =
-              win->GetRootFocusController();
-            if (focusController) {
-              PRBool isActive = PR_FALSE;
-              focusController->GetActive(&isActive);
-              if (!isActive) {
-                nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(this);
-                if(domElement)
-                  focusController->SetFocusedElement(domElement);
-                break;
-              }
-            }
+        if (handler && document) {
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          if (fm) {
+            nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(this);
+            fm->SetFocus(elem, nsIFocusManager::FLAG_BYMOUSE);
           }
-  
+
           aVisitor.mPresContext->EventStateManager()->
-            SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS);
+            SetContentState(this, NS_EVENT_STATE_ACTIVE);
         }
       }
     }
diff --git a/content/base/src/nsGenericElement.h b/content/base/src/nsGenericElement.h
index 70c7e27e78c6..b859aa1dd485 100644
--- a/content/base/src/nsGenericElement.h
+++ b/content/base/src/nsGenericElement.h
@@ -417,7 +417,6 @@ public:
                               PRBool aNotify);
   virtual PRBool TextIsOnlyWhitespace();
   virtual void AppendTextTo(nsAString& aResult);
-  virtual void SetFocus(nsPresContext* aContext);
   virtual nsIContent *GetBindingParent() const;
   virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
   virtual already_AddRefed<nsIURI> GetBaseURI() const;
@@ -584,8 +583,6 @@ public:
   static already_AddRefed<nsIDOMNSFeatureFactory>
     GetDOMFeatureFactory(const nsAString& aFeature, const nsAString& aVersion);
 
-  static PRBool ShouldFocus(nsIContent *aContent);
-
   static PRBool ShouldBlur(nsIContent *aContent);
 
   /**
diff --git a/content/events/public/nsIEventStateManager.h b/content/events/public/nsIEventStateManager.h
index 46a03edd8470..70da1a0c7a6f 100644
--- a/content/events/public/nsIEventStateManager.h
+++ b/content/events/public/nsIEventStateManager.h
@@ -42,6 +42,7 @@
 #include "nsISupports.h"
 
 class nsIContent;
+class nsIDocument;
 class nsPresContext;
 class nsIDOMEvent;
 class nsIFrame;
@@ -52,24 +53,16 @@ class imgIContainer;
 /*
  * Event state manager interface.
  */
-// {fb7516ff-2f01-4893-84e8-e4b282813023}
+// {C224A806-A99F-4056-85C2-3B1970F94DB2}
 #define NS_IEVENTSTATEMANAGER_IID \
-{ 0x522d12ec, 0xde51, 0x4635, \
-  { 0xb0, 0x10, 0x4, 0x2a, 0x6d, 0x5, 0xa0, 0x3e } }
+{ 0xc224a806, 0xa99f, 0x4056, \
+  { 0x85, 0xc2, 0x3b, 0x19, 0x70, 0xf9, 0x4d, 0xb2 } }
 
 #define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_FOCUS_EVENT(event))
 
 class nsIEventStateManager : public nsISupports {
 
 public:
-  enum EFocusedWithType {
-    eEventFocusedByUnknown,     // focus gained via unknown method
-    eEventFocusedByMouse,       // focus gained via mouse
-    eEventFocusedByKey,         // focus gained via key press (like tab)
-    eEventFocusedByContextMenu, // focus gained via context menu
-    eEventFocusedByApplication  // focus gained via Application (like script)
-  };
-
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IEVENTSTATEMANAGER_IID)
 
   NS_IMETHOD Init() = 0;
@@ -108,29 +101,9 @@ public:
    */
   virtual PRBool SetContentState(nsIContent *aContent, PRInt32 aState) = 0;
 
-  NS_IMETHOD GetFocusedContent(nsIContent **aContent) = 0;
-  NS_IMETHOD SetFocusedContent(nsIContent* aContent) = 0;
-
-  // Get the previously-focused content node for this document
-  NS_IMETHOD GetLastFocusedContent(nsIContent **aContent) = 0;
-
-  NS_IMETHOD GetFocusedFrame(nsIFrame **aFrame) = 0;
-
-  NS_IMETHOD ContentRemoved(nsIContent* aContent) = 0;
+  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent) = 0;
   NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK) = 0;
 
-  // Return whether browse with caret is enabled or not
-  virtual PRBool GetBrowseWithCaret() = 0;
-
-  // This is called after find text or when a cursor movement key is pressed
-  // If aCanFocusDoc == PR_TRUE, the current document will be focused if caret is not on a focusable element
-  NS_IMETHOD MoveFocusToCaret(PRBool aCanFocusDoc, PRBool *aIsSelectionWithFocus) = 0;
-  NS_IMETHOD MoveCaretToFocus() = 0;
-
-  // Set focus on any element that can receive focus, or on document via aFocusContent == nsnull
-  // Must supply method that focus is being set with
-  NS_IMETHOD ChangeFocusWith(nsIContent *aFocusContent, EFocusedWithType aFocusedWith) = 0;
-
   // Access Key Registration
 
   /**
@@ -163,9 +136,6 @@ public:
                        PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
                        nsIWidget* aWidget, PRBool aLockCursor) = 0;
 
-  // Method for moving the focus forward/back.
-  NS_IMETHOD ShiftFocus(PRBool aDirection, nsIContent* aStart)=0;
-
   NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext) = 0;
   
   /**
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index dc92c5c0f52e..705b18a78175 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -928,14 +928,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       newEvent = new nsFormEvent(PR_FALSE, msg);
       break;
     }
-    case NS_FOCUS_EVENT:
-    {
-      newEvent = new nsFocusEvent(PR_FALSE, msg, nsnull);
-      NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      static_cast<nsFocusEvent*>(newEvent)->isMozWindowTakingFocus =
-        static_cast<nsFocusEvent*>(mEvent)->isMozWindowTakingFocus;
-      break;
-    }
     case NS_POPUP_EVENT:
     {
       newEvent = new nsInputEvent(PR_FALSE, msg, nsnull);
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 62a0f6bcd7cf..c1e5a37d525e 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -85,7 +85,7 @@
 #include "nsIXPConnect.h"
 #include "nsDOMCID.h"
 #include "nsIScriptObjectOwner.h" // for nsIScriptEventHandlerOwner
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMNSDocument.h"
 #include "nsContentUtils.h"
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 7c0935279dea..8fbef857aff0 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -103,7 +103,7 @@
 #include "nsIServiceManager.h"
 #include "nsIScriptSecurityManager.h"
 
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 
 #include "nsIDOMXULElement.h"
 #include "nsIDOMDocument.h"
@@ -168,19 +168,6 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 
 static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
 
-nsIContent * gLastFocusedContent = 0; // Strong reference
-nsIDocument * gLastFocusedDocument = 0; // Strong reference
-nsPresContext* gLastFocusedPresContextWeak = 0; // Weak reference
-
-enum nsTextfieldSelectModel {
-  eTextfieldSelect_unset = -1,
-  eTextfieldSelect_manual = 0,
-  eTextfieldSelect_auto = 1   // select textfields when focused with keyboard
-};
-
-// Tab focus policy (static, constant across the app):
-// Which types of elements are in the tab order?
-static PRInt8 sTextfieldSelectModel = eTextfieldSelect_unset;
 static PRBool sLeftClickOnly = PR_TRUE;
 static PRBool sKeyCausesActivation = PR_TRUE;
 static PRUint32 sESMInstanceCount = 0;
@@ -267,69 +254,6 @@ PrintDocTreeAll(nsIDocShellTreeItem* aItem)
 }
 #endif
 
-static PRUint32 gMayNeedFocusSuppression = 0;
-
-class nsSuppressUserFocus
-{
-public:
-  nsSuppressUserFocus() : mActive(PR_FALSE) {}
-  ~nsSuppressUserFocus() {
-    if (mActive) {
-      NS_ASSERTION(gMayNeedFocusSuppression,
-                   "Trying to unsuppress too much!");
-      --gMayNeedFocusSuppression;
-    }
-  }
-  void MaybeSuppress()
-  {
-    if (!mActive) {
-      mActive = PR_TRUE;
-      ++gMayNeedFocusSuppression;
-    }
-  }
-private:
-  PRBool mActive;
-};
-
-static nsIDocument*
-EventHandlingSuppressed(nsPIDOMEventTarget* aTarget)
-{
-  if (!gMayNeedFocusSuppression) {
-    return nsnull;
-  }
-  nsCOMPtr<nsINode> node = do_QueryInterface(aTarget);
-  nsCOMPtr<nsIDocument> doc;
-  if (node) {
-    doc = node->GetOwnerDoc();
-  } else {
-    nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aTarget);
-    if (window) {
-      doc = do_QueryInterface(window->GetExtantDocument());
-    }
-  }
-
-  return (doc && doc->EventHandlingSuppressed()) ? doc.get() : nsnull;
-}
-
-static void
-FireFocusOrBlurEvent(nsPIDOMEventTarget* aTarget, nsEvent* aEvent, nsPresContext* aContext)
-{
-  NS_ASSERTION(aEvent->message == NS_BLUR_CONTENT ||
-               aEvent->message == NS_FOCUS_CONTENT,
-               "Wrong event!");
-  nsIDocument* doc = EventHandlingSuppressed(aTarget);
-  if (doc) {
-    if (aContext) {
-      nsIPresShell* shell = aContext->GetPresShell();
-      if (shell) {
-        shell->NeedsFocusOrBlurAfterSuppression(aTarget, aEvent->message);
-      }
-    }
-  } else if (aTarget) {
-    nsEventDispatcher::Dispatch(aTarget, aContext, aEvent);
-  }
-}
-
 class nsUITimerCallback : public nsITimerCallback
 {
 public:
@@ -375,8 +299,6 @@ enum {
 #define NS_MODIFIER_ALT      4
 #define NS_MODIFIER_META     8
 
-static PRBool GetWindowShowCaret(nsIDocument *aDocument);
-
 static nsIDocument *
 GetDocumentFromWindow(nsIDOMWindow *aWindow)
 {
@@ -697,17 +619,12 @@ nsEventStateManager::nsEventStateManager()
     mLastDragOverFrame(nsnull),
     // init d&d gesture state machine variables
     mGestureDownPoint(0,0),
-    mCurrentFocusFrame(nsnull),
-    mCurrentTabIndex(0),
-    mLastFocusedWith(eEventFocusedByUnknown),
     mPresContext(nsnull),
     mLClickCount(0),
     mMClickCount(0),
     mRClickCount(0),
     mNormalLMouseEventInProcess(PR_FALSE),
     m_haveShutdown(PR_FALSE),
-    mBrowseWithCaret(PR_FALSE),
-    mTabbedThroughDocument(PR_FALSE),
     mLastLineScrollConsumedX(PR_FALSE),
     mLastLineScrollConsumedY(PR_FALSE)
 {
@@ -749,14 +666,8 @@ nsEventStateManager::Init()
         GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome);
       sContentAccessModifier =
         GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent);
-
-      nsIContent::sTabFocusModelAppliesToXUL =
-        nsContentUtils::GetBoolPref("accessibility.tabfocus_applies_to_xul",
-                                    nsIContent::sTabFocusModelAppliesToXUL);
     }
     prefBranch->AddObserver("accessibility.accesskeycausesactivation", this, PR_TRUE);
-    prefBranch->AddObserver("accessibility.browsewithcaret", this, PR_TRUE);
-    prefBranch->AddObserver("accessibility.tabfocus_applies_to_xul", this, PR_TRUE);
     prefBranch->AddObserver("nglayout.events.dispatchLeftClickOnly", this, PR_TRUE);
     prefBranch->AddObserver("ui.key.generalAccessKey", this, PR_TRUE);
     prefBranch->AddObserver("ui.key.chromeAccess", this, PR_TRUE);
@@ -779,15 +690,6 @@ nsEventStateManager::Init()
     prefBranch->AddObserver("dom.popup_allowed_events", this, PR_TRUE);
   }
 
-  if (sTextfieldSelectModel == eTextfieldSelect_unset) {
-    nsCOMPtr<nsILookAndFeel> lookNFeel(do_GetService(kLookAndFeelCID));
-    PRInt32 selectTextfieldsOnKeyFocus = 0;
-    lookNFeel->GetMetric(nsILookAndFeel::eMetric_SelectTextfieldsOnKeyFocus,
-                         selectTextfieldsOnKeyFocus);
-    sTextfieldSelectModel = selectTextfieldsOnKeyFocus ? eTextfieldSelect_auto:
-                                                         eTextfieldSelect_manual;
-  }
-
   return rv;
 }
 
@@ -800,8 +702,6 @@ nsEventStateManager::~nsEventStateManager()
   --sESMInstanceCount;
   if(sESMInstanceCount == 0) {
     nsMouseWheelTransaction::Shutdown();
-    NS_IF_RELEASE(gLastFocusedContent);
-    NS_IF_RELEASE(gLastFocusedDocument);
     if (gUserInteractionTimerCallback) {
       gUserInteractionTimerCallback->Notify(nsnull);
       NS_RELEASE(gUserInteractionTimerCallback);
@@ -838,8 +738,6 @@ nsEventStateManager::Shutdown()
 
   if (prefBranch) {
     prefBranch->RemoveObserver("accessibility.accesskeycausesactivation", this);
-    prefBranch->RemoveObserver("accessibility.browsewithcaret", this);
-    prefBranch->RemoveObserver("accessibility.tabfocus_applies_to_xul", this);
     prefBranch->RemoveObserver("nglayout.events.dispatchLeftClickOnly", this);
     prefBranch->RemoveObserver("ui.key.generalAccessKey", this);
     prefBranch->RemoveObserver("ui.key.chromeAccess", this);
@@ -882,12 +780,6 @@ nsEventStateManager::Observe(nsISupports *aSubject,
       sKeyCausesActivation =
         nsContentUtils::GetBoolPref("accessibility.accesskeycausesactivation",
                                     sKeyCausesActivation);
-    } else if (data.EqualsLiteral("accessibility.browsewithcaret")) {
-      ResetBrowseWithCaret();
-    } else if (data.EqualsLiteral("accessibility.tabfocus_applies_to_xul")) {
-      nsIContent::sTabFocusModelAppliesToXUL =
-        nsContentUtils::GetBoolPref("accessibility.tabfocus_applies_to_xul",
-                                    nsIContent::sTabFocusModelAppliesToXUL);
     } else if (data.EqualsLiteral("nglayout.events.dispatchLeftClickOnly")) {
       sLeftClickOnly =
         nsContentUtils::GetBoolPref("nglayout.events.dispatchLeftClickOnly",
@@ -949,12 +841,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventStateManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mHoverContent);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDragOverContent);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mURLTargetContent);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCurrentFocus);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mLastFocus);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mLastContentFocus);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstBlurEvent);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstDocumentBlurEvent);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstFocusEvent);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstMouseOverEventElement);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstMouseOutEventElement);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDocument);
@@ -973,12 +859,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsEventStateManager)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mHoverContent);
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDragOverContent);
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mURLTargetContent);
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mCurrentFocus);
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mLastFocus);
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mLastContentFocus);
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstBlurEvent);
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstDocumentBlurEvent);
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstFocusEvent);
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstMouseOverEventElement);
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstMouseOutEventElement);
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDocument);
@@ -1032,8 +912,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
 
   nsMouseWheelTransaction::OnEvent(aEvent);
 
-  nsSuppressUserFocus userFocus;
-
   switch (aEvent->message) {
   case NS_MOUSE_BUTTON_DOWN:
     switch (static_cast<nsMouseEvent*>(aEvent)->button) {
@@ -1121,452 +999,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
     // the enter/exit events before NS_DRAGDROP_DROP.
     GenerateDragDropEnterExit(aPresContext, (nsGUIEvent*)aEvent);
     break;
-  case NS_GOTFOCUS:
-    {
-#ifdef DEBUG_smaug
-      printf("nsEventStateManager::PreHandleEvent, NS_GOTFOCUS \n");
-#endif
-      userFocus.MaybeSuppress();
-      // This is called when a child widget has received focus.
-      // We need to take care of sending a blur event for the previously
-      // focused content and document, then dispatching a focus
-      // event to the target content, its document, and its window.
-
-      EnsureDocument(aPresContext);
-
-      // If the document didn't change, then the only thing that could have
-      // changed is the focused content node.  That's handled elsewhere
-      // (SetContentState and SendFocusBlur).
-
-      if (gLastFocusedDocument == mDocument)
-        break;
-
-      if (mDocument) {
-        nsIMEStateManager::OnTextStateBlur(mPresContext, mCurrentFocus);
-
-        if (gLastFocusedDocument && gLastFocusedPresContextWeak) {
-          nsCOMPtr<nsPIDOMWindow> ourWindow =
-            gLastFocusedDocument->GetWindow();
-
-          // If the focus controller is already suppressed, it means that we
-          // are in the middle of an activate sequence. In this case, we do
-          // _not_ want to fire a blur on the previously focused content, since
-          // we will be focusing it again later when we receive the NS_ACTIVATE
-          // event.  See bug 120209.
-
-          // 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();
-            if (focusController) {
-              focusController->GetSuppressFocus(&isAlreadySuppressed);
-              focusController->SetSuppressFocus(PR_TRUE,
-                                                "NS_GOTFOCUS ESM Suppression");
-            }
-          }
-
-          if (!isAlreadySuppressed) {
-
-            // Fire the blur event on the previously focused document.
-            nsEvent blurEvent(PR_TRUE, NS_BLUR_CONTENT);
-            blurEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-            FireFocusOrBlurEvent(gLastFocusedDocument, &blurEvent,
-                                 gLastFocusedPresContextWeak);
-
-            nsCOMPtr<nsIEventStateManager> esm;
-            if (!mCurrentFocus && gLastFocusedContent) {
-              // We also need to blur the previously focused content node here,
-              // if we don't have a focused content node in this document.
-              // (SendFocusBlur isn't called in this case).
-              if (gLastFocusedContent) {
-                nsCOMPtr<nsIDocument> doc = gLastFocusedContent->GetCurrentDoc();
-                if (doc) {
-                  nsIPresShell *shell = doc->GetPrimaryShell();
-                  if (shell) {
-                    nsCOMPtr<nsPresContext> oldPresContext = shell->GetPresContext();
-                    esm = oldPresContext->EventStateManager();
-                    if (esm) {
-                      esm->SetFocusedContent(gLastFocusedContent);
-                    }
-                  }
-                }
-              }
-              nsCOMPtr<nsIContent> blurContent = gLastFocusedContent;
-              blurEvent.target = nsnull;
-              FireFocusOrBlurEvent(gLastFocusedContent, &blurEvent,
-                                   gLastFocusedPresContextWeak);
-            }
-            if (ourWindow) {
-              // Clear the target so that Dispatch can set it back correctly.
-              blurEvent.target = nsnull;
-              nsCOMPtr<nsPIDOMEventTarget> win = do_QueryInterface(ourWindow);
-              FireFocusOrBlurEvent(win, &blurEvent, gLastFocusedPresContextWeak);
-            }
-
-            if (esm) {
-              esm->SetFocusedContent(nsnull);
-            }
-            NS_IF_RELEASE(gLastFocusedContent);
-          }
-
-          if (focusController)
-            focusController->SetSuppressFocus(PR_FALSE,
-                                              "NS_GOTFOCUS ESM Suppression");
-        }
-
-        // Now we should fire the focus event.  We fire it on the document,
-        // then the content node, then the window.
-
-        nsCOMPtr<nsPIDOMWindow> window(mDocument->GetWindow());
-
-        if (window) {
-          // We don't want there to be a focused content node while we're
-          // dispatching the focus event.
-
-          nsCOMPtr<nsIContent> currentFocus = mCurrentFocus;
-          // "leak" this reference, but we take it back later
-          SetFocusedContent(nsnull);
-
-          nsIMEStateManager::OnChangeFocus(mPresContext, currentFocus);
-
-          nsEvent focusEvent(PR_TRUE, NS_FOCUS_CONTENT);
-          focusEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-          if (gLastFocusedDocument != mDocument) {
-            FireFocusOrBlurEvent(mDocument, &focusEvent, aPresContext);
-            if (currentFocus && currentFocus != gLastFocusedContent) {
-              // Clear the target so that Dispatch can set it back correctly.
-              focusEvent.target = nsnull;
-              FireFocusOrBlurEvent(currentFocus, &focusEvent, aPresContext);
-            }
-          }
-
-          // Clear the target so that Dispatch can set it back correctly.
-          focusEvent.target = nsnull;
-          nsCOMPtr<nsPIDOMEventTarget> win = do_QueryInterface(window);
-          FireFocusOrBlurEvent(win, &focusEvent, aPresContext);
-
-          SetFocusedContent(currentFocus); // we kept this reference above
-          NS_IF_RELEASE(gLastFocusedContent);
-          gLastFocusedContent = mCurrentFocus;
-          NS_IF_ADDREF(gLastFocusedContent);
-
-          nsIMEStateManager::OnTextStateFocus(mPresContext, mCurrentFocus);
-        }
-
-        // Try to keep the focus controllers and the globals in synch
-        if (gLastFocusedDocument && gLastFocusedDocument != mDocument) {
-
-          nsIFocusController *lastController = nsnull;
-          nsPIDOMWindow* lastWindow = gLastFocusedDocument->GetWindow();
-          if (lastWindow)
-            lastController = lastWindow->GetRootFocusController();
-
-          nsIFocusController *nextController = nsnull;
-          nsPIDOMWindow* nextWindow = mDocument->GetWindow();
-          if (nextWindow)
-            nextController = nextWindow->GetRootFocusController();
-
-          if (lastController != nextController && lastController && nextController)
-            lastController->SetActive(PR_FALSE);
-        }
-
-        NS_IF_RELEASE(gLastFocusedDocument);
-        gLastFocusedDocument = mDocument;
-        gLastFocusedPresContextWeak = aPresContext;
-        NS_IF_ADDREF(gLastFocusedDocument);
-      }
-
-      ResetBrowseWithCaret();
-    }
-
-    break;
-
-  case NS_LOSTFOCUS:
-    {
-#ifdef DEBUG_smaug
-      printf("nsEventStateManager::PreHandleEvent, NS_LOSTFOCUS \n");
-#endif
-      userFocus.MaybeSuppress();
-      // Hide the caret if it's visible.
-      if (mPresContext) {
-        nsIPresShell *presShell = mPresContext->GetPresShell();
-        if (presShell) {
-           nsRefPtr<nsCaret> caret;
-           presShell->GetCaret(getter_AddRefs(caret));
-           if (caret) {
-             PRBool caretVisible = PR_FALSE;
-             caret->GetCaretVisible(&caretVisible);
-             if (caretVisible) {
-               SetContentCaretVisible(presShell, mCurrentFocus, PR_FALSE);
-             }
-           }
-        }
-      }
-
-      // If focus is going to another mozilla window, we wait for the
-      // focus event and fire a blur on the old focused content at that time.
-      // This allows "-moz-user-focus: ignore" to work.
-
-#if defined(XP_WIN) || defined(XP_OS2)
-      //XXXsmaug Change all the NS_LOSTFOCUS/GOTFOCUS events to use
-      //         the same event struct type!
-      if (aEvent->eventStructType == NS_FOCUS_EVENT &&
-          !static_cast<nsFocusEvent*>(aEvent)->isMozWindowTakingFocus) {
-
-        // This situation occurs when focus goes to a non-gecko child window
-        // in an embedding application.  In this case we do fire a blur
-        // immediately.
-
-        EnsureDocument(aPresContext);
-
-        if (gLastFocusedContent && !gLastFocusedContent->IsInDoc()) {
-          NS_RELEASE(gLastFocusedContent);
-        }
-
-        nsIMEStateManager::OnTextStateBlur(nsnull, nsnull);
-
-        // Now fire blurs.  We fire a blur on the focused document, element,
-        // and window.
-        nsEvent blurEvent(PR_TRUE, NS_BLUR_CONTENT);
-        blurEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-        if (gLastFocusedDocument && gLastFocusedPresContextWeak) {
-          if (gLastFocusedContent) {
-            // Retrieve this content node's pres context. it can be out of sync
-            // in the Ender widget case.
-            nsCOMPtr<nsIDocument> doc = gLastFocusedContent->GetDocument();
-            if (doc) {
-              nsIPresShell *shell = doc->GetPrimaryShell();
-              if (shell) {
-                nsCOMPtr<nsPresContext> oldPresContext =
-                  shell->GetPresContext();
-
-                nsCOMPtr<nsIEventStateManager> esm =
-                  oldPresContext->EventStateManager();
-                esm->SetFocusedContent(gLastFocusedContent);
-                FireFocusOrBlurEvent(gLastFocusedContent, &blurEvent, oldPresContext);
-                esm->SetFocusedContent(nsnull);
-                NS_IF_RELEASE(gLastFocusedContent);
-              }
-            }
-          }
-
-          // Clear our global variables before firing the event to prevent
-          // duplicate blur events (bug 112294).
-          nsCOMPtr<nsIDocument> lastFocusedDocument;
-          lastFocusedDocument.swap(gLastFocusedDocument);
-          nsCOMPtr<nsPresContext> lastFocusedPresContext = gLastFocusedPresContextWeak;
-          gLastFocusedPresContextWeak = nsnull;
-          mCurrentTarget = nsnull;
-
-          // fire blur on document and window
-          if (lastFocusedDocument) {
-            // get the window here, in case the event causes
-            // gLastFocusedDocument to change.
-
-            nsCOMPtr<nsPIDOMWindow> window(lastFocusedDocument->GetWindow());
-
-            blurEvent.target = nsnull;
-            FireFocusOrBlurEvent(lastFocusedDocument, &blurEvent, lastFocusedPresContext);
-
-            if (window) {
-              blurEvent.target = nsnull;
-              nsCOMPtr<nsPIDOMEventTarget> win = do_QueryInterface(window);
-              FireFocusOrBlurEvent(win, &blurEvent ,lastFocusedPresContext);
-            }
-          }
-        }
-      }
-#endif
-    }
-    break;
-
- case NS_ACTIVATE:
-    {
-#ifdef DEBUG_smaug
-      printf("nsEventStateManager::PreHandleEvent, NS_ACTIVATE \n");
-#endif
-      userFocus.MaybeSuppress();
-      // If we have a focus controller, and if it has a focused window and a
-      // focused element in its focus memory, then restore the focus to those
-      // objects.
-
-      EnsureDocument(aPresContext);
-
-      nsCOMPtr<nsPIDOMWindow> win = mDocument->GetWindow();
-
-      if (!win) {
-        // NS_ERROR("win is null.  this happens [often on xlib builds].  see bug #79213");
-        return NS_ERROR_NULL_POINTER;
-      }
-
-      // Hold a strong ref to the focus controller, since we need
-      // it after event dispatch.
-      nsCOMPtr<nsIFocusController> focusController =
-        win->GetRootFocusController();
-      nsCOMPtr<nsIDOMElement> focusedElement;
-      nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-      nsFocusScrollSuppressor scrollSuppressor;
-
-      if (focusController) {
-        // Obtain focus info from the focus controller.
-        focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-        focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-
-        scrollSuppressor.Init(focusController);
-        focusController->SetActive(PR_TRUE);
-      }
-
-      if (!focusedWindow)
-        focusedWindow = win;
-
-      NS_ASSERTION(focusedWindow,"check why focusedWindow is null!!!");
-
-      // Focus the DOM window.
-      if (focusedWindow) {
-        focusedWindow->Focus();
-
-        nsCOMPtr<nsIDocument> document = GetDocumentFromWindow(focusedWindow);
-
-        if (document) {
-          // Use a strong ref to make sure that the shell is alive still
-          // when calling FrameSelection().
-          nsCOMPtr<nsIPresShell> shell = document->GetPrimaryShell();
-          NS_ASSERTION(shell, "Focus events should not be getting thru when this is null!");
-          if (shell) {
-            nsPresContext* context = shell->GetPresContext();
-            nsIMEStateManager::OnActivate(context);
-            if (focusedElement) {
-              nsCOMPtr<nsIContent> focusContent = do_QueryInterface(focusedElement);
-              focusContent->SetFocus(context);
-            } else {
-              nsIMEStateManager::OnChangeFocus(context, nsnull);
-            }
-
-            // disable selection mousedown state on activation
-            nsCOMPtr<nsFrameSelection> frameSelection = shell->FrameSelection();
-            frameSelection->SetMouseDownState(PR_FALSE);
-          }
-        }
-      }
-
-      if (focusController) {
-        // Make sure the focus controller is up-to-date, since restoring
-        // focus memory may have caused focus to go elsewhere.
-
-        if (gLastFocusedDocument && gLastFocusedDocument == mDocument) {
-          nsCOMPtr<nsIDOMElement> focusElement = do_QueryInterface(mCurrentFocus);
-          focusController->SetFocusedElement(focusElement);
-        }
-
-        PRBool isSuppressed;
-        focusController->GetSuppressFocus(&isSuppressed);
-        while (isSuppressed) {
-          // Unsuppress and let the focus controller listen again.
-          focusController->SetSuppressFocus(PR_FALSE,
-                                            "Activation Suppression");
-
-          focusController->GetSuppressFocus(&isSuppressed);
-        }
-      }
-    }
-    break;
-
- case NS_DEACTIVATE:
-    {
-#ifdef DEBUG_smaug
-      printf("nsEventStateManager::PreHandleEvent, NS_DEACTIVATE \n");
-#endif
-      userFocus.MaybeSuppress();
-      EnsureDocument(aPresContext);
-
-      nsIMEStateManager::OnDeactivate(aPresContext);
-
-      nsCOMPtr<nsPIDOMWindow> ourWindow(mDocument->GetWindow());
-
-      // Suppress the focus controller for the duration of the
-      // de-activation.  This will cause it to remember the last
-      // focused sub-window and sub-element for this top-level
-      // window.
-
-      nsCOMPtr<nsIFocusController> focusController =
-        GetFocusControllerForDocument(mDocument);
-
-      if (focusController)
-        focusController->SetSuppressFocus(PR_TRUE, "Deactivate Suppression");
-
-      nsIMEStateManager::OnTextStateBlur(nsnull, nsnull);
-
-      // Now fire blurs.  Blur the content, then the document, then the window.
-
-      if (gLastFocusedDocument && gLastFocusedDocument == mDocument &&
-          gLastFocusedDocument != mFirstDocumentBlurEvent) {
-
-        PRBool clearFirstDocumentBlurEvent = PR_FALSE;
-        if (!mFirstDocumentBlurEvent) {
-          mFirstDocumentBlurEvent = gLastFocusedDocument;
-          clearFirstDocumentBlurEvent = PR_TRUE;
-        }
-
-        nsEvent blurEvent(PR_TRUE, NS_BLUR_CONTENT);
-        blurEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-        if (gLastFocusedContent) {
-          nsIPresShell *shell = gLastFocusedDocument->GetPrimaryShell();
-          if (shell) {
-            nsCOMPtr<nsPresContext> oldPresContext = shell->GetPresContext();
-
-            nsCOMPtr<nsIDOMElement> focusedElement;
-            if (focusController)
-              focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-
-            nsCOMPtr<nsIEventStateManager> esm;
-            esm = oldPresContext->EventStateManager();
-            esm->SetFocusedContent(gLastFocusedContent);
-
-            nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
-            if (focusedContent) {
-              // Blur the element.
-              FireFocusOrBlurEvent(focusedContent, &blurEvent, oldPresContext);
-            }
-
-            esm->SetFocusedContent(nsnull);
-            NS_IF_RELEASE(gLastFocusedContent);
-          }
-        }
-
-        // Clear our global variables before firing the event to prevent
-        // duplicate blur events (bug 112294).
-        mCurrentTarget = nsnull;
-        NS_IF_RELEASE(gLastFocusedDocument);
-        gLastFocusedPresContextWeak = nsnull;
-
-        // fire blur on document and window
-        blurEvent.target = nsnull;
-        FireFocusOrBlurEvent(mDocument, &blurEvent, aPresContext);
-
-        if (ourWindow) {
-          blurEvent.target = nsnull;
-          nsCOMPtr<nsPIDOMEventTarget> win = do_QueryInterface(ourWindow);
-          FireFocusOrBlurEvent(win, &blurEvent, aPresContext);
-        }
-        if (clearFirstDocumentBlurEvent) {
-          mFirstDocumentBlurEvent = nsnull;
-        }
-      }
-
-      if (focusController) {
-        focusController->SetActive(PR_FALSE);
-        focusController->SetSuppressFocus(PR_FALSE, "Deactivate Suppression");
-      }
-    }
-
-    break;
 
   case NS_KEY_PRESS:
     {
@@ -1592,16 +1024,16 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
   case NS_KEY_DOWN:
   case NS_KEY_UP:
     {
-      if (mCurrentFocus) {
-        mCurrentTargetContent = mCurrentFocus;
-      }
+      nsIContent* content = GetFocusedContent();
+      if (content)
+        mCurrentTargetContent = content;
     }
     break;
   case NS_MOUSE_SCROLL:
     {
-      if (mCurrentFocus) {
-        mCurrentTargetContent = mCurrentFocus;
-      }
+      nsIContent* content = GetFocusedContent();
+      if (content)
+        mCurrentTargetContent = content;
 
       nsMouseScrollEvent* msEvent = static_cast<nsMouseScrollEvent*>(aEvent);
 
@@ -1659,9 +1091,9 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
     break;
   case NS_MOUSE_PIXEL_SCROLL:
     {
-      if (mCurrentFocus) {
-        mCurrentTargetContent = mCurrentFocus;
-      }
+      nsIContent* content = GetFocusedContent();
+      if (content)
+        mCurrentTargetContent = content;
 
       nsMouseScrollEvent *msEvent = static_cast<nsMouseScrollEvent*>(aEvent);
 
@@ -1845,10 +1277,11 @@ nsEventStateManager::ExecuteAccessKey(nsTArray<PRUint32>& aAccessCharCodes,
                                       PRBool aIsTrustedEvent)
 {
   PRInt32 count, start = -1;
-  if (mCurrentFocus) {
-    start = mAccessKeys.IndexOf(mCurrentFocus);
-    if (start == -1 && mCurrentFocus->GetBindingParent())
-      start = mAccessKeys.IndexOf(mCurrentFocus->GetBindingParent());
+  nsIContent* focusedContent = GetFocusedContent();
+  if (focusedContent) {
+    start = mAccessKeys.IndexOf(focusedContent);
+    if (start == -1 && focusedContent->GetBindingParent())
+      start = mAccessKeys.IndexOf(focusedContent->GetBindingParent());
   }
   nsIContent *content;
   nsIFrame *frame;
@@ -1870,8 +1303,13 @@ nsEventStateManager::ExecuteAccessKey(nsTArray<PRUint32>& aAccessCharCodes,
         }
         if (shouldActivate)
           content->PerformAccesskey(shouldActivate, aIsTrustedEvent);
-        else if (frame && frame->IsFocusable())
-          ChangeFocusWith(content, eEventFocusedByKey);
+        else {
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          if (fm) {
+            nsCOMPtr<nsIDOMElement> element = do_QueryInterface(content);
+            fm->SetFocus(element, nsIFocusManager::FLAG_BYKEY);
+          }
+        }
         return PR_TRUE;
       }
     }
@@ -2648,9 +2086,13 @@ nsEventStateManager::GetMarkupDocumentViewer(nsIMarkupDocumentViewer** aMv)
 {
   *aMv = nsnull;
 
-  if(!gLastFocusedDocument) return NS_ERROR_FAILURE;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if(!fm) return NS_ERROR_FAILURE;
 
-  nsPIDOMWindow* ourWindow = gLastFocusedDocument->GetWindow();
+  nsCOMPtr<nsIDOMWindow> focusedWindow;
+  fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
+
+  nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(focusedWindow);
   if(!ourWindow) return NS_ERROR_FAILURE;
 
   nsIDOMWindowInternal *rootWindow = ourWindow->GetPrivateRoot();
@@ -2820,7 +2262,7 @@ nsEventStateManager::SendLineScrollEvent(nsIFrame* aTargetFrame,
 {
   nsCOMPtr<nsIContent> targetContent = aTargetFrame->GetContent();
   if (!targetContent)
-    GetFocusedContent(getter_AddRefs(targetContent));
+    targetContent = GetFocusedContent();
   if (!targetContent)
     return;
 
@@ -2850,10 +2292,11 @@ nsEventStateManager::SendPixelScrollEvent(nsIFrame* aTargetFrame,
                                           nsEventStatus* aStatus)
 {
   nsCOMPtr<nsIContent> targetContent = aTargetFrame->GetContent();
-  if (!targetContent)
-    GetFocusedContent(getter_AddRefs(targetContent));
-  if (!targetContent)
-    return;
+  if (!targetContent) {
+    targetContent = GetFocusedContent();
+    if (!targetContent)
+      return;
+  }
 
   while (targetContent->IsNodeOfType(nsINode::eTEXT)) {
     targetContent = targetContent->GetParent();
@@ -3140,19 +2583,18 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
 
       if (nsEventStatus_eConsumeNoDefault != *aStatus) {
         nsCOMPtr<nsIContent> newFocus;
+        nsIContent* activeContent = nsnull;
         PRBool suppressBlur = PR_FALSE;
         if (mCurrentTarget) {
           mCurrentTarget->GetContentForEvent(mPresContext, aEvent, getter_AddRefs(newFocus));
           const nsStyleUserInterface* ui = mCurrentTarget->GetStyleUserInterface();
           suppressBlur = (ui->mUserFocus == NS_STYLE_USER_FOCUS_IGNORE);
+          activeContent = mCurrentTarget->GetContent();
         }
 
+        // When the mouse is pressed, the default action is to focus the
+        // target. Look for the nearest enclosing focusable frame.
         nsIFrame* currFrame = mCurrentTarget;
-        nsIContent* activeContent = nsnull;
-        if (mCurrentTarget)
-          activeContent = mCurrentTarget->GetContent();
-
-        // Look for the nearest enclosing focusable frame.
         while (currFrame) {
           // If the mousedown happened inside a popup, don't
           // try to set focus on one of its containing elements
@@ -3172,10 +2614,34 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
           currFrame = currFrame->GetParent();
         }
 
-        if (newFocus && currFrame)
-          ChangeFocusWith(newFocus, eEventFocusedByMouse);
-        else if (!suppressBlur) {
-          SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
+        nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+        if (fm) {
+          // if something was found to focus, focus it. Otherwise, if the
+          // element that was clicked doesn't have -moz-user-focus: ignore,
+          // clear the existing focus. For -moz-user-focus: ignore, the focus
+          // is just left as is.
+          // Another effect of mouse clicking, handled in nsSelection, is that
+          // it should update the caret position to where the mouse was
+          // clicked. Because the focus is cleared when clicking on a
+          // non-focusable node, the next press of the tab key will cause
+          // focus to be shifted from the caret position instead of the root.
+          if (newFocus && currFrame) {
+            // use the mouse flag and the noscroll flag so that the content
+            // doesn't unexpectedly scroll when clicking an element that is
+            // only hald visible
+            nsCOMPtr<nsIDOMElement> newFocusElement = do_QueryInterface(newFocus);
+            fm->SetFocus(newFocusElement, nsIFocusManager::FLAG_BYMOUSE |
+                                          nsIFocusManager::FLAG_NOSCROLL);
+          }
+          else if (!suppressBlur) {
+            // clear the focus within the frame and then set it as the
+            // focused frame
+            EnsureDocument(mPresContext);
+            if (mDocument) {
+              fm->ClearFocus(mDocument->GetWindow());
+              fm->SetFocusedWindow(mDocument->GetWindow());
+            }
+          }
         }
 
         // The rest is left button-specific.
@@ -3452,18 +2918,23 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
       if (!keyEvent->isAlt) {
         switch(keyEvent->keyCode) {
           case NS_VK_TAB:
-            if (!((nsInputEvent*)aEvent)->isControl) {
-              //Shift focus forward or back depending on shift key
-              ShiftFocus(!((nsInputEvent*)aEvent)->isShift);
-            } else {
-              ShiftFocusByDoc(!((nsInputEvent*)aEvent)->isShift);
-            }
-            *aStatus = nsEventStatus_eConsumeNoDefault;
-            break;
-
           case NS_VK_F6:
-            //Shift focus forward or back depending on shift key
-            ShiftFocusByDoc(!((nsInputEvent*)aEvent)->isShift);
+            EnsureDocument(mPresContext);
+            nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+            if (fm && mDocument) {
+              // Shift focus forward or back depending on shift key
+              PRBool isDocMove = ((nsInputEvent*)aEvent)->isControl ||
+                                 (keyEvent->keyCode == NS_VK_F6);
+              PRUint32 dir = ((nsInputEvent*)aEvent)->isShift ?
+                             (isDocMove ? nsIFocusManager::MOVEFOCUS_BACKWARDDOC :
+                                          nsIFocusManager::MOVEFOCUS_BACKWARD) :
+                             (isDocMove ? nsIFocusManager::MOVEFOCUS_FORWARDDOC :
+                                          nsIFocusManager::MOVEFOCUS_FORWARD);
+              nsCOMPtr<nsIDOMElement> result;
+              fm->MoveFocus(mDocument->GetWindow(), nsnull, dir,
+                            nsIFocusManager::FLAG_BYKEY,
+                            getter_AddRefs(result));
+            }
             *aStatus = nsEventStatus_eConsumeNoDefault;
             break;
 
@@ -3471,7 +2942,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
 #if NON_KEYBINDING
           case NS_VK_PAGE_DOWN:
           case NS_VK_PAGE_UP:
-            if (!mCurrentFocus) {
+            if (!focusedContent) {
               nsIScrollableView* sv = nsLayoutUtils::GetNearestScrollingView(aView, nsLayoutUtils::eVertical);
               if (sv) {
                 nsKeyEvent * keyEvent = (nsKeyEvent *)aEvent;
@@ -3482,7 +2953,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
             break;
           case NS_VK_HOME:
           case NS_VK_END:
-            if (!mCurrentFocus) {
+            if (!focusedContent) {
               nsIScrollableView* sv = nsLayoutUtils::GetNearestScrollingView(aView, nsLayoutUtils::eVertical);
               if (sv) {
                 nsKeyEvent * keyEvent = (nsKeyEvent *)aEvent;
@@ -3492,7 +2963,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
             break;
           case NS_VK_DOWN:
           case NS_VK_UP:
-            if (!mCurrentFocus) {
+            if (!focusedContent) {
               nsIScrollableView* sv = nsLayoutUtils::GetNearestScrollingView(aView, nsLayoutUtils::eVertical);
               if (sv) {
                 nsKeyEvent * keyEvent = (nsKeyEvent *)aEvent;
@@ -3512,7 +2983,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
             break;
           case NS_VK_LEFT:
           case NS_VK_RIGHT:
-            if (!mCurrentFocus) {
+            if (!focusedContent) {
               nsIScrollableView* sv = nsLayoutUtils::GetNearestScrollingView(aView, nsLayoutUtils::eHorizontal);
               if (sv) {
                 nsKeyEvent * keyEvent = (nsKeyEvent *)aEvent;
@@ -3535,7 +3006,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
           //Spacebar
             nsKeyEvent * keyEvent = (nsKeyEvent *)aEvent;
             if (keyEvent->charCode == 0x20) {
-              if (!mCurrentFocus) {
+              if (!focusedContent) {
                 nsIScrollableView* sv = nsLayoutUtils::GetNearestScrollingView(aView, nsLayoutUtils::eVertical);
                 if (sv) {
                   sv->ScrollByPages(0, 1, NS_VMREFRESH_SMOOTHSCROLL);
@@ -3576,16 +3047,6 @@ nsEventStateManager::NotifyDestroyPresContext(nsPresContext* aPresContext)
 NS_IMETHODIMP
 nsEventStateManager::SetPresContext(nsPresContext* aPresContext)
 {
-  if (aPresContext == nsnull) {
-    // XXX should we move this block to |NotifyDestroyPresContext|?
-    // A pres context is going away. Make sure we do cleanup.
-    if (mPresContext == gLastFocusedPresContextWeak) {
-      gLastFocusedPresContextWeak = nsnull;
-      NS_IF_RELEASE(gLastFocusedDocument);
-      NS_IF_RELEASE(gLastFocusedContent);
-    }
-  }
-
   mPresContext = aPresContext;
   return NS_OK;
 }
@@ -4256,625 +3717,6 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
   return ret;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::ChangeFocusWith(nsIContent* aFocusContent,
-                                     EFocusedWithType aFocusedWith)
-{
-  mLastFocusedWith = aFocusedWith;
-  if (!aFocusContent) {
-    SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-    return NS_OK;
-  }
-
-  // Get focus controller.
-  EnsureDocument(mPresContext);
-  nsCOMPtr<nsIFocusController> focusController = nsnull;
-  nsCOMPtr<nsPIDOMWindow> window(mDocument->GetWindow());
-  if (window)
-    focusController = window->GetRootFocusController();
-
-  // If this is called from mouse event, we lock to scroll.
-  // Because the part of element is always in view. See bug 105894.
-  nsFocusScrollSuppressor scrollSuppressor;
-  if (aFocusedWith == eEventFocusedByMouse) {
-    scrollSuppressor.Init(focusController);
-  }
-
-  aFocusContent->SetFocus(mPresContext);
-  if (aFocusedWith != eEventFocusedByMouse) {
-    MoveCaretToFocus();
-    // Select text fields when focused via keyboard (tab or accesskey)
-    if (sTextfieldSelectModel == eTextfieldSelect_auto &&
-        mCurrentFocus &&
-        mCurrentFocus->IsNodeOfType(nsINode::eHTML_FORM_CONTROL)) {
-      nsCOMPtr<nsIFormControl> formControl(do_QueryInterface(mCurrentFocus));
-      PRInt32 controlType = formControl->GetType();
-      if (controlType == NS_FORM_INPUT_TEXT ||
-          controlType == NS_FORM_INPUT_PASSWORD) {
-        nsCOMPtr<nsIDOMHTMLInputElement> inputElement =
-          do_QueryInterface(mCurrentFocus);
-        if (inputElement) {
-          inputElement->Select();
-        }
-      }
-    }
-  }
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsEventStateManager::ShiftFocus(PRBool aForward, nsIContent* aStart)
-{
-  nsCOMPtr<nsILookAndFeel> lookNFeel(do_GetService(kLookAndFeelCID));
-  lookNFeel->GetMetric(nsILookAndFeel::eMetric_TabFocusModel,
-                       nsIContent::sTabFocusModel);
-
-  // We use mTabbedThroughDocument to indicate that we have passed
-  // the end (or beginning) of the document we started tabbing from,
-  // without finding anything else to focus.  If we pass the end of
-  // the same document again (and the flag is set), we know that there
-  // is no focusable content anywhere in the tree, and should stop.
-
-  mTabbedThroughDocument = PR_FALSE;
-  return ShiftFocusInternal(aForward, aStart);
-}
-
-nsresult
-nsEventStateManager::ShiftFocusInternal(PRBool aForward, nsIContent* aStart)
-{
-#ifdef DEBUG_DOCSHELL_FOCUS
-  printf("[%p] ShiftFocusInternal: aForward=%d, aStart=%p, mCurrentFocus=%p\n",
-         static_cast<void*>(this), aForward, static_cast<void*>(aStart),
-         static_cast<void*>(mCurrentFocus.get()));
-#endif
-  NS_ASSERTION(mPresContext, "no pres context");
-  EnsureDocument(mPresContext);
-  NS_ASSERTION(mDocument, "no document");
-
-  nsCOMPtr<nsIContent> rootContent = mDocument->GetRootContent();
-
-  nsCOMPtr<nsISupports> pcContainer = mPresContext->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(pcContainer));
-  NS_ENSURE_STATE(docShell);
-  PRBool docHasFocus = PR_FALSE;
-
-  // ignoreTabIndex allows the user to tab to the next link after clicking before it link in the page
-  // or using find text to get to the link. Without ignoreTabIndex in those cases, pages that
-  // use tabindex would still enforce that order in those situations.
-  PRBool ignoreTabIndex = PR_FALSE;
-
-  if (!aStart && !mCurrentFocus) {
-    // mCurrentFocus is ambiguous for determining whether
-    // we're in document-focus mode, because it's nulled out
-    // when the document is blurred, and it's also nulled out
-    // when the document/canvas has focus.
-    //
-    // So, use the docshell focus state to disambiguate.
-
-    docShell->GetHasFocus(&docHasFocus);
-  }
-
-  nsIFrame* selectionFrame = nsnull;
-  nsIFrame* curFocusFrame = nsnull;   // This will hold the location we're moving away from
-
-  // If in content, navigate from last cursor position rather than last focus
-  // If we're in UI, selection location will return null
-  nsCOMPtr<nsIPresShell> presShell = mPresContext->PresShell();
-
-  // We might use the selection position, rather than mCurrentFocus, as our position to shift focus from
-  PRInt32 itemType;
-  nsCOMPtr<nsIDocShellTreeItem> shellItem(do_QueryInterface(docShell));
-  shellItem->GetItemType(&itemType);
-
-  // Tab from the selection if it exists, but not if we're in chrome or an explicit starting
-  // point was given.
-  if (!aStart && itemType != nsIDocShellTreeItem::typeChrome) {
-    // We're going to tab from the selection position
-    if (!mCurrentFocus || (mLastFocusedWith != eEventFocusedByMouse && mCurrentFocus->Tag() != nsGkAtoms::area)) {
-      nsCOMPtr<nsIContent> selectionContent, endSelectionContent;  // We won't be using this, need arg for method call
-      PRUint32 selectionOffset; // We won't be using this either, need arg for method call
-      GetDocSelectionLocation(getter_AddRefs(selectionContent), getter_AddRefs(endSelectionContent), &selectionFrame, &selectionOffset);
-      if (selectionContent == rootContent)  // If selection on rootContent, same as null -- we have no selection yet
-        selectionFrame = nsnull;
-      // Don't start from the selection if the selection is in a contentEditable
-      // region.
-      nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(mDocument);
-      if (htmlDoc &&
-          htmlDoc->GetEditingState() == nsIHTMLDocument::eContentEditable &&
-          selectionContent && selectionContent->HasFlag(NODE_IS_EDITABLE))
-        selectionFrame = nsnull;
-      // Only use tabindex if selection is synchronized with focus
-      // That way, if the user clicks in content, or does a find text that lands between focusable elements,
-      // they can then tab relative to that selection
-      if (selectionFrame) {
-        PRBool selectionWithFocus;
-        MoveFocusToCaret(PR_FALSE, &selectionWithFocus);
-        ignoreTabIndex = !selectionWithFocus;
-        // Refresh |selectionFrame| since MoveFocusToCaret() could have
-        // destroyed it. (bug 308086)
-        GetDocSelectionLocation(getter_AddRefs(selectionContent),
-                                getter_AddRefs(endSelectionContent),
-                                &selectionFrame, &selectionOffset);
-      }
-    }
-  }
-
-  nsIContent *startContent = nsnull;
-
-  if (aStart) {
-    curFocusFrame = presShell->GetPrimaryFrameFor(aStart);
-
-    // If there is no frame, we can't navigate from this content node, and we
-    // fall back to navigating from the document root.
-    if (curFocusFrame)
-      startContent = aStart;
-  } else if (selectionFrame) {
-    // We moved focus to the caret location above, so mCurrentFocus
-    // reflects the starting content node.
-    startContent = mCurrentFocus;
-    curFocusFrame = selectionFrame;
-  } else if (!docHasFocus) {
-    startContent = mCurrentFocus;
-    GetFocusedFrame(&curFocusFrame);
-  }
-
-  if (aStart) {
-    if (aStart->HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex)) {
-      aStart->IsFocusable(&mCurrentTabIndex);
-    } else {
-      ignoreTabIndex = PR_TRUE; // ignore current tabindex, bug 81481
-    }
-  } else if (!mCurrentFocus) {  // Get tabindex ready
-    if (aForward) {
-      mCurrentTabIndex = docHasFocus && selectionFrame ? 0 : 1;
-    } else if (!docHasFocus) {
-      mCurrentTabIndex = 0;
-    } else if (selectionFrame) {
-      mCurrentTabIndex = 1;   // will keep it from wrapping around to end
-    }
-  }
-
-  // when a popup is open, we want to ensure that tab navigation occurs only
-  // within the most recently opened panel. If a popup is open, its frame will
-  // be stored in popupFrame.
-  nsIFrame* popupFrame = nsnull;
-  if (curFocusFrame) {
-    // check if the focus is currently inside a popup. Elements such as the
-    // autocomplete widget use the noautofocus attribute to allow the focus to
-    // remain outside the popup when it is opened.
-    popupFrame = nsLayoutUtils::GetClosestFrameOfType(curFocusFrame,
-                                                      nsGkAtoms::menuPopupFrame);
-  }
-#ifdef MOZ_XUL
-  else {
-    // if there is no focus, yet a panel is open, focus the
-    // first item in the popup
-    nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
-    if (pm) {
-      popupFrame = pm->GetTopPopup(ePopupTypePanel);
-    }
-  }
-#endif
-
-  if (popupFrame) {
-    // Don't navigate outside of a popup, so pretend that the
-    // root content is the popup itself
-    rootContent = popupFrame->GetContent();
-    NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");
-  }
-
-  nsCOMPtr<nsIContent> nextFocus;
-  nsIFrame* nextFocusFrame;
-  if (aForward || !docHasFocus || selectionFrame)
-    GetNextTabbableContent(rootContent, startContent, curFocusFrame,
-                           aForward, ignoreTabIndex || mCurrentTabIndex < 0,
-                           getter_AddRefs(nextFocus), &nextFocusFrame);
-
-  if (popupFrame && !nextFocus) {
-    // if no content was found to focus, yet we are inside a popup, try again
-    // from the beginning or end of the popup. Set the current tab index to
-    // the beginning or end.
-    mCurrentTabIndex = aForward ? 1 : 0;
-    GetNextTabbableContent(rootContent, rootContent, nsnull,
-                           aForward, ignoreTabIndex,
-                           getter_AddRefs(nextFocus), &nextFocusFrame);
-    // if the same node was found, don't change the focus
-    if (startContent == nextFocus) {
-      nextFocus = nsnull;
-    }
-  }
-
-  // Clear out mCurrentTabIndex. It has a garbage value because of GetNextTabbableContent()'s side effects
-  // It will be set correctly when focus is changed via ChangeFocusWith()
-  mCurrentTabIndex = 0;
-
-  if (nextFocus) {
-    // Check to see if the next focused element has a subshell.
-    // This is the case for an IFRAME or FRAME element.  If it
-    // does, we send focus into the subshell.
-
-    nsCOMPtr<nsIDocShell> sub_shell;
-    nsCOMPtr<nsIDocument> doc = nextFocus->GetDocument();
-
-    if (doc) {
-      nsIDocument *sub_doc = doc->GetSubDocumentFor(nextFocus);
-
-      if (sub_doc && !sub_doc->EventHandlingSuppressed()) {
-        nsCOMPtr<nsISupports> container = sub_doc->GetContainer();
-        sub_shell = do_QueryInterface(container);
-      }
-    }
-
-    if (sub_shell) {
-      // Make sure to scroll before possibly dispatching focus/blur events.
-      presShell->ScrollContentIntoView(nextFocus,
-                                       NS_PRESSHELL_SCROLL_ANYWHERE,
-                                       NS_PRESSHELL_SCROLL_ANYWHERE);
-
-      SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-
-      // if we are in the middle of tabbing into
-      // sub_shell, bail out, to avoid recursion
-      // see bug #195011 and bug #137191
-      if (mTabbingFromDocShells.IndexOf(sub_shell) != -1)
-        return NS_OK;
-
-      TabIntoDocument(sub_shell, aForward);
-    } else {
-      // there is no subshell, so just focus nextFocus
-#ifdef DEBUG_DOCSHELL_FOCUS
-      printf("focusing next focusable content: %p\n",
-             static_cast<void*>(nextFocus.get()));
-#endif
-      mCurrentTarget = nextFocusFrame;
-
-      nsCOMPtr<nsIContent> oldFocus(mCurrentFocus);
-      ChangeFocusWith(nextFocus, eEventFocusedByKey);
-      if (!mCurrentFocus && oldFocus) {
-        // ChangeFocusWith failed to move focus to nextFocus because a blur handler
-        // made it unfocusable. (bug #118685)
-        // Try again unless it's from the same point, bug 232368.
-        if (oldFocus != aStart && oldFocus->GetDocument()) {
-          mCurrentTarget = nsnull;
-          return ShiftFocusInternal(aForward, oldFocus);
-        } else {
-          return NS_OK;
-        }
-      } else {
-        if (mCurrentFocus != nextFocus) {
-          // A focus or blur handler switched the focus from one of
-          // its focus/blur/change handlers, don't mess with what the
-          // page wanted...
-
-          return NS_OK;
-        }
-        nsIFrame* focusedFrame = nsnull;
-        GetFocusedFrame(&focusedFrame);
-        mCurrentTarget = focusedFrame;
-      }
-
-      // It's possible that the act of removing focus from our previously
-      // focused element caused nextFocus to be removed from the document.
-      // In this case, we can restart the frame traversal from our previously
-      // focused content.
-
-      if (oldFocus && doc != nextFocus->GetDocument()) {
-        mCurrentTarget = nsnull;
-        return ShiftFocusInternal(aForward, oldFocus);
-      }
-
-      if (!docHasFocus)
-        docShell->SetHasFocus(PR_TRUE);
-    }
-  } else {
-
-    // If we're going backwards past the first content,
-    // focus the document.
-
-    PRBool focusDocument;
-    if (itemType == nsIDocShellTreeItem::typeChrome)
-      focusDocument = PR_FALSE;
-    else {
-      // Check for a frameset document
-      focusDocument = !(IsFrameSetDoc(docShell));
-    }
-
-    if (!aForward && !docHasFocus && focusDocument) {
-#ifdef DEBUG_DOCSHELL_FOCUS
-      printf("Focusing document\n");
-#endif
-      SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-      docShell->SetHasFocus(PR_TRUE);
-      docShell->SetCanvasHasFocus(PR_TRUE);
-      // Next time forward we start at the beginning of the document
-      // Next time backward we go to URL bar
-      // We need to move the caret to the document root, so that we don't
-      // tab from the most recently focused element next time around
-      SetFocusedContent(rootContent);
-      MoveCaretToFocus();
-      SetFocusedContent(nsnull);
-
-    } else {
-      // If there's nothing left to focus in this document,
-      // pop out to our parent document, and have it shift focus
-      // in the same direction starting at the content element
-      // corresponding to our docshell.
-      // Guard against infinite recursion (see explanation in ShiftFocus)
-
-      if (mTabbedThroughDocument)
-        return NS_OK;
-
-      SetFocusedContent(rootContent);
-      mCurrentTabIndex = 0;
-      MoveCaretToFocus();
-      SetFocusedContent(nsnull);
-
-      mTabbedThroughDocument = PR_TRUE;
-
-      nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(pcContainer);
-      nsCOMPtr<nsIDocShellTreeItem> treeParent;
-      treeItem->GetParent(getter_AddRefs(treeParent));
-      if (treeParent) {
-        nsCOMPtr<nsIDocShell> parentDS = do_QueryInterface(treeParent);
-        if (parentDS) {
-          nsCOMPtr<nsIPresShell> parentShell;
-          parentDS->GetPresShell(getter_AddRefs(parentShell));
-
-          nsCOMPtr<nsIDocument> parent_doc = parentShell->GetDocument();
-          nsCOMPtr<nsIContent> docContent = parent_doc->FindContentForSubDocument(mDocument);
-
-          nsCOMPtr<nsPresContext> parentPC = parentShell->GetPresContext();
-          nsIEventStateManager *parentESM = parentPC->EventStateManager();
-
-          SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-
-          nsCOMPtr<nsISupports> parentContainer = parentPC->GetContainer();
-          if (parentContainer && docContent && docContent->GetCurrentDoc() == parent_doc) {
-#ifdef DEBUG_DOCSHELL_FOCUS
-            printf("popping out focus to parent docshell\n");
-#endif
-            parentESM->MoveCaretToFocus();
-            parentESM->ShiftFocus(aForward, docContent);
-#ifdef DEBUG_DOCSHELL_FOCUS
-          } else {
-            printf("can't pop out focus to parent docshell\n"); // bug 308025
-#endif
-          }
-        }
-      } else {
-        PRBool tookFocus = PR_FALSE;
-        nsCOMPtr<nsIDocShell> subShell = do_QueryInterface(pcContainer);
-        if (subShell) {
-          subShell->TabToTreeOwner(aForward, &tookFocus);
-        }
-
-#ifdef DEBUG_DOCSHEL_FOCUS
-        printf("offered focus to tree owner, tookFocus=%d\n",
-               tookFocus);
-#endif
-
-        if (tookFocus) {
-          SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-          docShell->SetHasFocus(PR_FALSE);
-        } else {
-          // there is nowhere else to send the focus, so
-          // refocus ourself.
-          // Next time forward we start at the beginning of the document
-
-#ifdef DEBUG_DOCSHELL_FOCUS
-          printf("wrapping around within this document\n");
-#endif
-
-          SetFocusedContent(nsnull);
-          docShell->SetHasFocus(PR_FALSE);
-          ShiftFocusInternal(aForward);
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsEventStateManager::GetNextTabbableContent(nsIContent* aRootContent,
-                                            nsIContent* aStartContent,
-                                            nsIFrame* aStartFrame,
-                                            PRBool forward,
-                                            PRBool aIgnoreTabIndex,
-                                            nsIContent** aResultNode,
-                                            nsIFrame** aResultFrame)
-{
-  *aResultNode = nsnull;
-  *aResultFrame = nsnull;
-
-  nsresult rv;
-  nsCOMPtr<nsIFrameTraversal> trav(do_CreateInstance(kFrameTraversalCID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-
-  // --- Get frame to start with ---
-  if (!aStartFrame) {
-    // No frame means we need to start with the root content again.
-    NS_ENSURE_TRUE(mPresContext, NS_ERROR_FAILURE);
-    nsIPresShell *presShell = mPresContext->GetPresShell();
-    NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
-    aStartFrame = presShell->GetPrimaryFrameFor(aRootContent);
-    NS_ENSURE_TRUE(aStartFrame, NS_ERROR_FAILURE);
-    rv = trav->NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                mPresContext, aStartFrame,
-                                ePreOrder,
-                                PR_FALSE, // aVisual
-                                PR_FALSE, // aLockInScrollView
-                                PR_TRUE   // aFollowOOFs
-                                );
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!forward) {
-      frameTraversal->Last();
-    }
-  }
-  else {
-    rv = trav->NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                 mPresContext, aStartFrame,
-                                 ePreOrder,
-                                 PR_FALSE, // aVisual
-                                 PR_FALSE, // aLockInScrollView
-                                 PR_TRUE   // aFollowOOFs
-                                 );
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!aStartContent || aStartContent->Tag() != nsGkAtoms::area ||
-        !aStartContent->IsNodeOfType(nsINode::eHTML)) {
-      // Need to do special check in case we're in an imagemap which has multiple
-      // content per frame, so don't skip over the starting frame.
-      if (forward)
-        frameTraversal->Next();
-      else
-        frameTraversal->Prev();
-    }
-  }
-
-  // -- Walk frames to find something tabbable matching mCurrentTabIndex --
-  while (1) {
-    *aResultFrame = frameTraversal->CurrentItem();
-    if (!*aResultFrame) {
-      break;
-    }
-
-    // TabIndex not set defaults to 0 for form elements, anchors and other
-    // elements that are normally focusable. Tabindex defaults to -1
-    // for elements that are not normally focusable.
-    // The returned computed tabindex from IsFocusable() is as follows:
-    //          < 0 not tabbable at all
-    //          == 0 in normal tab order (last after positive tabindex'd items)
-    //          > 0 can be tabbed to in the order specified by this value
-    PRInt32 tabIndex;
-    nsIContent* currentContent = (*aResultFrame)->GetContent();
-    (*aResultFrame)->IsFocusable(&tabIndex);
-    if (tabIndex >= 0) {
-      if (currentContent->Tag() == nsGkAtoms::img &&
-          currentContent->HasAttr(kNameSpaceID_None, nsGkAtoms::usemap)) {
-        // Must be an image w/ a map -- it's tabbable but no tabindex is specified
-        // Special case for image maps: they don't get walked by nsIFrameTraversal
-        nsIContent *areaContent = GetNextTabbableMapArea(forward, currentContent);
-        if (areaContent) {
-          NS_ADDREF(*aResultNode = areaContent);
-          return NS_OK;
-        }
-      }
-      else if ((aIgnoreTabIndex || mCurrentTabIndex == tabIndex) &&
-          currentContent != aStartContent) {
-        NS_ADDREF(*aResultNode = currentContent);
-        return NS_OK;
-      }
-    }
-    if (forward)
-      frameTraversal->Next();
-    else
-      frameTraversal->Prev();
-  }
-
-  // -- Reached end or beginning of document --
-
-  // If already at lowest priority tab (0), end search completely.
-  // A bit counterintuitive but true, tabindex order goes 1, 2, ... 32767, 0
-  if (mCurrentTabIndex == (forward? 0: 1)) {
-    return NS_OK;
-  }
-
-  // else continue looking for next highest priority tabindex
-  mCurrentTabIndex = GetNextTabIndex(aRootContent, forward);
-  return GetNextTabbableContent(aRootContent, aStartContent, nsnull, forward,
-                                aIgnoreTabIndex, aResultNode, aResultFrame);
-}
-
-nsIContent*
-nsEventStateManager::GetNextTabbableMapArea(PRBool aForward,
-                                            nsIContent *aImageContent)
-{
-  nsAutoString useMap;
-  aImageContent->GetAttr(kNameSpaceID_None, nsGkAtoms::usemap, useMap);
-
-  nsCOMPtr<nsIDocument> doc = aImageContent->GetDocument();
-  if (doc) {
-    nsCOMPtr<nsIDOMHTMLMapElement> imageMap = nsImageMapUtils::FindImageMap(doc, useMap);
-    if (!imageMap)
-      return nsnull;
-    nsCOMPtr<nsIContent> mapContent = do_QueryInterface(imageMap);
-    PRUint32 count = mapContent->GetChildCount();
-    // First see if mCurrentFocus is in this map
-    PRInt32 index = mapContent->IndexOf(mCurrentFocus);
-    PRInt32 tabIndex;
-    if (index < 0 || (mCurrentFocus->IsFocusable(&tabIndex) &&
-                      tabIndex != mCurrentTabIndex)) {
-      // If mCurrentFocus is in this map we must start iterating past it.
-      // We skip the case where mCurrentFocus has tabindex == mCurrentTabIndex
-      // since the next tab ordered element might be before it
-      // (or after for backwards) in the child list.
-      index = aForward ? -1 : (PRInt32)count;
-    }
-
-    // GetChildAt will return nsnull if our index < 0 or index >= count
-    nsCOMPtr<nsIContent> areaContent;
-    while ((areaContent = mapContent->GetChildAt(aForward? ++index : --index)) != nsnull) {
-      if (areaContent->IsFocusable(&tabIndex) && tabIndex == mCurrentTabIndex) {
-        return areaContent;
-      }
-    }
-  }
-
-  return nsnull;
-}
-
-PRInt32
-nsEventStateManager::GetNextTabIndex(nsIContent* aParent, PRBool forward)
-{
-  PRInt32 tabIndex, childTabIndex;
-  nsIContent *child;
-
-  PRUint32 count = aParent->GetChildCount();
-
-  if (forward) {
-    tabIndex = 0;
-    for (PRUint32 index = 0; index < count; index++) {
-      child = aParent->GetChildAt(index);
-      childTabIndex = GetNextTabIndex(child, forward);
-      if (childTabIndex > mCurrentTabIndex && childTabIndex != tabIndex) {
-        tabIndex = (tabIndex == 0 || childTabIndex < tabIndex) ? childTabIndex : tabIndex;
-      }
-
-      nsAutoString tabIndexStr;
-      child->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndexStr);
-      PRInt32 ec, val = tabIndexStr.ToInteger(&ec);
-      if (NS_SUCCEEDED (ec) && val > mCurrentTabIndex && val != tabIndex) {
-        tabIndex = (tabIndex == 0 || val < tabIndex) ? val : tabIndex;
-      }
-    }
-  }
-  else { /* !forward */
-    tabIndex = 1;
-    for (PRUint32 index = 0; index < count; index++) {
-      child = aParent->GetChildAt(index);
-      childTabIndex = GetNextTabIndex(child, forward);
-      if ((mCurrentTabIndex == 0 && childTabIndex > tabIndex) ||
-          (childTabIndex < mCurrentTabIndex && childTabIndex > tabIndex)) {
-        tabIndex = childTabIndex;
-      }
-
-      nsAutoString tabIndexStr;
-      child->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndexStr);
-      PRInt32 ec, val = tabIndexStr.ToInteger(&ec);
-      if (NS_SUCCEEDED (ec)) {
-        if ((mCurrentTabIndex == 0 && val > tabIndex) ||
-            (val < mCurrentTabIndex && val > tabIndex) ) {
-          tabIndex = val;
-        }
-      }
-    }
-  }
-  return tabIndex;
-}
-
 NS_IMETHODIMP
 nsEventStateManager::GetEventTarget(nsIFrame **aFrame)
 {
@@ -4907,8 +3749,7 @@ nsEventStateManager::GetEventTargetContent(nsEvent* aEvent,
   if (aEvent &&
       (aEvent->message == NS_FOCUS_CONTENT ||
        aEvent->message == NS_BLUR_CONTENT)) {
-    *aContent = mCurrentFocus;
-    NS_IF_ADDREF(*aContent);
+    NS_IF_ADDREF(*aContent = GetFocusedContent());
     return NS_OK;
   }
 
@@ -4958,8 +3799,15 @@ nsEventStateManager::GetContentState(nsIContent *aContent, PRInt32& aState)
     }
   }
 
-  if (aContent == mCurrentFocus) {
-    aState |= NS_EVENT_STATE_FOCUS;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMElement> focusedElement;
+    fm->GetFocusedElement(getter_AddRefs(focusedElement));
+
+    nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
+    if (aContent == focusedContent) {
+      aState |= NS_EVENT_STATE_FOCUS;
+    }
   }
   if (aContent == mDragOverContent) {
     aState |= NS_EVENT_STATE_DRAGOVER;
@@ -5033,8 +3881,6 @@ nsEventStateManager::SetContentState(nsIContent *aContent, PRInt32 aState)
       return PR_FALSE;
   }
 
-  PRBool didContentChangeAllStates = PR_TRUE;
-
   if ((aState & NS_EVENT_STATE_DRAGOVER) && (aContent != mDragOverContent)) {
     notifyContent[3] = mDragOverContent; // notify dragover first, since more common case
     NS_IF_ADDREF(notifyContent[3]);
@@ -5079,58 +3925,8 @@ nsEventStateManager::SetContentState(nsIContent *aContent, PRInt32 aState)
   }
 
   if ((aState & NS_EVENT_STATE_FOCUS)) {
-    EnsureDocument(mPresContext);
-    nsIMEStateManager::OnChangeFocus(mPresContext, aContent);
-    if (aContent && (aContent == mCurrentFocus) && gLastFocusedDocument == mDocument) {
-      // gLastFocusedDocument appears to always be correct, that is why
-      // I'm not setting it here. This is to catch an edge case.
-      NS_IF_RELEASE(gLastFocusedContent);
-      gLastFocusedContent = mCurrentFocus;
-      NS_IF_ADDREF(gLastFocusedContent);
-      //If this notification was for focus alone then get rid of aContent
-      //ref to avoid unnecessary notification.
-      if (!(aState & ~NS_EVENT_STATE_FOCUS)) {
-        aContent = nsnull;
-      }
-    } else {
-      // see comments in ShiftFocusInternal on mCurrentFocus overloading
-      PRBool fcActive = PR_FALSE;
-      if (mDocument) {
-        nsIFocusController *fc = GetFocusControllerForDocument(mDocument);
-        if (fc)
-          fc->GetActive(&fcActive);
-      }
-      notifyContent[2] = gLastFocusedContent;
-      NS_IF_ADDREF(gLastFocusedContent);
-      // only raise window if the the focus controller is active
-      SendFocusBlur(mPresContext, aContent, fcActive);
-      if (mCurrentFocus != aContent) {
-        didContentChangeAllStates = PR_FALSE;
-      }
-
-#ifdef DEBUG_aleventhal
-      nsPIDOMWindow *currentWindow = mDocument->GetWindow();
-      if (currentWindow) {
-        nsIFocusController *fc = currentWindow->GetRootFocusController();
-        if (fc) {
-          nsCOMPtr<nsIDOMElement> focusedElement;
-          fc->GetFocusedElement(getter_AddRefs(focusedElement));
-          if (!SameCOMIdentity(mCurrentFocus, focusedElement)) {
-            printf("\n\nFocus out of whack!!!\n\n");
-          }
-        }
-      }
-#endif
-      // If we now have focused content, ensure that the canvas focus ring
-      // is removed.
-      if (mDocument) {
-        nsCOMPtr<nsIDocShell> docShell =
-          do_QueryInterface(nsCOMPtr<nsISupports>(mDocument->GetContainer()));
-
-        if (docShell && mCurrentFocus)
-          docShell->SetCanvasHasFocus(PR_FALSE);
-      }
-    }
+    notifyContent[2] = aContent;
+    NS_IF_ADDREF(notifyContent[2]);
   }
 
   PRInt32 simpleStates = aState & ~(NS_EVENT_STATE_ACTIVE|NS_EVENT_STATE_HOVER);
@@ -5270,400 +4066,17 @@ nsEventStateManager::SetContentState(nsIContent *aContent, PRInt32 aState)
     }
   }
 
-  return didContentChangeAllStates;
-}
-
-static PRBool
-IsFocusable(nsIPresShell* aPresShell, nsIContent* aContent)
-{
-  // Flush pending updates to the frame tree first (bug 305840).
-  aPresShell->FlushPendingNotifications(Flush_Frames);
-
-  nsIFrame* focusFrame = aPresShell->GetPrimaryFrameFor(aContent);
-  if (!focusFrame) {
-    return PR_FALSE;
-  }
-
-  // XUL frames in general have a somewhat confusing notion of
-  // focusability so we only require a visible frame and that
-  // the content is focusable (not disabled).
-  // We don't use nsIFrame::IsFocusable() because it defaults
-  // tabindex to -1 for -moz-user-focus:ignore (bug 305840).
-  if (aContent->IsNodeOfType(nsINode::eXUL)) {
-    // XXX Eventually we should have a better check, but for
-    // now checking for style visibility and focusability caused
-    // too many regressions.
-    return focusFrame->AreAncestorViewsVisible();
-  }
-
-  if (aContent->Tag() != nsGkAtoms::area) {
-    return focusFrame->IsFocusable();
-  }
-  // HTML areas do not have their own frame, and the img frame we get from
-  // GetPrimaryFrameFor() is not relevant to whether it is focusable or not,
-  // so we have to do all the relevant checks manually for them.
-  return focusFrame->AreAncestorViewsVisible() &&
-         focusFrame->GetStyleVisibility()->IsVisible() &&
-         aContent->IsFocusable();
-}
-
-nsresult
-nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
-                                   nsIContent *aContent,
-                                   PRBool aEnsureWindowHasFocus)
-{
-  // Keep a ref to presShell since dispatching the DOM event may cause
-  // the document to be destroyed.
-  nsCOMPtr<nsIPresShell> presShell = aPresContext->GetPresShell();
-  if (!presShell)
-    return NS_OK;
-
-  nsCOMPtr<nsIContent> previousFocus = mCurrentFocus;
-
-  // Make sure previousFocus is in a document.  If it's not, then
-  // we should never abort firing events based on what happens when we
-  // send it a blur.
-
-  if (previousFocus && !previousFocus->GetDocument())
-    previousFocus = nsnull;
-
-  // Track the old focus controller if any focus suppressions is used on it.
-  nsFocusSuppressor oldFocusSuppressor;
-  
-  nsIMEStateManager::OnTextStateBlur(aPresContext, aContent);
-
-  if (nsnull != gLastFocusedPresContextWeak) {
-
-    nsCOMPtr<nsIContent> focusAfterBlur;
-
-    if (gLastFocusedContent && gLastFocusedContent != mFirstBlurEvent) {
-
-      //Store the first blur event we fire and don't refire blur
-      //to that element while the first blur is still ongoing.
-      PRBool clearFirstBlurEvent = PR_FALSE;
-      if (!mFirstBlurEvent) {
-        mFirstBlurEvent = gLastFocusedContent;
-        clearFirstBlurEvent = PR_TRUE;
-      }
-
-      // Retrieve this content node's pres context. it can be out of sync in
-      // the Ender widget case.
-      nsCOMPtr<nsIDocument> doc = gLastFocusedContent->GetDocument();
-      if (doc) {
-        // The order of the nsIViewManager and nsIPresShell COM pointers is
-        // important below.  We want the pres shell to get released before the
-        // associated view manager on exit from this function.
-        // See bug 53763.
-        nsCOMPtr<nsIViewManager> kungFuDeathGrip;
-        nsIPresShell *shell = doc->GetPrimaryShell();
-        if (shell) {
-          kungFuDeathGrip = shell->GetViewManager();
-
-          nsCOMPtr<nsPresContext> oldPresContext = shell->GetPresContext();
-
-          //fire blur
-          nsEvent blurEvent(PR_TRUE, NS_BLUR_CONTENT);
-          blurEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-          EnsureDocument(presShell);
-
-          // Make sure we're not switching command dispatchers, if so,
-          // surpress the blurred one
-          if(gLastFocusedDocument && mDocument) {
-            nsPIDOMWindow *newWindow = mDocument->GetWindow();
-            if (newWindow) {
-              nsIFocusController *newFocusController =
-                newWindow->GetRootFocusController();
-              nsPIDOMWindow *oldWindow = gLastFocusedDocument->GetWindow();
-              if (oldWindow) {
-                nsIFocusController *suppressed =
-                  oldWindow->GetRootFocusController();
-
-                if (suppressed != newFocusController) {
-                  oldFocusSuppressor.Suppress(suppressed, "SendFocusBlur Window Switch #1");
-                }
-              }
-            }
-          }
-
-          nsCOMPtr<nsIEventStateManager> esm;
-          esm = oldPresContext->EventStateManager();
-          esm->SetFocusedContent(gLastFocusedContent);
-          nsCOMPtr<nsIContent> temp = gLastFocusedContent;
-          NS_RELEASE(gLastFocusedContent); // nulls out gLastFocusedContent
-
-          nsCxPusher pusher;
-          if (pusher.Push(temp)) {
-            FireFocusOrBlurEvent(temp, &blurEvent, oldPresContext);
-            pusher.Pop();
-          }
-
-          focusAfterBlur = mCurrentFocus;
-          if (!previousFocus || previousFocus == focusAfterBlur)
-            esm->SetFocusedContent(nsnull);
-        }
-      }
-
-      if (clearFirstBlurEvent) {
-        mFirstBlurEvent = nsnull;
-      }
-
-      if (previousFocus && previousFocus != focusAfterBlur) {
-        // The content node's blur handler focused something else.
-        // In this case, abort firing any more blur or focus events.
-        EnsureFocusSynchronization();
-        return NS_OK;
-      }
-    }
-
-    // Go ahead and fire a blur on the window.
-    nsCOMPtr<nsPIDOMWindow> window;
-
-    if(gLastFocusedDocument)
-      window = gLastFocusedDocument->GetWindow();
-
-    EnsureDocument(presShell);
-
-    if (gLastFocusedDocument && (gLastFocusedDocument != mDocument) &&
-        window) {
-      nsEvent blurEvent(PR_TRUE, NS_BLUR_CONTENT);
-      blurEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-      // Make sure we're not switching command dispatchers, if so,
-      // suppress the blurred one if it isn't already suppressed
-      if (mDocument && !oldFocusSuppressor.Suppressing()) {
-        nsCOMPtr<nsPIDOMWindow> newWindow(mDocument->GetWindow());
-
-        if (newWindow) {
-          nsCOMPtr<nsPIDOMWindow> oldWindow(gLastFocusedDocument->GetWindow());
-          nsIFocusController *newFocusController =
-            newWindow->GetRootFocusController();
-          if (oldWindow) {
-            nsIFocusController *suppressed =
-              oldWindow->GetRootFocusController();
-            if (suppressed != newFocusController) {
-              oldFocusSuppressor.Suppress(suppressed, "SendFocusBlur Window Switch #2");
-            }
-          }
-        }
-      }
-
-      gLastFocusedPresContextWeak->EventStateManager()->SetFocusedContent(nsnull);
-      nsCOMPtr<nsIDocument> temp = gLastFocusedDocument;
-      NS_RELEASE(gLastFocusedDocument);
-      gLastFocusedDocument = nsnull;
-
-      nsCxPusher pusher;
-      if (pusher.Push(temp)) {
-        FireFocusOrBlurEvent(temp, &blurEvent, gLastFocusedPresContextWeak);
-        pusher.Pop();
-      }
-
-      if (previousFocus && mCurrentFocus != previousFocus) {
-        // The document's blur handler focused something else.
-        // Abort firing any additional blur or focus events, and make sure
-        // nsFocusController:mFocusedElement is not nulled out, but agrees
-        // with our current concept of focus.
-        EnsureFocusSynchronization();
-        return NS_OK;
-      }
-
-      nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(window);
-      if (pusher.Push(target)) {
-        blurEvent.target = nsnull;
-        FireFocusOrBlurEvent(target, &blurEvent, gLastFocusedPresContextWeak);
-  
-        if (previousFocus && mCurrentFocus != previousFocus) {
-          // The window's blur handler focused something else.
-          // Abort firing any additional blur or focus events.
-          EnsureFocusSynchronization();
-          return NS_OK;
-        }
-      }
-    }
-  }
-
-  // Check if the nsEventDispatcher::Dispatch calls above destroyed our frame
-  // (bug #118685) or made it not focusable in any way.
-  if (aContent && !::IsFocusable(presShell, aContent)) {
-    aContent = nsnull;
-  }
-
-  NS_IF_RELEASE(gLastFocusedContent);
-  gLastFocusedContent = aContent;
-  NS_IF_ADDREF(gLastFocusedContent);
-  SetFocusedContent(aContent);
-  EnsureFocusSynchronization();
-
-  // Moved widget focusing code here, from end of SendFocusBlur
-  // This fixes the order of accessibility focus events, so that
-  // the window focus event goes first, and then the focus event for the control
-  if (aEnsureWindowHasFocus) {
-    nsCOMPtr<nsIWidget> widget;
-    // Plug-ins with native widget need a special handling
-    nsIFrame* currentFocusFrame = nsnull;
-    if (mCurrentFocus)
-      currentFocusFrame = presShell->GetPrimaryFrameFor(mCurrentFocus);
-    if (!currentFocusFrame)
-      currentFocusFrame = mCurrentTarget;
-    nsIObjectFrame* objFrame = do_QueryFrame(currentFocusFrame);
-    if (objFrame) {
-      nsIView* view = currentFocusFrame->GetViewExternal();
-      NS_ASSERTION(view, "Object frames must have views");
-      widget = view->GetWidget();
-    }
-    if (!widget) {
-      // This raises the window that has both content and scroll bars in it
-      // instead of the child window just below it that contains only the content
-      // That way we focus the same window that gets focused by a mouse click
-      nsIViewManager* vm = presShell->GetViewManager();
-      if (vm) {
-        vm->GetWidget(getter_AddRefs(widget));
-      }
-    }
-    if (widget)
-      widget->SetFocus(PR_TRUE);
-  }
-
-  if (nsnull != aContent && aContent != mFirstFocusEvent &&
-      !EventHandlingSuppressed(aContent)) {
-
-    //Store the first focus event we fire and don't refire focus
-    //to that element while the first focus is still ongoing.
-    PRBool clearFirstFocusEvent = PR_FALSE;
-    if (!mFirstFocusEvent) {
-      mFirstFocusEvent = aContent;
-      clearFirstFocusEvent = PR_TRUE;
-    }
-
-    //fire focus
-    nsEvent focusEvent(PR_TRUE, NS_FOCUS_CONTENT);
-    focusEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-    if (nsnull != mPresContext) {
-      nsCxPusher pusher;
-      if (pusher.Push(aContent)) {
-        FireFocusOrBlurEvent(aContent, &focusEvent, mPresContext);
-      }
-    }
-
-    nsAutoString tabIndex;
-    aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndex);
-    PRInt32 ec, val = tabIndex.ToInteger(&ec);
-    if (NS_SUCCEEDED (ec)) {
-      mCurrentTabIndex = val;
-    }
-
-    if (clearFirstFocusEvent) {
-      mFirstFocusEvent = nsnull;
-    }
-
-    nsIMEStateManager::OnTextStateFocus(mPresContext, mCurrentFocus);
-  } else if (!aContent && !EventHandlingSuppressed(mDocument)) {
-    //fire focus on document even if the content isn't focusable (ie. text)
-    //see bugzilla bug 93521
-    nsEvent focusEvent(PR_TRUE, NS_FOCUS_CONTENT);
-    focusEvent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-
-    if (nsnull != mPresContext && mDocument) {
-      nsCxPusher pusher;
-      if (pusher.Push(mDocument)) {
-        FireFocusOrBlurEvent(mDocument, &focusEvent, mPresContext);
-      }
-    }
-  }
-
-  if (mBrowseWithCaret || GetWindowShowCaret(mDocument))
-    SetContentCaretVisible(presShell, aContent, PR_TRUE);
-
-  return NS_OK;
+  return PR_TRUE;
 }
 
 NS_IMETHODIMP
-nsEventStateManager::GetFocusedContent(nsIContent** aContent)
+nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
 {
-  *aContent = mCurrentFocus;
-  NS_IF_ADDREF(*aContent);
-  return NS_OK;
-}
-
-void nsEventStateManager::EnsureFocusSynchronization()
-{
-  // Sometimes the focus can get out of whack due to a blur handler
-  // resetting focus. In addition, we fire onchange from the blur handler
-  // for some controls, which is another place where focus can be changed.
-  // XXX Ideally we will eventually store focus in one place instead of
-  // the focus controller, esm, tabbrowser and some frames, so that it
-  // cannot get out of sync.
-  // See Bug 304751, calling FireOnChange() inside
-  //                 nsComboboxControlFrame::SetFocus() is bad
-  nsPIDOMWindow *currentWindow = mDocument->GetWindow();
-  if (currentWindow) {
-    nsIFocusController *fc = currentWindow->GetRootFocusController();
-    if (fc) {
-      nsCOMPtr<nsIDOMElement> focusedElement = do_QueryInterface(mCurrentFocus);
-      fc->SetFocusedElement(focusedElement);
-    }
-  }
-}
-
-NS_IMETHODIMP
-nsEventStateManager::SetFocusedContent(nsIContent* aContent)
-{
-
-  if (aContent &&
-      (!mPresContext || mPresContext->Type() == nsPresContext::eContext_PrintPreview)) {
-    return NS_OK;
-  }
-
-  mCurrentFocus = aContent;
-  if (mCurrentFocus)
-    mLastFocus = mCurrentFocus;
-  mCurrentFocusFrame = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEventStateManager::GetLastFocusedContent(nsIContent** aContent)
-{
-  *aContent = mLastFocus;
-  NS_IF_ADDREF(*aContent);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEventStateManager::GetFocusedFrame(nsIFrame** aFrame)
-{
-  if (!mCurrentFocusFrame && mCurrentFocus) {
-    nsIDocument* doc = mCurrentFocus->GetDocument();
-    if (doc) {
-      nsIPresShell *shell = doc->GetPrimaryShell();
-      if (shell) {
-        mCurrentFocusFrame = shell->GetPrimaryFrameFor(mCurrentFocus);
-      }
-    }
-  }
-
-  *aFrame = mCurrentFocusFrame;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEventStateManager::ContentRemoved(nsIContent* aContent)
-{
-  if (mCurrentFocus &&
-      nsContentUtils::ContentIsDescendantOf(mCurrentFocus, aContent)) {
-    // Note that we don't use SetContentState() here because
-    // we don't want to fire a blur.  Blurs should only be fired
-    // in response to clicks or tabbing.
-    nsIMEStateManager::OnRemoveContent(mPresContext, mCurrentFocus);
-    SetFocusedContent(nsnull);
-  }
-
-  if (mLastFocus &&
-      nsContentUtils::ContentIsDescendantOf(mLastFocus, aContent)) {
-    mLastFocus = nsnull;
-  }
+  // inform the focus manager that the content is being removed. If this
+  // content is focused, the focus will be removed without firing events.
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    fm->ContentRemoved(aDocument, aContent);
 
   if (mHoverContent &&
       nsContentUtils::ContentIsDescendantOf(mHoverContent, aContent)) {
@@ -5751,13 +4164,6 @@ nsEventStateManager::EnsureDocument(nsPresContext* aPresContext)
     mDocument = aPresContext->Document();
 }
 
-void
-nsEventStateManager::EnsureDocument(nsIPresShell* aPresShell)
-{
-  if (!mDocument && aPresShell)
-    mDocument = aPresShell->GetDocument();
-}
-
 void
 nsEventStateManager::FlushPendingEvents(nsPresContext* aPresContext)
 {
@@ -5768,610 +4174,16 @@ nsEventStateManager::FlushPendingEvents(nsPresContext* aPresContext)
   }
 }
 
-nsresult
-nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent,
-                                             nsIContent **aEndContent,
-                                             nsIFrame **aStartFrame,
-                                             PRUint32* aStartOffset)
+nsIContent*
+nsEventStateManager::GetFocusedContent()
 {
-  // In order to return the nsIContent and nsIFrame of the caret's position,
-  // we need to get a pres shell, and then get the selection from it
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm || !mDocument)
+    return nsnull;
 
-  *aStartOffset = 0;
-  *aStartFrame = nsnull;
-  *aStartContent = *aEndContent = nsnull;
-  nsresult rv = NS_ERROR_FAILURE;
-
-  NS_ASSERTION(mPresContext, "mPresContent is null!!");
-  EnsureDocument(mPresContext);
-  if (!mDocument)
-    return rv;
-  nsIPresShell *shell;
-  shell = mPresContext->GetPresShell();
-
-  nsCOMPtr<nsFrameSelection> frameSelection;
-  if (shell)
-    frameSelection = shell->FrameSelection();
-
-  nsCOMPtr<nsISelection> domSelection;
-  if (frameSelection) {
-    domSelection = frameSelection->
-      GetSelection(nsISelectionController::SELECTION_NORMAL);
-  }
-
-  nsCOMPtr<nsIDOMNode> startNode, endNode;
-  PRBool isCollapsed = PR_FALSE;
-  nsCOMPtr<nsIContent> startContent, endContent;
-  if (domSelection) {
-    domSelection->GetIsCollapsed(&isCollapsed);
-    nsCOMPtr<nsIDOMRange> domRange;
-    rv = domSelection->GetRangeAt(0, getter_AddRefs(domRange));
-    if (domRange) {
-      domRange->GetStartContainer(getter_AddRefs(startNode));
-      domRange->GetEndContainer(getter_AddRefs(endNode));
-      domRange->GetStartOffset(reinterpret_cast<PRInt32 *>(aStartOffset));
-
-      nsIContent *childContent = nsnull;
-
-      startContent = do_QueryInterface(startNode);
-      if (startContent && startContent->IsNodeOfType(nsINode::eELEMENT)) {
-        NS_ASSERTION(*aStartOffset >= 0, "Start offset cannot be negative");  
-        childContent = startContent->GetChildAt(*aStartOffset);
-        if (childContent) {
-          startContent = childContent;
-        }
-      }
-
-      endContent = do_QueryInterface(endNode);
-      if (endContent && endContent->IsNodeOfType(nsINode::eELEMENT)) {
-        PRInt32 endOffset = 0;
-        domRange->GetEndOffset(&endOffset);
-        NS_ASSERTION(endOffset >= 0, "End offset cannot be negative");
-        childContent = endContent->GetChildAt(endOffset);
-        if (childContent) {
-          endContent = childContent;
-        }
-      }
-    }
-  }
-  else {
-    rv = NS_ERROR_INVALID_ARG;
-  }
-
-  nsIFrame *startFrame = nsnull;
-  if (startContent) {
-    startFrame = shell->GetPrimaryFrameFor(startContent);
-    if (isCollapsed) {
-      // Next check to see if our caret is at the very end of a node
-      // If so, the caret is actually sitting in front of the next
-      // logical frame's primary node - so for this case we need to
-      // change caretContent to that node.
-
-      nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(startContent));
-      PRUint16 nodeType;
-      domNode->GetNodeType(&nodeType);
-
-      if (nodeType == nsIDOMNode::TEXT_NODE) {
-        nsAutoString nodeValue;
-        domNode->GetNodeValue(nodeValue);
-
-        PRBool isFormControl =
-          startContent->IsNodeOfType(nsINode::eHTML_FORM_CONTROL);
-
-        if (nodeValue.Length() == *aStartOffset && !isFormControl &&
-            startContent != mDocument->GetRootContent()) {
-          // Yes, indeed we were at the end of the last node
-          nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-
-          nsCOMPtr<nsIFrameTraversal> trav(do_CreateInstance(kFrameTraversalCID,
-                                                             &rv));
-          NS_ENSURE_SUCCESS(rv, rv);
-
-          rv = trav->NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                       mPresContext, startFrame,
-                                       eLeaf,
-                                       PR_FALSE, // aVisual
-                                       PR_FALSE, // aLockInScrollView
-                                       PR_FALSE  // aFollowOOFs
-                                       );
-          NS_ENSURE_SUCCESS(rv, rv);
-
-          nsIFrame *newCaretFrame = nsnull;
-          nsCOMPtr<nsIContent> newCaretContent = startContent;
-          PRBool endOfSelectionInStartNode(startContent == endContent);
-          do {
-            // Continue getting the next frame until the primary content for the frame
-            // we are on changes - we don't want to be stuck in the same place
-            frameTraversal->Next();
-            newCaretFrame = frameTraversal->CurrentItem();
-            if (nsnull == newCaretFrame) {
-              break;
-            }
-            newCaretContent = newCaretFrame->GetContent();            
-          } while (!newCaretContent || newCaretContent == startContent);
-
-          if (newCaretFrame && newCaretContent) {
-            // If the caret is exactly at the same position of the new frame,
-            // then we can use the newCaretFrame and newCaretContent for our position
-            nsRefPtr<nsCaret> caret;
-            shell->GetCaret(getter_AddRefs(caret));
-            nsRect caretRect;
-            nsIView *caretView;
-            caret->GetCaretCoordinates(nsCaret::eClosestViewCoordinates, 
-                                       domSelection, &caretRect,
-                                       &isCollapsed, &caretView);
-            nsPoint framePt;
-            nsIView *frameClosestView = newCaretFrame->GetClosestView(&framePt);
-            if (caretView == frameClosestView && caretRect.y == framePt.y &&
-                caretRect.x == framePt.x) {
-              // The caret is at the start of the new element.
-              startFrame = newCaretFrame;
-              startContent = newCaretContent;
-              if (endOfSelectionInStartNode) {
-                endContent = newCaretContent; // Ensure end of selection is not before start
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  *aStartFrame = startFrame;
-  *aStartContent = startContent;
-  *aEndContent = endContent;
-  NS_IF_ADDREF(*aStartContent);
-  NS_IF_ADDREF(*aEndContent);
-
-  return rv;
-}
-
-void
-nsEventStateManager::FocusElementButNotDocument(nsIContent *aContent)
-{
-  // Focus an element in the current document, but don't switch document/window focus!
-
-  if (gLastFocusedDocument == mDocument) {
-    // If we're already focused in this document,
-    // use normal focus method
-    if (mCurrentFocus != aContent) {
-      if (aContent)
-        aContent->SetFocus(mPresContext);
-      else
-        SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-    }
-    return;
-  }
-
-  /**
-   * The last focus wasn't in this document, so we may be getting our position from the selection
-   * while the window focus is currently somewhere else such as the find dialog
-   */
-
-  nsIFocusController *focusController =
-    GetFocusControllerForDocument(mDocument);
-  if (!focusController)
-      return;
-
-  // Get previous focus
-  nsCOMPtr<nsIDOMElement> oldFocusedElement;
-  focusController->GetFocusedElement(getter_AddRefs(oldFocusedElement));
-  nsCOMPtr<nsIContent> oldFocusedContent(do_QueryInterface(oldFocusedElement));
-
-  // Temporarily set mCurrentFocus so that esm::GetContentState() tells
-  // layout system to show focus on this element.
-  SetFocusedContent(aContent);  // Reset back to null at the end of this method.
-  mDocument->BeginUpdate(UPDATE_CONTENT_STATE);
-  mDocument->ContentStatesChanged(oldFocusedContent, aContent,
-                                  NS_EVENT_STATE_FOCUS);
-  mDocument->EndUpdate(UPDATE_CONTENT_STATE);
-
-  // Reset mCurrentFocus = nsnull for this doc, so when this document
-  // does get focus next time via preHandleEvent() NS_GOTFOCUS,
-  // the old document gets blurred
-  SetFocusedContent(nsnull);
-
-}
-
-NS_IMETHODIMP
-nsEventStateManager::MoveFocusToCaret(PRBool aCanFocusDoc,
-                                      PRBool *aIsSelectionWithFocus)
-{
-  // mBrowseWithCaret equals the pref accessibility.browsewithcaret
-  // When it's true, the user can arrow around the browser as if it's a
-  // read only text editor.
-
-  // If the user cursors over a focusable element or gets there with find text, then send focus to it
-
-  *aIsSelectionWithFocus= PR_FALSE;
-  nsCOMPtr<nsIContent> selectionContent, endSelectionContent;
-  nsIFrame *selectionFrame;
-  PRUint32 selectionOffset;
-  GetDocSelectionLocation(getter_AddRefs(selectionContent), getter_AddRefs(endSelectionContent),
-    &selectionFrame, &selectionOffset);
-
-  if (!selectionContent)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIContent> testContent(selectionContent);
-  nsCOMPtr<nsIContent> nextTestContent(endSelectionContent);
-
-  // We now have the correct start node in selectionContent!
-  // Search for focusable elements, starting with selectionContent
-
-  // Method #1: Keep going up while we look - an ancestor might be focusable
-  // We could end the loop earlier, such as when we're no longer
-  // in the same frame, by comparing getPrimaryFrameFor(selectionContent)
-  // with a variable holding the starting selectionContent
-  while (testContent) {
-    // Keep testing while selectionContent is equal to something,
-    // eventually we'll run out of ancestors
-
-    if (testContent == mCurrentFocus) {
-      *aIsSelectionWithFocus = PR_TRUE;
-      return NS_OK;  // already focused on this node, this whole thing's moot
-    }
-
-    nsIAtom *tag = testContent->Tag();
-
-    // Add better focusable test here later if necessary ...
-    if (tag == nsGkAtoms::a &&
-        testContent->IsNodeOfType(nsINode::eHTML)) {
-      *aIsSelectionWithFocus = PR_TRUE;
-    }
-    else {
-      // Xlink must be type="simple"
-      *aIsSelectionWithFocus =
-        testContent->HasAttr(kNameSpaceID_XLink, nsGkAtoms::href) &&
-        testContent->AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::type,
-                                 nsGkAtoms::simple, eCaseMatters);
-    }
-
-    if (*aIsSelectionWithFocus) {
-      FocusElementButNotDocument(testContent);
-      return NS_OK;
-    }
-
-    // Get the parent
-    testContent = testContent->GetParent();
-
-    if (!testContent) {
-      // We run this loop again, checking the ancestor chain of the selection's end point
-      testContent = nextTestContent;
-      nextTestContent = nsnull;
-    }
-  }
-
-  // We couldn't find an anchor that was an ancestor of the selection start
-  // Method #2: look for anchor in selection's primary range (depth first search)
-
-  // Turn into nodes so that we can use GetNextSibling() and GetFirstChild()
-  nsCOMPtr<nsIDOMNode> selectionNode(do_QueryInterface(selectionContent));
-  nsCOMPtr<nsIDOMNode> endSelectionNode(do_QueryInterface(endSelectionContent));
-  nsCOMPtr<nsIDOMNode> testNode;
-
-  do {
-    testContent = do_QueryInterface(selectionNode);
-
-    // We're looking for any focusable item that could be part of the
-    // main document's selection.
-    // Right now we only look for elements with the <a> tag.
-    // Add better focusable test here later if necessary ...
-    if (testContent) {
-      if (testContent->Tag() == nsGkAtoms::a &&
-          testContent->IsNodeOfType(nsINode::eHTML)) {
-        *aIsSelectionWithFocus = PR_TRUE;
-        FocusElementButNotDocument(testContent);
-        return NS_OK;
-      }
-    }
-
-    selectionNode->GetFirstChild(getter_AddRefs(testNode));
-    if (testNode) {
-      selectionNode = testNode;
-      continue;
-    }
-
-    if (selectionNode == endSelectionNode)
-      break;
-    selectionNode->GetNextSibling(getter_AddRefs(testNode));
-    if (testNode) {
-      selectionNode = testNode;
-      continue;
-    }
-
-    do {
-      selectionNode->GetParentNode(getter_AddRefs(testNode));
-      if (!testNode || testNode == endSelectionNode) {
-        selectionNode = nsnull;
-        break;
-      }
-      testNode->GetNextSibling(getter_AddRefs(selectionNode));
-      if (selectionNode)
-        break;
-      selectionNode = testNode;
-    } while (PR_TRUE);
-  }
-  while (selectionNode && selectionNode != endSelectionNode);
-
-  if (aCanFocusDoc)
-    FocusElementButNotDocument(nsnull);
-
-  return NS_OK; // no errors, but caret not inside focusable element other than doc itself
-}
-
-
-
-NS_IMETHODIMP
-nsEventStateManager::MoveCaretToFocus()
-{
-  // If in HTML content and the pref accessibility.browsewithcaret is TRUE,
-  // then always move the caret to beginning of a new focus
-
-  PRInt32 itemType = nsIDocShellTreeItem::typeChrome;
-
-  if (mPresContext) {
-    nsCOMPtr<nsISupports> pcContainer = mPresContext->GetContainer();
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(pcContainer));
-    if (treeItem)
-      treeItem->GetItemType(&itemType);
-    nsCOMPtr<nsIEditorDocShell> editorDocShell(do_QueryInterface(treeItem));
-    if (editorDocShell) {
-      PRBool isEditable;
-      editorDocShell->GetEditable(&isEditable);
-      if (isEditable) {
-        return NS_OK;  // Move focus to caret only if browsing, not editing
-      }
-    }
-  }
-
-  if (itemType != nsIDocShellTreeItem::typeChrome) {
-    nsIPresShell *shell = mPresContext->GetPresShell();
-    if (shell) {
-      // rangeDoc is a document interface we can create a range with
-      nsCOMPtr<nsIDOMDocumentRange> rangeDoc(do_QueryInterface(mDocument));
-
-      if (rangeDoc) {
-        nsCOMPtr<nsFrameSelection> frameSelection = shell->FrameSelection();
-        nsCOMPtr<nsISelection> domSelection = frameSelection->
-          GetSelection(nsISelectionController::SELECTION_NORMAL);
-        if (domSelection) {
-          nsCOMPtr<nsIDOMNode> currentFocusNode(do_QueryInterface(mCurrentFocus));
-          // First clear the selection
-          domSelection->RemoveAllRanges();
-          if (currentFocusNode && !mCurrentFocus->IsNodeOfType(nsINode::eXUL)) {
-            nsCOMPtr<nsIDOMRange> newRange;
-            nsresult rv = rangeDoc->CreateRange(getter_AddRefs(newRange));
-            if (NS_SUCCEEDED(rv)) {
-              // Set the range to the start of the currently focused node
-              // Make sure it's collapsed
-              newRange->SelectNodeContents(currentFocusNode);
-              nsCOMPtr<nsIDOMNode> firstChild;
-              currentFocusNode->GetFirstChild(getter_AddRefs(firstChild));
-              if (!firstChild ||
-                  mCurrentFocus->IsNodeOfType(nsINode::eHTML_FORM_CONTROL)) {
-                // If current focus node is a leaf, set range to before the
-                // node by using the parent as a container.
-                // This prevents it from appearing as selected.
-                newRange->SetStartBefore(currentFocusNode);
-                newRange->SetEndBefore(currentFocusNode);
-              }
-              domSelection->AddRange(newRange);
-              domSelection->CollapseToStart();
-            }
-          }
-        }
-      }
-    }
-  }
-  return NS_OK;
-}
-
-nsresult
-nsEventStateManager::SetCaretEnabled(nsIPresShell *aPresShell, PRBool aEnabled)
-{
-  nsRefPtr<nsCaret> caret;
-  aPresShell->GetCaret(getter_AddRefs(caret));
-
-  nsCOMPtr<nsISelectionController> selCon(do_QueryInterface(aPresShell));
-  if (!selCon || !caret)
-    return NS_ERROR_FAILURE;
-
-  selCon->SetCaretEnabled(aEnabled);
-  caret->SetCaretVisible(aEnabled);
-  caret->SetIgnoreUserModify(aEnabled);
-
-  return NS_OK;
-}
-
-nsresult
-nsEventStateManager::SetContentCaretVisible(nsIPresShell* aPresShell,
-                                            nsIContent *aFocusedContent,
-                                            PRBool aVisible)
-{
-  // When browsing with caret, make sure caret is visible after new focus
-  nsRefPtr<nsCaret> caret;
-  aPresShell->GetCaret(getter_AddRefs(caret));
-
-  nsCOMPtr<nsFrameSelection> frameSelection;
-  if (aFocusedContent) {
-    nsIFrame *focusFrame = aPresShell->GetPrimaryFrameFor(aFocusedContent);
-    
-    if (focusFrame)
-      frameSelection = focusFrame->GetFrameSelection();
-  }
-
-  nsCOMPtr<nsFrameSelection> docFrameSelection = aPresShell->FrameSelection();
-
-  if (docFrameSelection && caret &&
-     (frameSelection == docFrameSelection || !aFocusedContent)) {
-    nsISelection* domSelection = docFrameSelection->
-      GetSelection(nsISelectionController::SELECTION_NORMAL);
-    if (domSelection) {
-      // First, tell the caret which selection to use
-      caret->SetCaretDOMSelection(domSelection);
-
-      // In content, we need to set the caret
-      // the only other case is edit fields, where they have a different frame selection from the doc's
-      // in that case they'll take care of making the caret visible themselves
-
-      // Then make sure it's visible
-      return SetCaretEnabled(aPresShell, aVisible);
-    }
-  }
-
-  return NS_OK;
-}
-
-PRBool
-nsEventStateManager::GetBrowseWithCaret()
-{
-  return mBrowseWithCaret;
-}
-
-// Checks if the window corresponding to |aDocument| has the 
-// showcaret="true" attribute set.
-static PRBool
-GetWindowShowCaret(nsIDocument *aDocument)
-{
-  if (!aDocument) return PR_FALSE;
-
-  nsPIDOMWindow* window = aDocument->GetWindow();
-  if (!window) return PR_FALSE;
-
-  nsCOMPtr<nsIContent> docContent =
-    do_QueryInterface(window->GetFrameElementInternal());
-  if (!docContent) return PR_FALSE;
-
-  return docContent->AttrValueIs(kNameSpaceID_None,
-                                 nsGkAtoms::showcaret,
-                                 NS_LITERAL_STRING("true"),
-                                 eCaseMatters);
-}
-
-void
-nsEventStateManager::ResetBrowseWithCaret()
-{
-  // This is called when browse with caret changes on the fly
-  // or when a document gets focused
-
-  if (!mPresContext)
-    return;
-
-  nsCOMPtr<nsISupports> pcContainer = mPresContext->GetContainer();
-  PRInt32 itemType;
-  nsCOMPtr<nsIDocShellTreeItem> shellItem(do_QueryInterface(pcContainer));
-  if (!shellItem)
-    return;
-
-  shellItem->GetItemType(&itemType);
-
-  if (itemType == nsIDocShellTreeItem::typeChrome)
-    return;  // Never browse with caret in chrome
-
-  PRPackedBool browseWithCaret =
-    nsContentUtils::GetBoolPref("accessibility.browsewithcaret");
-  mBrowseWithCaret = browseWithCaret;
-
-  nsIPresShell *presShell = mPresContext->GetPresShell();
-
-  // If we're in an editable document which isn't contentEditable, or we're
-  // in a contentEditable document which whose focus is contentEditable,
-  // return, so that we don't mess with caret visibility.
-  nsCOMPtr<nsIEditorDocShell> editorDocShell(do_QueryInterface(shellItem));
-  if (editorDocShell) {
-    PRBool isEditable;
-    editorDocShell->GetEditable(&isEditable);
-    if (presShell && isEditable) {
-      nsCOMPtr<nsIHTMLDocument> doc =
-        do_QueryInterface(presShell->GetDocument());
-
-      PRBool isContentEditableDoc =
-        doc && doc->GetEditingState() == nsIHTMLDocument::eContentEditable;
-
-      PRBool isFocusEditable =
-        mCurrentFocus && mCurrentFocus->HasFlag(NODE_IS_EDITABLE);
-
-      if (!isContentEditableDoc || isFocusEditable)
-        return;
-    }
-  }
-
-  // Make caret visible or not, depending on what's appropriate.
-  // Set caret visibility for focused document only,
-  // others will be set when they get focused again
-  if (presShell && gLastFocusedDocument && gLastFocusedDocument == mDocument) {
-
-    PRBool caretShouldBeVisible = browseWithCaret ||
-                                  GetWindowShowCaret(mDocument);
-
-    SetContentCaretVisible(presShell, mCurrentFocus, caretShouldBeVisible);
-  }
-}
-
-//--------------------------------------------------------------------------------
-//-- DocShell Focus Traversal Methods
-//--------------------------------------------------------------------------------
-
-//----------------------------------------
-// Returns PR_TRUE if this doc contains a frameset
-PRBool
-nsEventStateManager::IsFrameSetDoc(nsIDocShell* aDocShell)
-{
-  NS_ASSERTION(aDocShell, "docshell is null");
-  PRBool isFrameSet = PR_FALSE;
-
-  // a frameset element will always be the immediate child
-  // of the root content (the HTML tag)
-  nsCOMPtr<nsIPresShell> presShell;
-  aDocShell->GetPresShell(getter_AddRefs(presShell));
-  if (presShell) {
-    nsIDocument *doc = presShell->GetDocument();
-    nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(doc);
-    if (htmlDoc) {
-      nsIContent *rootContent = doc->GetRootContent();
-      if (rootContent) {
-        PRUint32 childCount = rootContent->GetChildCount();
-        for (PRUint32 i = 0; i < childCount; ++i) {
-          nsIContent *childContent = rootContent->GetChildAt(i);
-
-          nsINodeInfo *ni = childContent->NodeInfo();
-
-          if (childContent->IsNodeOfType(nsINode::eHTML) &&
-              ni->Equals(nsGkAtoms::frameset)) {
-            isFrameSet = PR_TRUE;
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  return isFrameSet;
-}
-
-//----------------------------------------
-// Returns PR_TRUE if this doc is an IFRAME
-
-PRBool
-nsEventStateManager::IsIFrameDoc(nsIDocShell* aDocShell)
-{
-  NS_ASSERTION(aDocShell, "docshell is null");
-
-  nsCOMPtr<nsPIDOMWindow> domWindow(do_GetInterface(aDocShell));
-  if (!domWindow) {
-    NS_ERROR("We're a child of a docshell without a window?");
-    return PR_FALSE;
-  }
-
-  nsCOMPtr<nsIContent> docContent =
-    do_QueryInterface(domWindow->GetFrameElementInternal());
-
-  if (!docContent) {
-    return PR_FALSE;
-  }
-
-  return docContent->Tag() == nsGkAtoms::iframe;
+  nsCOMPtr<nsPIDOMWindow> focusedWindow;
+  return nsFocusManager::GetFocusedDescendant(mDocument->GetWindow(), PR_FALSE,
+                                              getter_AddRefs(focusedWindow));
 }
 
 //-------------------------------------------------------
@@ -6394,258 +4206,3 @@ nsEventStateManager::IsShellVisible(nsIDocShell* aShell)
 
   return isVisible;
 }
-
-//------------------------------------------------
-// This method should be called when tab or F6/ctrl-tab
-// traversal wants to focus a new document.  It will focus
-// the docshell, traverse into the document if this type
-// of document does not get document focus (i.e. framsets
-// and chrome), and update the canvas focus state on the docshell.
-
-void
-nsEventStateManager::TabIntoDocument(nsIDocShell* aDocShell,
-                                     PRBool aForward)
-{
-  NS_ASSERTION(aDocShell, "null docshell");
-  nsCOMPtr<nsIDOMWindowInternal> domwin = do_GetInterface(aDocShell);
-  if (domwin)
-    domwin->Focus();
-
-  PRInt32 itemType;
-  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(aDocShell);
-  treeItem->GetItemType(&itemType);
-
-  nsCOMPtr<nsPresContext> presContext;
-  aDocShell->GetPresContext(getter_AddRefs(presContext));
-  PRBool focusDocument;
-  if (presContext &&
-      presContext->Type() == nsPresContext::eContext_PrintPreview) {
-    // Don't focus any content in print preview mode, bug 244128.
-    focusDocument = PR_TRUE;
-  } else {
-    if (!aForward || (itemType == nsIDocShellTreeItem::typeChrome))
-      focusDocument = PR_FALSE;
-    else {
-      // Check for a frameset document
-      focusDocument = !(IsFrameSetDoc(aDocShell));
-    }
-  }
-
-  if (focusDocument) {
-    // make sure we're in view
-    aDocShell->SetCanvasHasFocus(PR_TRUE);
-  }
-  else {
-    aDocShell->SetHasFocus(PR_FALSE);
-
-    if (presContext) {
-      nsIEventStateManager *docESM = presContext->EventStateManager();
-
-      // we are about to shift focus to aDocShell
-      // keep track of the document, so we don't try to go back into it.
-      mTabbingFromDocShells.AppendObject(aDocShell);
-
-      // clear out any existing focus state
-      docESM->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-      // now focus the first (or last) focusable content
-      docESM->ShiftFocus(aForward, nsnull);
-
-      // remove the document from the list
-      mTabbingFromDocShells.RemoveObject(aDocShell);
-    }
-  }
-}
-
-void
-nsEventStateManager::GetLastChildDocShell(nsIDocShellTreeItem* aItem,
-                                          nsIDocShellTreeItem** aResult)
-{
-  NS_ASSERTION(aItem, "null docshell");
-  NS_ASSERTION(aResult, "null out pointer");
-
-  nsCOMPtr<nsIDocShellTreeItem> curItem = do_QueryInterface(aItem);
-  while (1) {
-    nsCOMPtr<nsIDocShellTreeNode> curNode = do_QueryInterface(curItem);
-    PRInt32 childCount = 0;
-    curNode->GetChildCount(&childCount);
-    if (!childCount) {
-      *aResult = curItem;
-      NS_ADDREF(*aResult);
-      return;
-    }
-
-    curNode->GetChildAt(childCount - 1, getter_AddRefs(curItem));
-  }
-}
-
-void
-nsEventStateManager::GetNextDocShell(nsIDocShellTreeNode* aNode,
-                                     nsIDocShellTreeItem** aResult)
-{
-  NS_ASSERTION(aNode, "null docshell");
-  NS_ASSERTION(aResult, "null out pointer");
-
-  *aResult = nsnull;
-
-  PRInt32 childCount = 0;
-  aNode->GetChildCount(&childCount);
-  if (childCount) {
-    aNode->GetChildAt(0, aResult);
-    if (*aResult)
-      return;
-  }
-
-  nsCOMPtr<nsIDocShellTreeNode> curNode = aNode;
-  while (curNode) {
-    nsCOMPtr<nsIDocShellTreeItem> curItem = do_QueryInterface(curNode);
-    nsCOMPtr<nsIDocShellTreeItem> parentItem;
-    curItem->GetParent(getter_AddRefs(parentItem));
-    if (!parentItem) {
-      *aResult = nsnull;
-      return;
-    }
-
-    // Note that we avoid using GetChildOffset() here because docshell
-    // child offsets can't be trusted to be correct. bug 162283.
-    nsCOMPtr<nsIDocShellTreeNode> parentNode = do_QueryInterface(parentItem);
-    nsCOMPtr<nsIDocShellTreeItem> iterItem;
-    childCount = 0;
-    parentNode->GetChildCount(&childCount);
-    for (PRInt32 index = 0; index < childCount; ++index) {
-      parentNode->GetChildAt(index, getter_AddRefs(iterItem));
-      if (iterItem == curItem) {
-        ++index;
-        if (index < childCount) {
-          parentNode->GetChildAt(index, aResult);
-          if (*aResult)
-            return;
-        }
-        break;
-      }
-    }
-
-    curNode = do_QueryInterface(parentItem);
-  }
-}
-
-void
-nsEventStateManager::GetPrevDocShell(nsIDocShellTreeNode* aNode,
-                                     nsIDocShellTreeItem** aResult)
-{
-  NS_ASSERTION(aNode, "null docshell");
-  NS_ASSERTION(aResult, "null out pointer");
-
-  nsCOMPtr<nsIDocShellTreeItem> curItem = do_QueryInterface(aNode);
-  nsCOMPtr<nsIDocShellTreeItem> parentItem;
-
-  curItem->GetParent(getter_AddRefs(parentItem));
-  if (!parentItem) {
-    *aResult = nsnull;
-    return;
-  }
-
-  // Note that we avoid using GetChildOffset() here because docshell
-  // child offsets can't be trusted to be correct. bug 162283.
-  nsCOMPtr<nsIDocShellTreeNode> parentNode = do_QueryInterface(parentItem);
-  PRInt32 childCount = 0;
-  parentNode->GetChildCount(&childCount);
-  nsCOMPtr<nsIDocShellTreeItem> prevItem, iterItem;
-  for (PRInt32 index = 0; index < childCount; ++index) {
-    parentNode->GetChildAt(index, getter_AddRefs(iterItem));
-    if (iterItem == curItem)
-      break;
-    prevItem = iterItem;
-  }
-
-  if (prevItem) {
-    curItem = prevItem;
-    nsCOMPtr<nsIDocShellTreeNode> curNode;
-    // Get the last child recursively of this node.
-    while (1) {
-      curNode = do_QueryInterface(curItem);
-      childCount = 0;
-      curNode->GetChildCount(&childCount);
-      if (!childCount)
-        break;
-
-      curNode->GetChildAt(childCount - 1, getter_AddRefs(curItem));
-    }
-
-    *aResult = curItem;
-    NS_ADDREF(*aResult);
-    return;
-  }
-
-  *aResult = parentItem;
-  NS_ADDREF(*aResult);
-  return;
-}
-
-//-------------------------------------------------
-// Traversal by document/DocShell only
-// this does not include any content inside the doc
-// or IFrames
-void
-nsEventStateManager::ShiftFocusByDoc(PRBool aForward)
-{
-  // Note that we use the docshell tree here instead of iteratively calling
-  // ShiftFocus.  The docshell tree should be kept in depth-first frame tree
-  // order, the same as we use for tabbing, so the effect should be the same,
-  // but this is much faster.
-
-  NS_ASSERTION(mPresContext, "no prescontext");
-
-  nsCOMPtr<nsISupports> pcContainer = mPresContext->GetContainer();
-  nsCOMPtr<nsIDocShellTreeNode> curNode = do_QueryInterface(pcContainer);
-  if (!curNode) {
-    return;
-  }
-
-  // perform a depth first search (preorder) of the docshell tree
-  // looking for an HTML Frame or a chrome document
-
-  nsCOMPtr<nsIDocShellTreeItem> nextItem;
-  nsCOMPtr<nsIDocShell> nextShell;
-  do {
-    if (aForward) {
-      GetNextDocShell(curNode, getter_AddRefs(nextItem));
-      if (!nextItem) {
-        nsCOMPtr<nsIDocShellTreeItem> curItem = do_QueryInterface(pcContainer);
-        // wrap around to the beginning, which is the top of the tree
-        curItem->GetRootTreeItem(getter_AddRefs(nextItem));
-      }
-    }
-    else {
-      GetPrevDocShell(curNode, getter_AddRefs(nextItem));
-      if (!nextItem) {
-        nsCOMPtr<nsIDocShellTreeItem> curItem = do_QueryInterface(pcContainer);
-        // wrap around to the end, which is the last node in the tree
-        nsCOMPtr<nsIDocShellTreeItem> rootItem;
-        curItem->GetRootTreeItem(getter_AddRefs(rootItem));
-        GetLastChildDocShell(rootItem, getter_AddRefs(nextItem));
-      }
-    }
-
-    curNode = do_QueryInterface(nextItem);
-    nextShell = do_QueryInterface(nextItem);
-  } while (IsFrameSetDoc(nextShell) || IsIFrameDoc(nextShell) || !IsShellVisible(nextShell));
-
-  if (nextShell) {
-    // NOTE: always tab forward into the document, this ensures that we
-    // focus the document itself, not its last focusable content.
-    // chrome documents will get their first focusable content focused.
-    SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-    TabIntoDocument(nextShell, PR_TRUE);
-  }
-}
-
-// Get the FocusController given an nsIDocument
-nsIFocusController*
-nsEventStateManager::GetFocusControllerForDocument(nsIDocument* aDocument)
-{
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  nsCOMPtr<nsPIDOMWindow> windowPrivate = do_GetInterface(container);
-
-  return windowPrivate ? windowPrivate->GetRootFocusController() : nsnull;
-}
-
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index e4b0f51f7df4..bcbd70c21a4d 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -121,11 +121,7 @@ public:
 
   NS_IMETHOD GetContentState(nsIContent *aContent, PRInt32& aState);
   virtual PRBool SetContentState(nsIContent *aContent, PRInt32 aState);
-  NS_IMETHOD GetFocusedContent(nsIContent **aContent);
-  NS_IMETHOD SetFocusedContent(nsIContent* aContent);
-  NS_IMETHOD GetLastFocusedContent(nsIContent **aContent);
-  NS_IMETHOD GetFocusedFrame(nsIFrame **aFrame);
-  NS_IMETHOD ContentRemoved(nsIContent* aContent);
+  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
   NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK);
 
   // Access Key Registration
@@ -137,15 +133,6 @@ public:
                        PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
                        nsIWidget* aWidget, PRBool aLockCursor);
 
-  NS_IMETHOD ShiftFocus(PRBool aForward, nsIContent* aStart=nsnull);
-
-  virtual PRBool GetBrowseWithCaret();
-  void ResetBrowseWithCaret();
-
-  NS_IMETHOD MoveFocusToCaret(PRBool aCanFocusDoc, PRBool *aIsSelectionWithFocus);
-  NS_IMETHOD MoveCaretToFocus();
-  NS_IMETHOD ChangeFocusWith(nsIContent* aFocus, EFocusedWithType aFocusedWith);
-
   static void StartHandlingUserInput()
   {
     ++sUserInputEventDepth;
@@ -167,14 +154,6 @@ public:
                                            nsIEventStateManager)
 
 protected:
-  /**
-   * In certain situations the focus controller's concept of focus gets out of
-   * whack with mCurrentFocus. This is used in known cases to reset the focus
-   * controller's focus. At some point we should probably move to a single
-   * focus storage mechanism because tracking it in several places is error-prone.
-   */
-  void EnsureFocusSynchronization();
-
   void UpdateCursor(nsPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus);
   /**
    * Turn a GUI mouse event into a mouse event targeted at the specified
@@ -221,20 +200,8 @@ protected:
                            nsWeakFrame& aTargetFrame);
   nsresult SetClickCount(nsPresContext* aPresContext, nsMouseEvent *aEvent, nsEventStatus* aStatus);
   nsresult CheckForAndDispatchClick(nsPresContext* aPresContext, nsMouseEvent *aEvent, nsEventStatus* aStatus);
-  nsresult GetNextTabbableContent(nsIContent* aRootContent,
-                                  nsIContent* aStartContent,
-                                  nsIFrame* aStartFrame,
-                                  PRBool forward, PRBool ignoreTabIndex,
-                                  nsIContent** aResultNode,
-                                  nsIFrame** aResultFrame);
-  nsIContent *GetNextTabbableMapArea(PRBool aForward, nsIContent *imageContent);
-
-  PRInt32 GetNextTabIndex(nsIContent* aParent, PRBool foward);
-  nsresult SendFocusBlur(nsPresContext* aPresContext, nsIContent *aContent, PRBool aEnsureWindowHasFocus);
-  void EnsureDocument(nsIPresShell* aPresShell);
   void EnsureDocument(nsPresContext* aPresContext);
   void FlushPendingEvents(nsPresContext* aPresContext);
-  nsIFocusController* GetFocusControllerForDocument(nsIDocument* aDocument);
 
   /**
    * The phases of HandleAccessKey processing. See below.
@@ -278,18 +245,8 @@ protected:
   // DocShell Focus Traversal Methods
   //---------------------------------------------
 
-  nsresult ShiftFocusInternal(PRBool aForward, nsIContent* aStart = nsnull);
-  void TabIntoDocument(nsIDocShell* aDocShell, PRBool aForward);
-  void ShiftFocusByDoc(PRBool forward);
-  PRBool IsFrameSetDoc(nsIDocShell* aDocShell);
-  PRBool IsIFrameDoc(nsIDocShell* aDocShell);
+  nsIContent* GetFocusedContent();
   PRBool IsShellVisible(nsIDocShell* aShell);
-  void GetLastChildDocShell(nsIDocShellTreeItem* aItem,
-                            nsIDocShellTreeItem** aResult);
-  void GetNextDocShell(nsIDocShellTreeNode* aNode,
-                       nsIDocShellTreeItem** aResult);
-  void GetPrevDocShell(nsIDocShellTreeNode* aNode,
-                       nsIDocShellTreeItem** aResult);
 
   // These functions are for mousewheel and pixel scrolling
   nsresult GetParentScrollingView(nsInputEvent* aEvent,
@@ -369,16 +326,6 @@ protected:
    */
   void FillInEventFromGestureDown(nsMouseEvent* aEvent);
 
-  PRBool mSuppressFocusChange; // Used only for Ender text fields to suppress a focus firing on mouse down
-
-  nsresult SetCaretEnabled(nsIPresShell *aPresShell, PRBool aVisibility);
-  nsresult SetContentCaretVisible(nsIPresShell* aPresShell, nsIContent *aContent, PRBool aVisible);
-  void FocusElementButNotDocument(nsIContent *aElement);
-
-  // Return the location of the caret
-  nsresult GetDocSelectionLocation(nsIContent **start, nsIContent **end, 
-                                   nsIFrame **startFrame, PRUint32 *startOffset);
-
   PRInt32     mLockCursor;
 
   nsWeakFrame mCurrentTarget;
@@ -409,20 +356,6 @@ protected:
   nsCOMPtr<nsIContent> mHoverContent;
   nsCOMPtr<nsIContent> mDragOverContent;
   nsCOMPtr<nsIContent> mURLTargetContent;
-  nsCOMPtr<nsIContent> mCurrentFocus;
-  nsCOMPtr<nsIContent> mLastFocus;
-  nsWeakFrame mCurrentFocusFrame;
-  PRInt32 mCurrentTabIndex;
-  EFocusedWithType mLastFocusedWith;
-
-  // DocShell Traversal Data Memebers
-  nsCOMPtr<nsIContent> mLastContentFocus;
-
-  //Anti-recursive stack controls
-
-  nsCOMPtr<nsIContent> mFirstBlurEvent;
-  nsCOMPtr<nsIDocument> mFirstDocumentBlurEvent;
-  nsCOMPtr<nsIContent> mFirstFocusEvent;
 
   // The last element on which we fired a mouseover event, or null if
   // the last mouseover event we fired has finished processing.
@@ -443,17 +376,9 @@ protected:
 
   PRPackedBool m_haveShutdown;
 
-  // So we don't have to keep checking accessibility.browsewithcaret pref
-  PRPackedBool mBrowseWithCaret;
-
-  // Recursion guard for tabbing
-  PRPackedBool mTabbedThroughDocument;
-
   // Array for accesskey support
   nsCOMArray<nsIContent> mAccessKeys;
 
-  nsCOMArray<nsIDocShell> mTabbingFromDocShells;
-
   // Unlocks pixel scrolling
   PRPackedBool mLastLineScrollConsumedX;
   PRPackedBool mLastLineScrollConsumedY;
diff --git a/content/events/src/nsIMEStateManager.cpp b/content/events/src/nsIMEStateManager.cpp
index f7c5fa9566eb..59a43fe39493 100644
--- a/content/events/src/nsIMEStateManager.cpp
+++ b/content/events/src/nsIMEStateManager.cpp
@@ -51,7 +51,6 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIFocusController.h"
 #include "nsIDOMWindow.h"
 #include "nsContentUtils.h"
 #include "nsINode.h"
@@ -71,7 +70,6 @@
 
 nsIContent*    nsIMEStateManager::sContent      = nsnull;
 nsPresContext* nsIMEStateManager::sPresContext  = nsnull;
-nsPIDOMWindow* nsIMEStateManager::sActiveWindow = nsnull;
 PRBool         nsIMEStateManager::sInstalledMenuKeyboardListener = PR_FALSE;
 
 nsTextStateManager* nsIMEStateManager::sTextStateObserver = nsnull;
@@ -118,11 +116,6 @@ nsIMEStateManager::OnChangeFocus(nsPresContext* aPresContext,
 {
   NS_ENSURE_ARG_POINTER(aPresContext);
 
-  if (!IsActive(aPresContext)) {
-    // The actual focus isn't changing, because this presContext isn't active.
-    return NS_OK;
-  }
-
   nsCOMPtr<nsIWidget> widget = GetWidget(aPresContext);
   if (!widget) {
     return NS_OK;
@@ -171,29 +164,6 @@ nsIMEStateManager::OnChangeFocus(nsPresContext* aPresContext,
   return NS_OK;
 }
 
-nsresult
-nsIMEStateManager::OnActivate(nsPresContext* aPresContext)
-{
-  NS_ENSURE_ARG_POINTER(aPresContext);
-  sActiveWindow = aPresContext->Document()->GetWindow();
-  NS_ENSURE_TRUE(sActiveWindow, NS_ERROR_FAILURE);
-  sActiveWindow = sActiveWindow->GetPrivateRoot();
-  return NS_OK;
-}
-
-nsresult
-nsIMEStateManager::OnDeactivate(nsPresContext* aPresContext)
-{
-  NS_ENSURE_ARG_POINTER(aPresContext);
-  NS_ENSURE_TRUE(aPresContext->Document()->GetWindow(), NS_ERROR_FAILURE);
-  if (sActiveWindow !=
-      aPresContext->Document()->GetWindow()->GetPrivateRoot())
-    return NS_OK;
-
-  sActiveWindow = nsnull;
-  return NS_OK;
-}
-
 void
 nsIMEStateManager::OnInstalledMenuKeyboardListener(PRBool aInstalling)
 {
@@ -201,37 +171,6 @@ nsIMEStateManager::OnInstalledMenuKeyboardListener(PRBool aInstalling)
   OnChangeFocus(sPresContext, sContent);
 }
 
-PRBool
-nsIMEStateManager::IsActive(nsPresContext* aPresContext)
-{
-  NS_ENSURE_TRUE(aPresContext, PR_FALSE);
-  nsPIDOMWindow* window = aPresContext->Document()->GetWindow();
-  NS_ENSURE_TRUE(window, PR_FALSE);
-  if (!sActiveWindow || sActiveWindow != window->GetPrivateRoot()) {
-    // This root window is not active.
-    return PR_FALSE;
-  }
-
-  nsIPresShell* shell = aPresContext->GetPresShell();
-  NS_ENSURE_TRUE(shell, PR_FALSE);
-  nsIViewManager* vm = shell->GetViewManager();
-  NS_ENSURE_TRUE(vm, PR_FALSE);
-  nsCOMPtr<nsIViewObserver> observer;
-  vm->GetViewObserver(*getter_AddRefs(observer));
-  NS_ENSURE_TRUE(observer, PR_FALSE);
-  return observer->IsVisible();
-}
-
-nsIFocusController*
-nsIMEStateManager::GetFocusController(nsPresContext* aPresContext)
-{
-  nsCOMPtr<nsISupports> container =
-    aPresContext->Document()->GetContainer();
-  nsCOMPtr<nsPIDOMWindow> windowPrivate = do_GetInterface(container);
-
-  return windowPrivate ? windowPrivate->GetRootFocusController() : nsnull;
-}
-
 PRUint32
 nsIMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
                                   nsIContent*    aContent)
diff --git a/content/events/src/nsIMEStateManager.h b/content/events/src/nsIMEStateManager.h
index 1c80693643fd..9fddcc49dc78 100644
--- a/content/events/src/nsIMEStateManager.h
+++ b/content/events/src/nsIMEStateManager.h
@@ -61,8 +61,6 @@ public:
                                   nsIContent* aContent);
   static nsresult OnChangeFocus(nsPresContext* aPresContext,
                                 nsIContent* aContent);
-  static nsresult OnActivate(nsPresContext* aPresContext);
-  static nsresult OnDeactivate(nsPresContext* aPresContext);
   static void OnInstalledMenuKeyboardListener(PRBool aInstalling);
 
   // These two methods manage focus and selection/text observers.
@@ -90,14 +88,10 @@ protected:
   static PRUint32 GetNewIMEState(nsPresContext* aPresContext,
                                  nsIContent* aContent);
 
-  static PRBool IsActive(nsPresContext* aPresContext);
-
-  static nsIFocusController* GetFocusController(nsPresContext* aPresContext);
   static nsIWidget* GetWidget(nsPresContext* aPresContext);
 
   static nsIContent*    sContent;
   static nsPresContext* sPresContext;
-  static nsPIDOMWindow* sActiveWindow;
   static PRBool         sInstalledMenuKeyboardListener;
 
   static nsTextStateManager* sTextStateObserver;
diff --git a/content/events/test/test_bug450876.html b/content/events/test/test_bug450876.html
index 77b922d7b239..0f291a9edbbe 100644
--- a/content/events/test/test_bug450876.html
+++ b/content/events/test/test_bug450876.html
@@ -27,8 +27,10 @@ function doTest() {
   is(document.activeElement, document.getElementById('a'), "link should have focus");
   var wu =  window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                 .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  is(document.hasFocus(), true, "document should be focused");
   wu.sendKeyEvent('keypress',  9, 0, 0);
-  is(document.activeElement, document.body, "body element should be focused");
+  is(document.activeElement, document.getElementById('a'), "body element should be focused");
+  is(document.hasFocus(), false, "document should not be focused");
 
   SimpleTest.finish();
 }
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index f36c798d82cd..52f599eb8b38 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -76,6 +76,7 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
 #include "nsINameSpaceManager.h"
 #include "nsDOMError.h"
 #include "nsScriptLoader.h"
@@ -97,6 +98,7 @@
 #include "nsIForm.h"
 #include "nsIFormControl.h"
 #include "nsIDOMHTMLFormElement.h"
+#include "nsFocusManager.h"
 
 #include "nsMutationEvent.h"
 
@@ -305,8 +307,7 @@ nsGenericHTMLElement::SetAttribute(const nsAString& aName,
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIAtom> nameAtom;
-    if (GetOwnerDoc() // XXX clean up after bug 335998 lands
-        && !(GetOwnerDoc()->IsCaseSensitive())) {
+    if (IsInHTMLDocument()) {
       nsAutoString lower;
       ToLowerCase(aName, lower);
       nameAtom = do_GetAtom(lower);
@@ -328,8 +329,7 @@ nsGenericHTMLElement::GetNodeName(nsAString& aNodeName)
 {
   mNodeInfo->GetQualifiedName(aNodeName);
 
-  if (GetOwnerDoc() // XXX clean up after bug 335998 lands
-      && !(GetOwnerDoc()->IsCaseSensitive()))
+  if (IsInHTMLDocument())
     ToUpperCase(aNodeName);
 
   return NS_OK;
@@ -342,8 +342,7 @@ nsGenericHTMLElement::GetElementsByTagName(const nsAString& aTagname,
   nsAutoString tagName(aTagname);
 
   // Only lowercase the name if this is an HTML document.
-  if (GetOwnerDoc() // XXX clean up after bug 335998 lands
-      && !(GetOwnerDoc()->IsCaseSensitive()))
+  if (IsInHTMLDocument())
     ToLowerCase(tagName);
 
   return nsGenericHTMLElementBase::GetElementsByTagName(tagName, aReturn);
@@ -641,8 +640,7 @@ nsGenericHTMLElement::GetInnerHTML(nsAString& aInnerHTML)
   nsresult rv = NS_OK;
 
   nsAutoString contentType;
-  if (!doc->IsCaseSensitive()) {
-    // All case-insensitive documents are HTML as far as we're concerned
+  if (IsInHTMLDocument()) {
     contentType.AssignLiteral("text/html");
   } else {
     doc->GetContentType(contentType);
@@ -1170,8 +1168,6 @@ nsGenericHTMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
 already_AddRefed<nsIURI>
 nsGenericHTMLElement::GetBaseURI() const
 {
-  nsIDocument* doc = GetOwnerDoc(); // XXX clean up after bug 335998 lands
-
   void* prop;
   if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseHref))) {
     nsIURI* uri = static_cast<nsIURI*>(prop);
@@ -1182,8 +1178,9 @@ nsGenericHTMLElement::GetBaseURI() const
 
   // If we are a plain old HTML element (not XHTML), don't bother asking the
   // base class -- our base URI is determined solely by the document base.
-  if (doc && !(doc->IsCaseSensitive())) {
-    nsIURI *uri = doc->GetBaseURI();
+  if (IsInHTMLDocument()) {
+    // If we got here, GetOwnerDoc() is not null
+    nsIURI *uri = GetOwnerDoc()->GetBaseURI();
     NS_IF_ADDREF(uri);
 
     return uri;
@@ -2601,6 +2598,35 @@ nsGenericHTMLFormElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                                             aValue, aNotify);
 }
 
+nsresult
+nsGenericHTMLFormElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
+{
+  if (NS_IS_TRUSTED_EVENT(aVisitor.mEvent)) {
+    switch (aVisitor.mEvent->message) {
+      case NS_FOCUS_CONTENT:
+      {
+        // Check to see if focus has bubbled up from a form control's
+        // child textfield or button.  If that's the case, don't focus
+        // this parent file control -- leave focus on the child.
+        nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_TRUE);
+        if (formControlFrame &&
+            aVisitor.mEvent->originalTarget == static_cast<nsINode*>(this))
+          formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
+        break;
+      }
+      case NS_BLUR_CONTENT:
+      {
+        nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_TRUE);
+        if (formControlFrame)
+          formControlFrame->SetFocus(PR_FALSE, PR_FALSE);
+        break;
+      }
+    }
+  }
+
+  return nsGenericHTMLElement::PreHandleEvent(aVisitor);
+}
+
 PRBool
 nsGenericHTMLFormElement::CanBeDisabled() const
 {
@@ -2656,37 +2682,6 @@ nsGenericHTMLFormElement::IntrinsicState() const
   return state;
 }
 
-void
-nsGenericHTMLFormElement::SetFocusAndScrollIntoView(nsPresContext* aPresContext)
-{
-  nsIEventStateManager *esm = aPresContext->EventStateManager();
-  if (esm->SetContentState(this, NS_EVENT_STATE_FOCUS)) {
-    // XXXldb once bug 43114 is fixed, we don't need to flush here.
-    aPresContext->Document()->
-      FlushPendingNotifications(Flush_InterruptibleLayout);
-    nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_FALSE);
-    if (formControlFrame) {
-      formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
-      nsCOMPtr<nsIPresShell> presShell = aPresContext->GetPresShell();
-      if (presShell) {
-        presShell->ScrollContentIntoView(this, NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
-                                         NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-      }
-    }
-  }
-}
-
-void
-nsGenericHTMLFormElement::DoSetFocus(nsPresContext* aPresContext)
-{
-  if (!aPresContext)
-    return;
-
-  if (FocusState() == eActiveWindow) {
-    SetFocusAndScrollIntoView(aPresContext);
-  }
-}
-
 nsGenericHTMLFormElement::FocusTristate
 nsGenericHTMLFormElement::FocusState()
 {
@@ -2703,24 +2698,23 @@ nsGenericHTMLFormElement::FocusState()
   // If the window is not active, do not allow the focus to bring the
   // window to the front.  We update the focus controller, but do
   // nothing else.
-  nsCOMPtr<nsPIDOMWindow> win = doc->GetWindow();
-  if (win) {
-    nsIFocusController *focusController = win->GetRootFocusController();
-    if (focusController) {
-      PRBool isActive = PR_FALSE;
-      focusController->GetActive(&isActive);
-      if (!isActive) {
-        focusController->SetFocusedWindow(win);
-        nsCOMPtr<nsIDOMElement> el =
-          do_QueryInterface(static_cast<nsGenericHTMLElement*>(this));
-        focusController->SetFocusedElement(el);
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_GetInterface(doc->GetWindow());
+  if (dsti) {
+    nsCOMPtr<nsIDocShellTreeItem> root;
+    dsti->GetRootTreeItem(getter_AddRefs(root));
+    nsCOMPtr<nsIDOMWindow> rootWindow = do_GetInterface(root);
 
-        return eInactiveWindow;
+    nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+    if (fm && rootWindow) {
+      nsCOMPtr<nsIDOMWindow> activeWindow;
+      fm->GetActiveWindow(getter_AddRefs(activeWindow));
+      if (activeWindow == rootWindow) {
+        return eActiveWindow;
       }
     }
   }
 
-  return eActiveWindow;
+  return eInactiveWindow;
 }
 
 //----------------------------------------------------------------------
@@ -2912,34 +2906,19 @@ nsGenericHTMLFrameElement::DestroyContent()
 
 //----------------------------------------------------------------------
 
-void
-nsGenericHTMLElement::SetElementFocus(PRBool aDoFocus)
-{
-  nsCOMPtr<nsPresContext> presContext = GetPresContext();
-  if (!presContext)
-    return;
-
-  if (aDoFocus) {
-    if (IsInDoc()) {
-      // Make sure that our frames are up to date so we focus the right thing.
-      GetCurrentDoc()->FlushPendingNotifications(Flush_Frames);
-    }
-
-    SetFocus(presContext);
-
-    presContext->EventStateManager()->MoveCaretToFocus();
-    return;
-  }
-
-  RemoveFocus(presContext);
-}
-
 nsresult
 nsGenericHTMLElement::Blur()
 {
-  if (ShouldBlur(this)) {
-    SetElementFocus(PR_FALSE);
-  }
+  if (!ShouldBlur(this))
+    return NS_OK;
+
+  nsIDocument* doc = GetCurrentDoc();
+  if (!doc)
+    return NS_OK;
+
+  nsIDOMWindow* win = doc->GetWindow();
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  return (win && fm) ? fm->ClearFocus(win) : NS_OK;
 
   return NS_OK;
 }
@@ -2947,33 +2926,9 @@ nsGenericHTMLElement::Blur()
 nsresult
 nsGenericHTMLElement::Focus()
 {
-  // Generic HTML elements are focusable only if tabindex explicitly set.
-  // SetFocus() will check to see if we're focusable and then
-  // call into esm to do the work of focusing.
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_TRUE);
-  }
-
-  return NS_OK;
-}
-
-void
-nsGenericHTMLElement::RemoveFocus(nsPresContext *aPresContext)
-{
-  if (!aPresContext) 
-    return;
-
-  if (IsNodeOfType(eHTML_FORM_CONTROL)) {
-    nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_TRUE);
-    if (formControlFrame) {
-      formControlFrame->SetFocus(PR_FALSE, PR_FALSE);
-    }
-  }
-  
-  if (IsInDoc()) {
-    aPresContext->EventStateManager()->SetContentState(nsnull,
-                                                       NS_EVENT_STATE_FOCUS);
-  }
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(this);
+  return fm ? fm->SetFocus(elem, 0) : NS_OK;
 }
 
 PRBool
@@ -2994,14 +2949,13 @@ nsGenericHTMLElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
   PRInt32 tabIndex = 0;   // Default value for non HTML elements with -moz-user-focus
   GetTabIndex(&tabIndex);
 
-  PRBool override, disabled;
+  PRBool override, disabled = PR_FALSE;
   if (IsEditableRoot()) {
     // Editable roots should always be focusable.
     override = PR_TRUE;
 
     // Ignore the disabled attribute in editable contentEditable/designMode
     // roots.
-    disabled = PR_FALSE;
     if (!HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex)) {
       // The default value for tabindex should be 0 for editable
       // contentEditable roots.
@@ -3011,7 +2965,7 @@ nsGenericHTMLElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
   else {
     override = PR_FALSE;
 
-    // Just check for disabled attribute on all HTML elements
+    // Just check for disabled attribute on form controls
     disabled = HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
     if (disabled) {
       tabIndex = -1;
@@ -3062,12 +3016,12 @@ nsGenericHTMLElement::PerformAccesskey(PRBool aKeyCausesActivation,
   if (!presContext)
     return;
 
-  nsIEventStateManager *esm = presContext->EventStateManager();
-  if (!esm)
-    return;
-
   // It's hard to say what HTML4 wants us to do in all cases.
-  esm->ChangeFocusWith(this, nsIEventStateManager::eEventFocusedByKey);
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(this);
+    fm->SetFocus(elem, nsIFocusManager::FLAG_BYKEY);
+  }
 
   if (aKeyCausesActivation) {
     // Click on it if the users prefs indicate to do so.
@@ -3427,8 +3381,7 @@ nsGenericHTMLElement::GetHashFromHrefURI(nsAString& aHash)
 const nsAttrName*
 nsGenericHTMLElement::InternalGetExistingAttrNameFromQName(const nsAString& aStr) const
 {
-  if (GetOwnerDoc() // XXX clean up after bug 335998 lands
-      && !(GetOwnerDoc()->IsCaseSensitive())) {
+  if (IsInHTMLDocument()) {
     nsAutoString lower;
     ToLowerCase(aStr, lower);
     return mAttrsAndChildren.GetExistingAttrNameFromQName(
diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h
index 205f21b20f7b..fe42ac82eb62 100644
--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@@ -172,7 +172,6 @@ public:
   virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                              PRBool aNotify);
   virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
-  virtual void RemoveFocus(nsPresContext *aPresContext);
   virtual PRBool IsFocusable(PRInt32 *aTabIndex = nsnull)
   {
     PRBool isFocusable = PR_FALSE;
@@ -544,13 +543,6 @@ public:
   NS_HIDDEN_(nsresult) GetEditorInternal(nsIEditor** aEditor);
 
 protected:
-  /**
-   * Focus or blur the element.  This is what you should call if you want to
-   * *cause* a focus or blur on your element.  SetFocus / SetBlur are the
-   * methods where you want to catch what occurs on your element.
-   * @param aDoFocus true to focus, false to blur
-   */
-  void SetElementFocus(PRBool aDoFocus);
   /**
    * Register or unregister an access key to this element based on the
    * accesskey attribute.
@@ -832,6 +824,8 @@ public:
   virtual PRUint32 GetDesiredIMEState();
   virtual PRInt32 IntrinsicState() const;
 
+  virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
+
 protected:
   virtual nsresult BeforeSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                                  const nsAString* aValue, PRBool aNotify);
@@ -846,11 +840,6 @@ protected:
 
   void UpdateEditableFormControlState();
 
-  void SetFocusAndScrollIntoView(nsPresContext* aPresContext);
-
-  // A sane SetFocus implementation for focusable form controls
-  void DoSetFocus(nsPresContext* aPresContext);
-
   // The focusability state of this form control.  eUnfocusable means that it
   // shouldn't be focused at all, eInactiveWindow means it's in an inactive
   // window, eActiveWindow means it's in an active window.
diff --git a/content/html/content/src/nsHTMLAnchorElement.cpp b/content/html/content/src/nsHTMLAnchorElement.cpp
index aa07c4ecd38f..7c619cfba765 100644
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -113,7 +113,6 @@ public:
                               PRBool aCompileEventHandlers);
   virtual void UnbindFromTree(PRBool aDeep = PR_TRUE,
                               PRBool aNullParent = PR_TRUE);
-  virtual void SetFocus(nsPresContext* aPresContext);
   virtual PRBool IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex);
 
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
@@ -240,40 +239,13 @@ nsHTMLAnchorElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
 NS_IMETHODIMP
 nsHTMLAnchorElement::Blur()
 {
-  if (ShouldBlur(this)) {
-    SetElementFocus(PR_FALSE);
-  }
-
-  return NS_OK;
+  return nsGenericHTMLElement::Blur();
 }
 
 NS_IMETHODIMP
 nsHTMLAnchorElement::Focus()
 {
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_TRUE);
-  }
-
-  return NS_OK;
-}
-
-void
-nsHTMLAnchorElement::SetFocus(nsPresContext* aPresContext)
-{
-  if (!aPresContext) {
-    return;
-  }
-
-  // don't make the link grab the focus if there is no link handler
-  nsILinkHandler *handler = aPresContext->GetLinkHandler();
-  if (handler && aPresContext->EventStateManager()->
-                               SetContentState(this, NS_EVENT_STATE_FOCUS)) {
-    nsCOMPtr<nsIPresShell> presShell = aPresContext->GetPresShell();
-    if (presShell) {
-      presShell->ScrollContentIntoView(this, NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
-                                       NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
-    }
-  }
+  return nsGenericHTMLElement::Focus();
 }
 
 PRBool
@@ -283,6 +255,19 @@ nsHTMLAnchorElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
     return PR_TRUE;
   }
 
+  // cannot focus links if there is no link handler
+  nsIDocument* doc = GetCurrentDoc();
+  if (doc) {
+    nsIPresShell* presShell = doc->GetPrimaryShell();
+    if (presShell) {
+      nsPresContext* presContext = presShell->GetPresContext();
+      if (presContext && !presContext->GetLinkHandler()) {
+        *aIsFocusable = PR_FALSE;
+        return PR_FALSE;
+      }
+    }
+  }
+
   if (IsEditable()) {
     if (aTabIndex) {
       *aTabIndex = -1;
diff --git a/content/html/content/src/nsHTMLAreaElement.cpp b/content/html/content/src/nsHTMLAreaElement.cpp
index 39b442704bed..fe9ade6ba93a 100644
--- a/content/html/content/src/nsHTMLAreaElement.cpp
+++ b/content/html/content/src/nsHTMLAreaElement.cpp
@@ -92,8 +92,6 @@ public:
   virtual PRBool IsLink(nsIURI** aURI) const;
   virtual void GetLinkTarget(nsAString& aTarget);
 
-  virtual void SetFocus(nsPresContext* aPresContext);
-
   virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                               nsIContent* aBindingParent,
                               PRBool aCompileEventHandlers);
@@ -200,21 +198,6 @@ nsHTMLAreaElement::GetLinkTarget(nsAString& aTarget)
   }
 }
 
-void
-nsHTMLAreaElement::SetFocus(nsPresContext* aPresContext)
-{
-  if (!aPresContext ||
-      !aPresContext->EventStateManager()->SetContentState(this, 
-                                                          NS_EVENT_STATE_FOCUS)) {
-    return;
-  }
-  nsCOMPtr<nsIPresShell> presShell = aPresContext->GetPresShell();
-  if (presShell) {
-    presShell->ScrollContentIntoView(this, NS_PRESSHELL_SCROLL_ANYWHERE,
-                                     NS_PRESSHELL_SCROLL_ANYWHERE);
-  }
-}
-
 nsresult
 nsHTMLAreaElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                               nsIContent* aBindingParent,
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 2a0dba84dc25..7df47786deb8 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -60,6 +60,7 @@
 #include "nsEventDispatcher.h"
 #include "nsPresState.h"
 #include "nsLayoutErrors.h"
+#include "nsFocusManager.h"
 
 #define NS_IN_SUBMIT_CLICK      (1 << 0)
 #define NS_OUTER_ACTIVATE_EVENT (1 << 1)
@@ -110,7 +111,6 @@ public:
                                  const nsAString* aValue, PRBool aNotify);
   
   // nsIContent overrides...
-  virtual void SetFocus(nsPresContext* aPresContext);
   virtual PRBool IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex);
   virtual PRBool ParseAttribute(PRInt32 aNamespaceID,
                                 nsIAtom* aAttribute,
@@ -193,21 +193,13 @@ NS_IMPL_STRING_ATTR_DEFAULT_VALUE(nsHTMLButtonElement, Type, type, "submit")
 NS_IMETHODIMP
 nsHTMLButtonElement::Blur()
 {
-  if (ShouldBlur(this)) {
-    SetElementFocus(PR_FALSE);
-  }
-
-  return NS_OK;
+  return nsGenericHTMLElement::Blur();
 }
 
 NS_IMETHODIMP
 nsHTMLButtonElement::Focus()
 {
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_TRUE);
-  }
-
-  return NS_OK;
+  return nsGenericHTMLElement::Focus();
 }
 
 NS_IMETHODIMP
@@ -254,17 +246,11 @@ nsHTMLButtonElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
     *aTabIndex = -1;
   }
 
-  *aIsFocusable = PR_TRUE;
+  *aIsFocusable = !HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
 
   return PR_FALSE;
 }
 
-void
-nsHTMLButtonElement::SetFocus(nsPresContext* aPresContext)
-{
-  DoSetFocus(aPresContext);
-}
-
 static const nsAttrValue::EnumTable kButtonTypeTable[] = {
   { "button", NS_FORM_BUTTON_BUTTON },
   { "reset", NS_FORM_BUTTON_RESET },
@@ -404,7 +390,11 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
             if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                   nsMouseEvent::eLeftButton) {
               aVisitor.mPresContext->EventStateManager()->
-                SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS);
+                SetContentState(this, NS_EVENT_STATE_ACTIVE);
+              nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+              if (fm)
+                fm->SetFocus(this, nsIFocusManager::FLAG_BYMOUSE |
+                                   nsIFocusManager::FLAG_NOSCROLL);
               aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
             } else if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                          nsMouseEvent::eMiddleButton ||
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 3de9f4b64485..5957b8cf2b0c 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -46,6 +46,7 @@
 #include "nsIPhonetic.h"
 
 #include "nsIControllers.h"
+#include "nsFocusManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsContentCID.h"
 #include "nsIComponentManager.h"
@@ -86,6 +87,8 @@
 #include "nsUnicharUtils.h"
 #include "nsEventDispatcher.h"
 #include "nsLayoutUtils.h"
+#include "nsWidgetsCID.h"
+#include "nsILookAndFeel.h"
 
 #include "nsIDOMMutationEvent.h"
 #include "nsIDOMEventTarget.h"
@@ -116,6 +119,8 @@
 // XXX align=left, hspace, vspace, border? other nav4 attrs
 
 static NS_DEFINE_CID(kXULControllersCID,  NS_XULCONTROLLERS_CID);
+static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
+
 //
 // Accessors for mBitField
 //
@@ -148,6 +153,10 @@ static NS_DEFINE_CID(kXULControllersCID,  NS_XULCONTROLLERS_CID);
 
 static const char kWhitespace[] = "\n\r\t\b";
 
+// whether textfields should be selected once focused:
+//  -1: no, 1: yes, 0: uninitialized
+static PRInt32 gSelectTextFieldOnFocus;
+
 #define NS_INPUT_ELEMENT_STATE_IID                 \
 { /* dc3b3d14-23e2-4479-b513-7b369343e3a0 */       \
   0xdc3b3d14,                                      \
@@ -260,7 +269,6 @@ public:
   virtual PRBool AllowDrop();
 
   // nsIContent
-  virtual void SetFocus(nsPresContext* aPresContext);
   virtual PRBool IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex);
 
   virtual PRBool ParseAttribute(PRInt32 aNamespaceID,
@@ -280,7 +288,7 @@ public:
                               PRBool aCompileEventHandlers);
   virtual void UnbindFromTree(PRBool aDeep = PR_TRUE,
                               PRBool aNullParent = PR_TRUE);
-  
+
   virtual void DoneCreatingElement();
 
   virtual PRInt32 IntrinsicState() const;
@@ -348,6 +356,11 @@ protected:
   virtual nsresult AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                                 const nsAString* aValue, PRBool aNotify);
 
+  /**
+   * Dispatch a select event. Returns true if the event was not cancelled.
+   */
+  PRBool DispatchSelectEvent(nsPresContext* aPresContext);
+
   void SelectAll(nsPresContext* aPresContext);
   PRBool IsImage() const
   {
@@ -1335,27 +1348,36 @@ nsHTMLInputElement::FireOnChange()
 NS_IMETHODIMP
 nsHTMLInputElement::Blur()
 {
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_FALSE);
-  }
-
-  return NS_OK;
+  return nsGenericHTMLElement::Blur();
 }
 
 NS_IMETHODIMP
 nsHTMLInputElement::Focus()
 {
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_TRUE);
+  if (mType == NS_FORM_INPUT_FILE) {
+    // for file inputs, focus the button instead
+    nsIFrame* frame = GetPrimaryFrame();
+    if (frame) {
+      nsIFrame* childFrame = frame->GetFirstChild(nsnull);
+      while (childFrame) {
+        // see if the child is a button control
+        nsCOMPtr<nsIFormControl> formCtrl =
+          do_QueryInterface(childFrame->GetContent());
+        if (formCtrl && formCtrl->GetType() == NS_FORM_INPUT_BUTTON) {
+          nsCOMPtr<nsIDOMElement> element(do_QueryInterface(formCtrl));
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          if (fm && element)
+            fm->SetFocus(element, 0);
+        }
+
+        childFrame = childFrame->GetNextSibling();
+      }
+    }
+
+    return NS_OK;
   }
 
-  return NS_OK;
-}
-
-void
-nsHTMLInputElement::SetFocus(nsPresContext* aPresContext)
-{
-  DoSetFocus(aPresContext);
+  return nsGenericHTMLElement::Focus();
 }
 
 NS_IMETHODIMP
@@ -1373,51 +1395,23 @@ nsHTMLInputElement::Select()
     return NS_OK;
   }
 
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+
   nsCOMPtr<nsPresContext> presContext = GetPresContext();
   if (state == eInactiveWindow) {
+    if (fm)
+      fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
     SelectAll(presContext);
     return NS_OK;
   }
 
-  // Just like SetFocus() but without the ScrollIntoView()!
-  nsEventStatus status = nsEventStatus_eIgnore;
-    
-  //If already handling select event, don't dispatch a second.
-  if (!GET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT)) {
-    nsEvent event(nsContentUtils::IsCallerChrome(), NS_FORM_SELECTED);
-
-    SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_TRUE);
-    nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
-                                presContext, &event, nsnull, &status);
-    SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_FALSE);
-  }
-
-  // If the DOM event was not canceled (e.g. by a JS event handler
-  // returning false)
-  if (status == nsEventStatus_eIgnore) {
-    PRBool shouldFocus = ShouldFocus(this);
-
-    if (presContext && shouldFocus) {
-      nsIEventStateManager *esm = presContext->EventStateManager();
-      // XXX Fix for bug 135345 - ESM currently does not check to see if we
-      // have focus before attempting to set focus again and may cause
-      // infinite recursion.  For now check if we have focus and do not set
-      // focus again if already focused.
-      PRInt32 currentState;
-      esm->GetContentState(this, currentState);
-      if (!(currentState & NS_EVENT_STATE_FOCUS) &&
-          !esm->SetContentState(this, NS_EVENT_STATE_FOCUS)) {
-        return NS_OK; // We ended up unfocused, e.g. due to a DOM event handler.
-      }
-    }
-
-    nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_TRUE);
-
-    if (formControlFrame) {
-      if (shouldFocus) {
-        formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
-      }
+  if (DispatchSelectEvent(presContext) && fm) {
+    fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
 
+    // ensure that the element is actually focused
+    nsCOMPtr<nsIDOMElement> focusedElement;
+    fm->GetFocusedElement(getter_AddRefs(focusedElement));
+    if (SameCOMIdentity(static_cast<nsIDOMNode *>(this), focusedElement)) {
       // Now Select all the text!
       SelectAll(presContext);
     }
@@ -1426,6 +1420,26 @@ nsHTMLInputElement::Select()
   return NS_OK;
 }
 
+PRBool
+nsHTMLInputElement::DispatchSelectEvent(nsPresContext* aPresContext)
+{
+  nsEventStatus status = nsEventStatus_eIgnore;
+
+  // If already handling select event, don't dispatch a second.
+  if (!GET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT)) {
+    nsEvent event(nsContentUtils::IsCallerChrome(), NS_FORM_SELECTED);
+
+    SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_TRUE);
+    nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
+                                aPresContext, &event, nsnull, &status);
+    SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_FALSE);
+  }
+
+  // If the DOM event was not canceled (e.g. by a JS event handler
+  // returning false)
+  return (status == nsEventStatus_eIgnore);
+}
+    
 void
 nsHTMLInputElement::SelectAll(nsPresContext* aPresContext)
 {
@@ -1638,7 +1652,26 @@ nsHTMLInputElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
     }
   }
 
-  return nsGenericHTMLElement::PreHandleEvent(aVisitor);
+  return nsGenericHTMLFormElement::PreHandleEvent(aVisitor);
+}
+
+static PRBool
+SelectTextFieldOnFocus()
+{
+  if (!gSelectTextFieldOnFocus) {
+    nsCOMPtr<nsILookAndFeel> lookNFeel(do_GetService(kLookAndFeelCID));
+    if (lookNFeel) {
+      PRInt32 selectTextfieldsOnKeyFocus = -1;
+      lookNFeel->GetMetric(nsILookAndFeel::eMetric_SelectTextfieldsOnKeyFocus,
+                           selectTextfieldsOnKeyFocus);
+      gSelectTextFieldOnFocus = selectTextfieldsOnKeyFocus != 0 ? 1 : -1;
+    }
+    else {
+      gSelectTextFieldOnFocus = -1;
+    }
+  }
+
+  return gSelectTextFieldOnFocus == 1;
 }
 
 nsresult
@@ -1747,15 +1780,24 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
 
         case NS_FOCUS_CONTENT:
         {
-          // Check to see if focus has bubbled up from a form control's
-          // child textfield or button.  If that's the case, don't focus
-          // this parent file control -- leave focus on the child.
-          nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_FALSE);
-          if (formControlFrame && ShouldFocus(this) &&
-              aVisitor.mEvent->originalTarget == static_cast<nsINode*>(this))
-            formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          if (fm && (mType == NS_FORM_INPUT_TEXT || mType == NS_FORM_INPUT_PASSWORD) &&
+              SelectTextFieldOnFocus()) {
+            // select the text if the field was focused by the keyboard.
+            nsIDocument* document = GetCurrentDoc();
+            if (document) {
+              PRUint32 lastFocusMethod;
+              fm->GetLastFocusMethod(document->GetWindow(), &lastFocusMethod);
+              if (lastFocusMethod & nsIFocusManager::FLAG_BYKEY) {
+                nsCOMPtr<nsPresContext> presContext = GetPresContext();
+                if (DispatchSelectEvent(presContext)) {
+                  SelectAll(presContext);
+                }
+              }
+            }
+          }
+          break;
         }
-        break; // NS_FOCUS_CONTENT
 
         case NS_KEY_PRESS:
         case NS_KEY_UP:
@@ -2955,13 +2997,25 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
     return PR_TRUE;
   }
 
+  if (HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) {
+    *aIsFocusable = PR_FALSE;
+    return PR_TRUE;
+  }
+
   if (mType == NS_FORM_INPUT_TEXT || mType == NS_FORM_INPUT_PASSWORD) {
     *aIsFocusable = PR_TRUE;
     return PR_FALSE;
   }
 
-  if (mType == NS_FORM_INPUT_HIDDEN || mType == NS_FORM_INPUT_FILE) {
-    // Sub controls of file input are tabbable, not the file input itself.
+  if (mType == NS_FORM_INPUT_FILE) {
+    if (aTabIndex) {
+      *aTabIndex = -1;
+    }
+    *aIsFocusable = PR_TRUE;
+    return PR_TRUE;
+  }
+
+  if (mType == NS_FORM_INPUT_HIDDEN) {
     if (aTabIndex) {
       *aTabIndex = -1;
     }
diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp
index 8bd1ff6965a4..67b1d7e4f44d 100644
--- a/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/content/html/content/src/nsHTMLLabelElement.cpp
@@ -51,6 +51,7 @@
 #include "nsIEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsPIDOMWindow.h"
+#include "nsFocusManager.h"
 
 class nsHTMLLabelElement : public nsGenericHTMLFormElement,
                            public nsIDOMHTMLLabelElement
@@ -80,6 +81,8 @@ public:
   NS_IMETHOD SubmitNamesValues(nsIFormSubmission* aFormSubmission,
                                nsIContent* aSubmitElement);
 
+  NS_IMETHOD Focus();
+
   // nsIContent
   virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                               nsIContent* aBindingParent,
@@ -89,7 +92,6 @@ public:
 
   virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
 
-  virtual void SetFocus(nsPresContext* aContext);
   nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                    const nsAString& aValue, PRBool aNotify)
   {
@@ -110,7 +112,6 @@ protected:
 
   // XXX It would be nice if we could use an event flag instead.
   PRPackedBool mHandlingEvent;
-  PRPackedBool mInSetFocus;
 };
 
 // construction, destruction
@@ -122,7 +123,6 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Label)
 nsHTMLLabelElement::nsHTMLLabelElement(nsINodeInfo *aNodeInfo)
   : nsGenericHTMLFormElement(aNodeInfo)
   , mHandlingEvent(PR_FALSE)
-  , mInSetFocus(PR_FALSE)
 {
 }
 
@@ -161,6 +161,21 @@ nsHTMLLabelElement::GetForm(nsIDOMHTMLFormElement** aForm)
 NS_IMPL_STRING_ATTR(nsHTMLLabelElement, AccessKey, accesskey)
 NS_IMPL_STRING_ATTR(nsHTMLLabelElement, HtmlFor, _for)
 
+NS_IMETHODIMP
+nsHTMLLabelElement::Focus()
+{
+  // retarget the focus method at the for content
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIContent> content = GetForContent();
+    nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(content);
+    if (elem)
+      fm->SetFocus(elem, 0);
+  }
+
+  return NS_OK;
+}
+
 nsresult
 nsHTMLLabelElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                                nsIContent* aBindingParent,
@@ -222,7 +237,6 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
 {
   if (mHandlingEvent ||
       (!NS_IS_MOUSE_LEFT_CLICK(aVisitor.mEvent) &&
-       aVisitor.mEvent->message != NS_FOCUS_CONTENT &&
        aVisitor.mEvent->message != NS_MOUSE_BUTTON_DOWN) ||
       aVisitor.mEventStatus == nsEventStatus_eConsumeNoDefault ||
       !aVisitor.mPresContext) {
@@ -276,10 +290,14 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
             break;
           }
 
-          if (ShouldFocus(this)) {
-            // Focus the for content.
-            aVisitor.mPresContext->EventStateManager()->
-              ChangeFocusWith(content, nsIEventStateManager::eEventFocusedByKey);
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          if (fm) {
+            // Use FLAG_BYKEY here so that the label is scrolled to. Also,
+            // within nsHTMLInputElement::PostHandleEvent, inputs will be
+            // selected only when focused via a key and we want to select
+            // the text on label clicks as well.
+            nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(content);
+            fm->SetFocus(elem, nsIFocusManager::FLAG_BYKEY);
           }
 
           // Dispatch a new click event to |content|
@@ -297,40 +315,12 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           // Do we care about the status this returned?  I don't think we do...
         }
         break;
-      case NS_FOCUS_CONTENT:
-        // Since we don't have '-moz-user-focus: normal', the only time
-        // the event type will be NS_FOCUS_CONTENT will be when the accesskey
-        // is activated.  We've already redirected the |SetFocus| call in that
-        // case.
-        // Since focus doesn't bubble, this is basically the second part
-        // of redirecting |SetFocus|.
-        {
-          nsEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent), NS_FOCUS_CONTENT);
-          event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-          nsEventStatus status = aVisitor.mEventStatus;
-          DispatchEvent(aVisitor.mPresContext, &event,
-                        content, PR_TRUE, &status);
-          // Do we care about the status this returned?  I don't think we do...
-        }
-        break;
     }
     mHandlingEvent = PR_FALSE;
   }
   return NS_OK;
 }
 
-void
-nsHTMLLabelElement::SetFocus(nsPresContext* aContext)
-{
-  if (mInSetFocus)
-    return;
-  mInSetFocus = PR_TRUE;
-  nsCOMPtr<nsIContent> content = GetForContent();
-  if (content)
-    content->SetFocus(aContext);
-  mInSetFocus = PR_FALSE;
-}
-
 nsresult
 nsHTMLLabelElement::Reset()
 {
diff --git a/content/html/content/src/nsHTMLLegendElement.cpp b/content/html/content/src/nsHTMLLegendElement.cpp
index 05fe85f1c6f0..0a5bece5dd0e 100644
--- a/content/html/content/src/nsHTMLLegendElement.cpp
+++ b/content/html/content/src/nsHTMLLegendElement.cpp
@@ -45,10 +45,10 @@
 #include "nsIForm.h"
 #include "nsIFormControl.h"
 #include "nsIEventStateManager.h"
-#include "nsIFocusController.h"
 #include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
-
+#include "nsFocusManager.h"
+#include "nsIFrame.h"
 
 class nsHTMLLegendElement : public nsGenericHTMLFormElement,
                             public nsIDOMHTMLLegendElement
@@ -78,13 +78,17 @@ public:
   NS_IMETHOD SubmitNamesValues(nsIFormSubmission* aFormSubmission,
                                nsIContent* aSubmitElement);
 
+  NS_IMETHODIMP Focus();
+
+  virtual void PerformAccesskey(PRBool aKeyCausesActivation,
+                                PRBool aIsTrustedEvent);
+
   // nsIContent
   virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                               nsIContent* aBindingParent,
                               PRBool aCompileEventHandlers);
   virtual void UnbindFromTree(PRBool aDeep = PR_TRUE,
                               PRBool aNullParent = PR_TRUE);
-  virtual void SetFocus(nsPresContext* aPresContext);
   virtual PRBool ParseAttribute(PRInt32 aNamespaceID,
                                 nsIAtom* aAttribute,
                                 const nsAString& aValue,
@@ -103,9 +107,6 @@ public:
                              PRBool aNotify);
 
   virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-
-protected:
-  PRPackedBool mInSetFocus;
 };
 
 
@@ -114,7 +115,6 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Legend)
 
 nsHTMLLegendElement::nsHTMLLegendElement(nsINodeInfo *aNodeInfo)
   : nsGenericHTMLFormElement(aNodeInfo)
-  , mInSetFocus(PR_FALSE)
 {
 }
 
@@ -253,32 +253,34 @@ nsHTMLLegendElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
   nsGenericHTMLFormElement::UnbindFromTree(aDeep, aNullParent);
 }
 
-void
-nsHTMLLegendElement::SetFocus(nsPresContext* aPresContext)
+NS_IMETHODIMP
+nsHTMLLegendElement::Focus()
 {
-  nsIDocument *document = GetCurrentDoc();
-  if (!aPresContext || !document || mInSetFocus) {
-    return;
-  }
+  nsIFrame* frame = GetPrimaryFrame();
+  if (!frame)
+    return NS_OK;
 
-  mInSetFocus = PR_TRUE;
-  if (IsFocusable()) {
-    nsGenericHTMLFormElement::SetFocus(aPresContext);
-  } else {
-    // If the legend isn't focusable (no tabindex) we focus whatever is
-    // focusable following the legend instead, bug 81481.
-    nsCOMPtr<nsPIDOMWindow> ourWindow = document->GetWindow();
-    if (ourWindow) {
-      nsIFocusController* focusController =
-        ourWindow->GetRootFocusController();
-      nsCOMPtr<nsIDOMElement> domElement =
-        do_QueryInterface(static_cast<nsIContent *>(this));
-      if (focusController && domElement) {
-        focusController->MoveFocus(PR_TRUE, domElement);
-      }
-    }
-  }
-  mInSetFocus = PR_FALSE;
+  PRInt32 tabIndex;
+  if (frame->IsFocusable(&tabIndex))
+    return nsGenericHTMLElement::Focus();
+
+  // If the legend isn't focusable, focus whatever is focusable following
+  // the legend instead, bug 81481.
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return NS_OK;
+
+  nsCOMPtr<nsIDOMElement> result;
+  return fm->MoveFocus(nsnull, this, nsIFocusManager::MOVEFOCUS_FORWARD, 0,
+                       getter_AddRefs(result));
+}
+
+void
+nsHTMLLegendElement::PerformAccesskey(PRBool aKeyCausesActivation,
+                                      PRBool aIsTrustedEvent)
+{
+  // just use the same behaviour as the focus method
+  Focus();
 }
 
 NS_IMETHODIMP
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index 5aaaa94c260f..f21d164e6791 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -1209,27 +1209,13 @@ NS_IMPL_INT_ATTR_DEFAULT_VALUE(nsHTMLSelectElement, TabIndex, tabindex, 0)
 NS_IMETHODIMP
 nsHTMLSelectElement::Blur()
 {
-  if (ShouldBlur(this)) {
-    SetElementFocus(PR_FALSE);
-  }
-
-  return NS_OK;
+  return nsGenericHTMLElement::Blur();
 }
 
 NS_IMETHODIMP
 nsHTMLSelectElement::Focus()
 {
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_TRUE);
-  }
-
-  return NS_OK;
-}
-
-void
-nsHTMLSelectElement::SetFocus(nsPresContext* aPresContext)
-{
-  DoSetFocus(aPresContext);
+  return nsGenericHTMLElement::Focus();
 }
 
 PRBool
@@ -1241,7 +1227,7 @@ nsHTMLSelectElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
   if (aTabIndex && (sTabFocusModel & eTabFocus_formElementsMask) == 0) {
     *aTabIndex = -1;
   }
-  *aIsFocusable = PR_TRUE;
+  *aIsFocusable = !HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
   return PR_FALSE;
 }
 
@@ -1449,17 +1435,7 @@ nsHTMLSelectElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
     }
   }
 
-  // Must notify the frame that the blur event occurred
-  // NOTE: At this point EventStateManager has not yet set the
-  // new content as having focus so this content is still considered
-  // the focused element. So the ComboboxControlFrame tracks the focus
-  // at a class level (Bug 32920)
-  if (nsEventStatus_eIgnore == aVisitor.mEventStatus &&
-      (aVisitor.mEvent->message == NS_BLUR_CONTENT) && formControlFrame) {
-    formControlFrame->SetFocus(PR_FALSE, PR_TRUE);
-  }
-
-  return nsGenericHTMLElement::PreHandleEvent(aVisitor);
+  return nsGenericHTMLFormElement::PreHandleEvent(aVisitor);
 }
 
 // nsIFormControl
diff --git a/content/html/content/src/nsHTMLSelectElement.h b/content/html/content/src/nsHTMLSelectElement.h
index 9310f8c30cf5..1dabe71fe096 100644
--- a/content/html/content/src/nsHTMLSelectElement.h
+++ b/content/html/content/src/nsHTMLSelectElement.h
@@ -268,7 +268,6 @@ public:
   // nsIContent
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
 
-  virtual void SetFocus(nsPresContext* aPresContext);
   virtual PRBool IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex);
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
diff --git a/content/html/content/src/nsHTMLStyleElement.cpp b/content/html/content/src/nsHTMLStyleElement.cpp
index 76b4db48fe07..0e0a4d9f7a54 100644
--- a/content/html/content/src/nsHTMLStyleElement.cpp
+++ b/content/html/content/src/nsHTMLStyleElement.cpp
@@ -321,8 +321,7 @@ nsHTMLStyleElement::GetStyleSheetURL(PRBool* aIsInline,
   if (*aIsInline) {
     return;
   }
-  if (GetOwnerDoc() && // XXX clean up after bug 335998 lands
-      !(GetOwnerDoc()->IsCaseSensitive())) {
+  if (!IsInHTMLDocument()) {
     // We stopped supporting <style src="..."> for XHTML as it is
     // non-standard.
     *aIsInline = PR_TRUE;
diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 830ab702f24b..1b52d4e86872 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -41,6 +41,7 @@
 #include "nsITextControlElement.h"
 #include "nsIDOMNSEditableElement.h"
 #include "nsIControllers.h"
+#include "nsFocusManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsContentCID.h"
 #include "nsCOMPtr.h"
@@ -142,7 +143,7 @@ public:
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
 
-  virtual void SetFocus(nsPresContext* aPresContext);
+  virtual PRBool IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex);
 
   virtual nsresult DoneAddingChildren(PRBool aHaveNotified);
   virtual PRBool IsDoneAddingChildren();
@@ -288,34 +289,18 @@ nsHTMLTextAreaElement::GetForm(nsIDOMHTMLFormElement** aForm)
 NS_IMETHODIMP
 nsHTMLTextAreaElement::Blur()
 {
-  if (ShouldBlur(this)) {
-    SetElementFocus(PR_FALSE);
-  }
-
-  return NS_OK;
+  return nsGenericHTMLElement::Blur();
 }
 
 NS_IMETHODIMP
-nsHTMLTextAreaElement::Focus() 
+nsHTMLTextAreaElement::Focus()
 {
-  if (ShouldFocus(this)) {
-    SetElementFocus(PR_TRUE);
-  }
-
-  return NS_OK;
-}
-
-void
-nsHTMLTextAreaElement::SetFocus(nsPresContext* aPresContext)
-{
-  DoSetFocus(aPresContext);
+  return nsGenericHTMLElement::Focus();
 }
 
 NS_IMETHODIMP
 nsHTMLTextAreaElement::Select()
 {
-  nsresult rv = NS_OK;
-
   // XXX Bug?  We have to give the input focus before contents can be
   // selected
 
@@ -324,14 +309,16 @@ nsHTMLTextAreaElement::Select()
     return NS_OK;
   }
 
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+
   nsCOMPtr<nsPresContext> presContext = GetPresContext();
   if (state == eInactiveWindow) {
+    if (fm)
+      fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
     SelectAll(presContext);
     return NS_OK;
   }
 
-  // Just like SetFocus() but without the ScrollIntoView()!
-
   nsEventStatus status = nsEventStatus_eIgnore;
   nsGUIEvent event(PR_TRUE, NS_FORM_SELECTED, nsnull);
   // XXXbz nsHTMLInputElement guards against this reentering; shouldn't we?
@@ -341,27 +328,20 @@ nsHTMLTextAreaElement::Select()
   // If the DOM event was not canceled (e.g. by a JS event handler
   // returning false)
   if (status == nsEventStatus_eIgnore) {
-    PRBool shouldFocus = ShouldFocus(this);
+    if (fm) {
+      fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
 
-    if (shouldFocus &&
-        !presContext->EventStateManager()->SetContentState(this,
-                                                           NS_EVENT_STATE_FOCUS)) {
-      return rv; // We ended up unfocused, e.g. due to a DOM event handler.
-    }
-
-    nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_TRUE);
-
-    if (formControlFrame) {
-      if (shouldFocus) {
-        formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
+      // ensure that the element is actually focused
+      nsCOMPtr<nsIDOMElement> focusedElement;
+      fm->GetFocusedElement(getter_AddRefs(focusedElement));
+      if (SameCOMIdentity(static_cast<nsIDOMNode*>(this), focusedElement)) {
+        // Now Select all the text!
+        SelectAll(presContext);
       }
-
-      // Now Select all the text!
-      SelectAll(presContext);
     }
   }
 
-  return rv;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -376,6 +356,18 @@ nsHTMLTextAreaElement::SelectAll(nsPresContext* aPresContext)
   return NS_OK;
 }
 
+PRBool
+nsHTMLTextAreaElement::IsHTMLFocusable(PRBool *aIsFocusable, PRInt32 *aTabIndex)
+{
+  if (nsGenericHTMLElement::IsHTMLFocusable(aIsFocusable, aTabIndex)) {
+    return PR_TRUE;
+  }
+
+  // disabled textareas are not focusable
+  *aIsFocusable = !HasAttr(kNameSpaceID_None, nsGkAtoms::disabled);
+  return PR_FALSE;
+}
+
 NS_IMPL_STRING_ATTR(nsHTMLTextAreaElement, AccessKey, accesskey)
 NS_IMPL_INT_ATTR(nsHTMLTextAreaElement, Cols, cols)
 NS_IMPL_BOOL_ATTR(nsHTMLTextAreaElement, Disabled, disabled)
@@ -634,7 +626,7 @@ nsHTMLTextAreaElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
     }
   }
 
-  return nsGenericHTMLElement::PreHandleEvent(aVisitor);
+  return nsGenericHTMLFormElement::PreHandleEvent(aVisitor);
 }
 
 nsresult
diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp
index 60890b5fc0fc..ddec3aaffe45 100644
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -581,7 +581,8 @@ NS_NewHTMLElement(nsIContent** aResult, nsINodeInfo *aNodeInfo,
 
   nsIAtom *name = aNodeInfo->NameAtom();
 
-  NS_ASSERTION(aNodeInfo->NamespaceEquals(kNameSpaceID_XHTML), "Someone is still trying to create HTML elements is no namespace!");
+  NS_ASSERTION(aNodeInfo->NamespaceEquals(kNameSpaceID_XHTML), 
+               "Trying to HTML elements that don't have the XHTML namespace");
   
   *aResult = CreateHTMLElement(parserService->
                                  HTMLCaseSensitiveAtomTagToId(name),
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index d6bc7eab06f3..be3735980164 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1233,7 +1233,7 @@ nsHTMLDocument::CreateElement(const nsAString& aTagName,
   nsCOMPtr<nsIAtom> name = do_GetAtom(tagName);
 
   nsCOMPtr<nsIContent> content;
-  rv = CreateElem(name, nsnull, GetDefaultNamespaceID(), PR_TRUE,
+  rv = CreateElem(name, nsnull, kNameSpaceID_XHTML, PR_TRUE,
                   getter_AddRefs(content));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1614,7 +1614,7 @@ NS_IMETHODIMP
 nsHTMLDocument::GetImages(nsIDOMHTMLCollection** aImages)
 {
   if (!mImages) {
-    mImages = new nsContentList(this, nsGkAtoms::img, GetDefaultNamespaceID());
+    mImages = new nsContentList(this, nsGkAtoms::img, kNameSpaceID_XHTML);
     if (!mImages) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -1630,8 +1630,7 @@ NS_IMETHODIMP
 nsHTMLDocument::GetApplets(nsIDOMHTMLCollection** aApplets)
 {
   if (!mApplets) {
-    mApplets = new nsContentList(this, nsGkAtoms::applet,
-                                 GetDefaultNamespaceID());
+    mApplets = new nsContentList(this, nsGkAtoms::applet, kNameSpaceID_XHTML);
     if (!mApplets) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -1664,10 +1663,9 @@ nsHTMLDocument::MatchLinks(nsIContent *aContent, PRInt32 aNamespaceID,
 #endif
 
     nsINodeInfo *ni = aContent->NodeInfo();
-    PRInt32 namespaceID = doc->GetDefaultNamespaceID();
 
     nsIAtom *localName = ni->NameAtom();
-    if (ni->NamespaceID() == namespaceID &&
+    if (ni->NamespaceID() == kNameSpaceID_XHTML &&
         (localName == nsGkAtoms::a || localName == nsGkAtoms::area)) {
       return aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::href);
     }
@@ -1709,8 +1707,7 @@ nsHTMLDocument::MatchAnchors(nsIContent *aContent, PRInt32 aNamespaceID,
   }
 #endif
 
-  PRInt32 namespaceID = aContent->GetCurrentDoc()->GetDefaultNamespaceID();
-  if (aContent->NodeInfo()->Equals(nsGkAtoms::a, namespaceID)) {
+  if (aContent->NodeInfo()->Equals(nsGkAtoms::a, kNameSpaceID_XHTML)) {
     return aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::name);
   }
 
@@ -2661,7 +2658,7 @@ NS_IMETHODIMP
 nsHTMLDocument::GetEmbeds(nsIDOMHTMLCollection** aEmbeds)
 {
   if (!mEmbeds) {
-    mEmbeds = new nsContentList(this, nsGkAtoms::embed, GetDefaultNamespaceID());
+    mEmbeds = new nsContentList(this, nsGkAtoms::embed, kNameSpaceID_XHTML);
     if (!mEmbeds) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -2994,7 +2991,7 @@ nsContentList*
 nsHTMLDocument::GetForms()
 {
   if (!mForms)
-    mForms = new nsContentList(this, nsGkAtoms::form, GetDefaultNamespaceID());
+    mForms = new nsContentList(this, nsGkAtoms::form, kNameSpaceID_XHTML);
 
   return mForms;
 }
@@ -3212,7 +3209,7 @@ DocAllResultMatch(nsIContent* aContent, PRInt32 aNamespaceID, nsIAtom* aAtom,
   }
 
   nsGenericHTMLElement* elm = nsGenericHTMLElement::FromContent(aContent);
-  if (!elm || aContent->GetNameSpaceID() != kNameSpaceID_None) {
+  if (!elm) {
     return PR_FALSE;
   }
 
diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp
index 722d7cb9a03b..344c9d54628f 100644
--- a/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -419,7 +419,9 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode)
       ToLowerCase(tmp);
 
       nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
-      nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_XHTML);
+      nodeInfo = mNodeInfoManager->GetNodeInfo(name, 
+                                               nsnull, 
+                                               kNameSpaceID_XHTML);
       NS_ENSURE_TRUE(nodeInfo, NS_ERROR_OUT_OF_MEMORY);
     }
     else if (mNodeInfoCache[nodeType]) {
@@ -433,7 +435,9 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode)
       nsIAtom *name = parserService->HTMLIdToAtomTag(nodeType);
       NS_ASSERTION(name, "This should not happen!");
 
-      nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_XHTML);
+      nodeInfo = mNodeInfoManager->GetNodeInfo(name, 
+                                               nsnull, 
+                                               kNameSpaceID_XHTML);
       NS_ENSURE_TRUE(nodeInfo, NS_ERROR_OUT_OF_MEMORY);
 
       NS_ADDREF(mNodeInfoCache[nodeType] = nodeInfo);
diff --git a/content/media/video/test/Makefile.in b/content/media/video/test/Makefile.in
index 5c638246af64..913f11782271 100644
--- a/content/media/video/test/Makefile.in
+++ b/content/media/video/test/Makefile.in
@@ -153,12 +153,12 @@ _TEST_FILES += \
 		test_bug495145_wav.html \
 		test_can_play_type_wave.html \
 		test_paused_after_ended.html \
+		test_progress2.html \
+		test_progress4.html \
 		test_wav_8bit.html \
 		test_wav_ended1.html \
 		test_wav_ended2.html \
 		test_wav_list.html \
-		test_progress2.html \
-		test_progress4.html \
 		test_wav_onloadedmetadata.html \
 		test_wav_seek1.html \
 		test_wav_seek3.html \
diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp
index bd50a2ae57b0..ad0fdd46363e 100644
--- a/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -58,6 +58,7 @@
 #include "nsIDOMNSHTMLInputElement.h"
 #include "nsIDOMText.h"
 #include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMEventListener.h"
@@ -411,12 +412,13 @@ nsXBLPrototypeHandler::DispatchXBLCommand(nsPIDOMEventTarget* aTarget, nsIDOMEve
   nsCOMPtr<nsIController> controller;
   nsCOMPtr<nsIFocusController> focusController;
 
+  nsCOMPtr<nsPIDOMWindow> privateWindow;
   nsCOMPtr<nsPIWindowRoot> windowRoot(do_QueryInterface(aTarget));
   if (windowRoot) {
     windowRoot->GetFocusController(getter_AddRefs(focusController));
   }
   else {
-    nsCOMPtr<nsPIDOMWindow> privateWindow(do_QueryInterface(aTarget));
+    privateWindow = do_QueryInterface(aTarget);
     if (!privateWindow) {
       nsCOMPtr<nsIContent> elt(do_QueryInterface(aTarget));
       nsCOMPtr<nsIDocument> doc;
@@ -455,16 +457,28 @@ nsXBLPrototypeHandler::DispatchXBLCommand(nsPIDOMEventTarget* aTarget, nsIDOMEve
       mMisc == 1) {
     // get the focused element so that we can pageDown only at
     // certain times.
-    nsCOMPtr<nsIDOMElement> focusedElement;
-    focusController->GetFocusedElement(getter_AddRefs(focusedElement));
+
+    nsCOMPtr<nsPIDOMWindow> windowToCheck;
+    if (windowRoot)
+      windowToCheck = do_QueryInterface(windowRoot->GetWindow());
+    else
+      windowToCheck = privateWindow->GetPrivateRoot();
+
+    nsCOMPtr<nsIContent> focusedContent;
+    if (windowToCheck) {
+      nsCOMPtr<nsPIDOMWindow> focusedWindow;
+      focusedContent =
+        nsFocusManager::GetFocusedDescendant(windowToCheck, PR_TRUE, getter_AddRefs(focusedWindow));
+    }
+
     PRBool isLink = PR_FALSE;
-    nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
     nsIContent *content = focusedContent;
 
     // if the focused element is a link then we do want space to 
-    // scroll down. focused element may be an element in a link,
-    // we need to check the parent node too.
-    if (focusedContent) {
+    // scroll down. The focused element may be an element in a link,
+    // we need to check the parent node too. Only do this check if an
+    // element is focused and has a parent.
+    if (focusedContent && focusedContent->GetParent()) {
       while (content) {
         if (content->Tag() == nsGkAtoms::a &&
             content->IsNodeOfType(nsINode::eHTML)) {
diff --git a/content/xbl/src/nsXBLWindowKeyHandler.cpp b/content/xbl/src/nsXBLWindowKeyHandler.cpp
index 2c16d1b02288..59bc4fe6d72b 100644
--- a/content/xbl/src/nsXBLWindowKeyHandler.cpp
+++ b/content/xbl/src/nsXBLWindowKeyHandler.cpp
@@ -56,6 +56,7 @@
 #include "nsIControllers.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsPIWindowRoot.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
@@ -65,7 +66,6 @@
 #include "nsIDOMNSDocument.h"
 #include "nsPIWindowRoot.h"
 #include "nsPIDOMWindow.h"
-#include "nsIFocusController.h"
 #include "nsIDocShell.h"
 #include "nsIPresShell.h"
 #include "nsIPrivateDOMEvent.h"
@@ -449,20 +449,18 @@ nsXBLWindowKeyHandler::ShutDown()
 PRBool
 nsXBLWindowKeyHandler::IsEditor()
 {
-  nsCOMPtr<nsPIWindowRoot> windowRoot(do_QueryInterface(mTarget));
-  NS_ENSURE_TRUE(windowRoot, PR_FALSE);
-  nsCOMPtr<nsIFocusController> focusController;
-  windowRoot->GetFocusController(getter_AddRefs(focusController));
-  if (!focusController) {
-    NS_WARNING("********* Something went wrong! No focus controller on the root!!!\n");
+  // XXXndeakin even though this is only used for key events which should be
+  // going to the focused frame anyway, this doesn't seem like the right way
+  // to determine if something is an editor.
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
     return PR_FALSE;
-  }
 
-  nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-  focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
+  nsCOMPtr<nsIDOMWindow> focusedWindow;
+  fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
   if (!focusedWindow)
     return PR_FALSE;
-  
+
   nsCOMPtr<nsPIDOMWindow> piwin(do_QueryInterface(focusedWindow));
   nsIDocShell *docShell = piwin->GetDocShell();
   nsCOMPtr<nsIPresShell> presShell;
diff --git a/content/xml/tests/toc/toc.js b/content/xml/tests/toc/toc.js
index 761593137130..5dcb969e021e 100644
--- a/content/xml/tests/toc/toc.js
+++ b/content/xml/tests/toc/toc.js
@@ -37,7 +37,7 @@
 // Event handler for display togglers in Table of Contents
 function toggleDisplay(event)
 {
-  if (event.target.localName != "IMG")
+  if (event.target.localName != "img")
     return;
   var img = event.target;
   var div = img.nextSibling.nextSibling; 
diff --git a/content/xslt/src/xpath/txNameTest.cpp b/content/xslt/src/xpath/txNameTest.cpp
index 671b0ac29c13..771fb87153d1 100644
--- a/content/xslt/src/xpath/txNameTest.cpp
+++ b/content/xslt/src/xpath/txNameTest.cpp
@@ -73,11 +73,11 @@ PRBool txNameTest::matches(const txXPathNode& aNode, txIMatchContext* aContext)
 
     // Compare namespaces
     if (mNamespace != txXPathNodeUtils::getNamespaceID(aNode) 
-#ifndef TX_EXE        
-        && !(mNamespace == kNameSpaceID_None && 
+#ifndef TX_EXE
+        && !(mNamespace == kNameSpaceID_None &&
              txXPathNodeUtils::isHTMLElementInHTMLDocument(aNode))
-#endif          
-      )
+#endif
+       )
         return MB_FALSE;
 
     // Name wild?
diff --git a/content/xslt/src/xpath/txXPathTreeWalker.h b/content/xslt/src/xpath/txXPathTreeWalker.h
index 069bddd8e314..378f302fba93 100644
--- a/content/xslt/src/xpath/txXPathTreeWalker.h
+++ b/content/xslt/src/xpath/txXPathTreeWalker.h
@@ -144,7 +144,14 @@ public:
     static PRBool isComment(const txXPathNode& aNode);
     static PRBool isText(const txXPathNode& aNode);
 #ifndef TX_EXE
-    static PRBool isHTMLElementInHTMLDocument(const txXPathNode& aNode);
+    static inline PRBool isHTMLElementInHTMLDocument(const txXPathNode& aNode)
+    {
+      if (!aNode.isContent()) {
+        return PR_FALSE;
+      }
+      nsIContent* content = aNode.Content();
+      return content->IsNodeOfType(nsINode::eHTML) && content->IsInHTMLDocument();
+    }
 #else
 private:
     static void appendNodeValueHelper(NodeDefinition* aNode, nsAString& aResult);
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index 5026e7d1dac4..35078e0bbafe 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -453,7 +453,9 @@ txMozillaXMLOutput::startElement(nsIAtom* aPrefix, nsIAtom* aLocalName,
 
             aLowercaseLocalName = owner;
         }
-        return startElementInternal(nsnull, aLowercaseLocalName, kNameSpaceID_XHTML);
+        return startElementInternal(nsnull, 
+                                    aLowercaseLocalName, 
+                                    kNameSpaceID_XHTML);
     }
 
     return startElementInternal(aPrefix, aLocalName, aNsID);
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index cd4242ad98e4..b83090296f81 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -63,6 +63,7 @@
 #include "nsIXPConnect.h"
 #include "nsXTFWeakTearoff.h"
 #include "mozAutoDocUpdate.h"
+#include "nsFocusManager.h"
 
 nsXTFElementWrapper::nsXTFElementWrapper(nsINodeInfo* aNodeInfo,
                                          nsIXTFElement* aXTFElement)
@@ -554,22 +555,9 @@ nsXTFElementWrapper::PerformAccesskey(PRBool aKeyCausesActivation,
                                       PRBool aIsTrustedEvent)
 {
   if (mNotificationMask & nsIXTFElement::NOTIFY_PERFORM_ACCESSKEY) {
-    nsIDocument* doc = GetCurrentDoc();
-    if (!doc)
-      return;
-
-    // Get presentation shell 0
-    nsIPresShell *presShell = doc->GetPrimaryShell();
-    if (!presShell)
-      return;
-
-    nsPresContext *presContext = presShell->GetPresContext();
-    if (!presContext)
-      return;
-
-    nsIEventStateManager *esm = presContext->EventStateManager();
-    if (esm)
-      esm->ChangeFocusWith(this, nsIEventStateManager::eEventFocusedByKey);
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm)
+      fm->SetFocus(this, nsIFocusManager::FLAG_BYKEY);
 
     if (aKeyCausesActivation)
       GetXTFElement()->PerformAccesskey();
diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in
index fd87bb3fde83..5c3bdc1c32ff 100644
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -86,7 +86,6 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
-	-I$(srcdir) \
 	-I$(srcdir)/../../document/src \
 	-I$(srcdir)/../../templates/src \
 	-I$(srcdir)/../../../xml/content/src \
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 3eddfec8beb6..84523bf4260b 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -86,6 +86,7 @@
 #include "nsIDocument.h"
 #include "nsIEventListenerManager.h"
 #include "nsIEventStateManager.h"
+#include "nsFocusManager.h"
 #include "nsIFastLoadService.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsINameSpaceManager.h"
@@ -653,8 +654,12 @@ nsXULElement::PerformAccesskey(PRBool aKeyCausesActivation,
     if (elm) {
         // Define behavior for each type of XUL element.
         nsIAtom *tag = content->Tag();
-        if (tag != nsGkAtoms::toolbarbutton)
-            elm->Focus();
+        if (tag != nsGkAtoms::toolbarbutton) {
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          nsCOMPtr<nsIDOMElement> element = do_QueryInterface(content);
+          if (fm)
+            fm->SetFocus(element, nsIFocusManager::FLAG_BYKEY);
+        }
         if (aKeyCausesActivation && tag != nsGkAtoms::textbox && tag != nsGkAtoms::menulist)
             elm->Click();
     }
@@ -2028,46 +2033,25 @@ nsXULElement::GetParentTree(nsIDOMXULMultiSelectControlElement** aTreeElement)
 NS_IMETHODIMP
 nsXULElement::Focus()
 {
-    if (!nsGenericElement::ShouldFocus(this)) {
-        return NS_OK;
-    }
-
-    nsIDocument* doc = GetCurrentDoc();
-    // What kind of crazy tries to focus an element without a doc?
-    if (!doc)
-        return NS_OK;
-
-    // Obtain a presentation context and then call SetFocus.
-
-    nsIPresShell *shell = doc->GetPrimaryShell();
-    if (!shell)
-        return NS_OK;
-
-    // Set focus
-    nsCOMPtr<nsPresContext> context = shell->GetPresContext();
-    SetFocus(context);
-
-    return NS_OK;
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(static_cast<nsIContent*>(this));
+    return fm ? fm->SetFocus(this, 0) : NS_OK;
 }
 
 NS_IMETHODIMP
 nsXULElement::Blur()
 {
+    if (!ShouldBlur(this))
+      return NS_OK;
+
     nsIDocument* doc = GetCurrentDoc();
-    // What kind of crazy tries to blur an element without a doc?
     if (!doc)
-        return NS_OK;
-
-    // Obtain a presentation context and then call SetFocus.
-    nsIPresShell *shell = doc->GetPrimaryShell();
-    if (!shell)
-        return NS_OK;
-
-    // Set focus
-    nsCOMPtr<nsPresContext> context = shell->GetPresContext();
-    if (ShouldBlur(this))
-      RemoveFocus(context);
+      return NS_OK;
 
+    nsIDOMWindow* win = doc->GetWindow();
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (win && fm)
+      return fm->ClearFocus(win);
     return NS_OK;
 }
 
@@ -2134,29 +2118,6 @@ nsXULElement::DoCommand()
     return NS_OK;
 }
 
-// nsIFocusableContent interface and helpers
-void
-nsXULElement::SetFocus(nsPresContext* aPresContext)
-{
-    if (BoolAttrIsTrue(nsGkAtoms::disabled))
-        return;
-
-    aPresContext->EventStateManager()->SetContentState(this,
-                                                       NS_EVENT_STATE_FOCUS);
-}
-
-void
-nsXULElement::RemoveFocus(nsPresContext* aPresContext)
-{
-  if (!aPresContext) 
-    return;
-  
-  if (IsInDoc()) {
-    aPresContext->EventStateManager()->SetContentState(nsnull,
-                                                       NS_EVENT_STATE_FOCUS);
-  }
-}
-
 nsIContent *
 nsXULElement::GetBindingParent() const
 {
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index fec5efa1318a..e80998889601 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -542,8 +542,6 @@ public:
     }
 #endif
 
-    virtual void SetFocus(nsPresContext* aPresContext);
-    virtual void RemoveFocus(nsPresContext* aPresContext);
     virtual void PerformAccesskey(PRBool aKeyCausesActivation,
                                   PRBool aIsTrustedEvent);
 
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 1a87e7684b52..cd9a9ece3c2c 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -75,7 +75,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIEventStateManager.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIViewManager.h"
 #include "nsDOMError.h"
@@ -279,10 +279,9 @@ nsXULPopupListener::FireFocusOnTargetContent(nsIDOMNode* aTargetNode)
     nsCOMPtr<nsIContent> content = do_QueryInterface(aTargetNode);
     nsIFrame* targetFrame = shell->GetPrimaryFrameFor(content);
     if (!targetFrame) return NS_ERROR_FAILURE;
-      
-    PRBool suppressBlur = PR_FALSE;
+
     const nsStyleUserInterface* ui = targetFrame->GetStyleUserInterface();
-    suppressBlur = (ui->mUserFocus == NS_STYLE_USER_FOCUS_IGNORE);
+    PRBool suppressBlur = (ui->mUserFocus == NS_STYLE_USER_FOCUS_IGNORE);
 
     nsCOMPtr<nsIDOMElement> element;
     nsCOMPtr<nsIContent> newFocus = do_QueryInterface(content);
@@ -301,21 +300,20 @@ nsXULPopupListener::FireFocusOnTargetContent(nsIDOMNode* aTargetNode)
         }
         currFrame = currFrame->GetParent();
     } 
-    nsCOMPtr<nsIContent> focusableContent = do_QueryInterface(element);
-    nsIEventStateManager *esm = context->EventStateManager();
 
-    if (focusableContent) {
-      // Lock to scroll by SetFocus. See bug 309075.
-      nsFocusScrollSuppressor scrollSuppressor;
-      nsPIDOMWindow *ourWindow = doc->GetWindow();
-      if (ourWindow) {
-        scrollSuppressor.Init(ourWindow->GetRootFocusController());
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm) {
+      if (element) {
+        fm->SetFocus(element, nsIFocusManager::FLAG_BYMOUSE |
+                              nsIFocusManager::FLAG_NOSCROLL);
+      } else if (!suppressBlur) {
+        nsPIDOMWindow *window = doc->GetWindow();
+        fm->ClearFocus(window);
       }
+    }
 
-      focusableContent->SetFocus(context);
-    } else if (!suppressBlur)
-      esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-
+    nsIEventStateManager *esm = context->EventStateManager();
+    nsCOMPtr<nsIContent> focusableContent = do_QueryInterface(element);
     esm->SetContentState(focusableContent, NS_EVENT_STATE_ACTIVE);
   }
   return rv;
diff --git a/content/xul/content/test/test_bug398289.html b/content/xul/content/test/test_bug398289.html
index 5abc025f1e12..81134c451d49 100644
--- a/content/xul/content/test/test_bug398289.html
+++ b/content/xul/content/test/test_bug398289.html
@@ -7,7 +7,7 @@
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
-<body style="height: 100%" onload="onBodyLoad();">
+<body style="height: 100%" onload="setTimeout(onBodyLoad, 0);">
   <iframe id="test" src="chrome://mochikit/content/chrome/content/xul/content/test/398289-resource.xul" width="100%" height="100%">
   </iframe>
 
diff --git a/content/xul/document/src/nsXULCommandDispatcher.cpp b/content/xul/document/src/nsXULCommandDispatcher.cpp
index 070e7a8fa186..e4ccd3a6ac62 100644
--- a/content/xul/document/src/nsXULCommandDispatcher.cpp
+++ b/content/xul/document/src/nsXULCommandDispatcher.cpp
@@ -45,6 +45,7 @@
 
 #include "nsIContent.h"
 #include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIControllers.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMXULDocument.h"
@@ -140,25 +141,43 @@ nsXULCommandDispatcher::GetFocusController()
   return win ? win->GetRootFocusController() : nsnull;
 }
 
-////////////////////////////////////////////////////////////////
-// nsIDOMXULTracker Interface
+nsIContent*
+nsXULCommandDispatcher::GetRootFocusedContentAndWindow(nsPIDOMWindow** aWindow)
+{
+  *aWindow = nsnull;
+
+  if (mDocument) {
+    nsCOMPtr<nsPIDOMWindow> win = mDocument->GetWindow();
+    if (win) {
+      nsCOMPtr<nsPIDOMWindow> rootWindow = win->GetPrivateRoot();
+      if (rootWindow) {
+        return nsFocusManager::GetFocusedDescendant(rootWindow, PR_TRUE, aWindow);
+      }
+    }
+  }
+
+  return nsnull;
+}
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::GetFocusedElement(nsIDOMElement** aElement)
 {
-  nsIFocusController* fc = GetFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_FAILURE);
+  *aElement = nsnull;
 
-  nsresult rv = fc->GetFocusedElement(aElement);
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsPIDOMWindow> focusedWindow;
+  nsIContent* focusedContent =
+    GetRootFocusedContentAndWindow(getter_AddRefs(focusedWindow));
+  if (focusedContent) {
+    CallQueryInterface(focusedContent, aElement);
 
-  // Make sure the caller can access the focused element.
-  if (*aElement && !nsContentUtils::CanCallerAccess(*aElement)) {
-    // XXX This might want to return null, but we use that return value
-    // to mean "there is no focused element," so to be clear, throw an
-    // exception.
-    NS_RELEASE(*aElement);
-    return NS_ERROR_DOM_SECURITY_ERR;
+    // Make sure the caller can access the focused element.
+    if (!nsContentUtils::CanCallerAccess(*aElement)) {
+      // XXX This might want to return null, but we use that return value
+      // to mean "there is no focused element," so to be clear, throw an
+      // exception.
+      NS_RELEASE(*aElement);
+      return NS_ERROR_DOM_SECURITY_ERR;
+    }
   }
 
   return NS_OK;
@@ -167,71 +186,97 @@ nsXULCommandDispatcher::GetFocusedElement(nsIDOMElement** aElement)
 NS_IMETHODIMP
 nsXULCommandDispatcher::GetFocusedWindow(nsIDOMWindow** aWindow)
 {
-  nsIFocusController* fc = GetFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_FAILURE);
+  *aWindow = nsnull;
 
-  nsCOMPtr<nsIDOMWindowInternal> window;
-  nsresult rv = fc->GetFocusedWindow(getter_AddRefs(window));
-  NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && window, rv);
-
-  rv = CallQueryInterface(window, aWindow);
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsPIDOMWindow> window;
+  GetRootFocusedContentAndWindow(getter_AddRefs(window));
+  if (!window)
+    return NS_OK;
 
   // Make sure the caller can access this window. The caller can access this
   // window iff it can access the document.
   nsCOMPtr<nsIDOMDocument> domdoc;
-  rv = (*aWindow)->GetDocument(getter_AddRefs(domdoc));
+  nsresult rv = window->GetDocument(getter_AddRefs(domdoc));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Note: If there is no document, then this window has been cleared and
   // there's nothing left to protect, so let the window pass through.
-  if (domdoc && !nsContentUtils::CanCallerAccess(domdoc)) {
-    NS_RELEASE(*aWindow);
+  if (domdoc && !nsContentUtils::CanCallerAccess(domdoc))
     return NS_ERROR_DOM_SECURITY_ERR;
-  }
 
+  CallQueryInterface(window, aWindow);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::SetFocusedElement(nsIDOMElement* aElement)
 {
-  nsIFocusController* fc = GetFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_FAILURE);
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  NS_ENSURE_TRUE(fm, NS_ERROR_FAILURE);
 
-  return fc->SetFocusedElement(aElement);
+  if (aElement)
+    return fm->SetFocus(aElement, 0);
+
+  // if aElement is null, clear the focus in the currently focused child window
+  nsCOMPtr<nsPIDOMWindow> focusedWindow;
+  GetRootFocusedContentAndWindow(getter_AddRefs(focusedWindow));
+  return fm->ClearFocus(focusedWindow);
 }
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::SetFocusedWindow(nsIDOMWindow* aWindow)
 {
-  nsIFocusController* fc = GetFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_FAILURE);
+  NS_ENSURE_TRUE(aWindow, NS_OK); // do nothing if set to null
 
-  nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(aWindow));
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
 
-  return fc->SetFocusedWindow(window);
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  NS_ENSURE_TRUE(fm, NS_ERROR_FAILURE);
+
+  // get the containing frame for the window, and set it as focused. This will
+  // end up focusing whatever is currently focused inside the frame. Since
+  // setting the command dispatcher's focused window doesn't raise the window,
+  // setting it to a top-level window doesn't need to do anything.
+  nsCOMPtr<nsIDOMElement> frameElement = window->GetFrameElementInternal();
+  if (frameElement)
+    return fm->SetFocus(frameElement, 0);
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::AdvanceFocus()
 {
-  nsIFocusController* fc = GetFocusController();
-  return fc ? fc->MoveFocus(PR_TRUE, nsnull) : NS_OK;
+  return AdvanceFocusIntoSubtree(nsnull);
 }
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::RewindFocus()
 {
-  nsIFocusController* fc = GetFocusController();
-  return fc ? fc->MoveFocus(PR_FALSE, nsnull) : NS_OK;
+  nsCOMPtr<nsPIDOMWindow> win;
+  GetRootFocusedContentAndWindow(getter_AddRefs(win));
+
+  nsCOMPtr<nsIDOMElement> result;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    return fm->MoveFocus(win, nsnull, nsIFocusManager::MOVEFOCUS_BACKWARD,
+                         0, getter_AddRefs(result));
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::AdvanceFocusIntoSubtree(nsIDOMElement* aElt)
 {
-  nsIFocusController* fc = GetFocusController();
-  return fc ? fc->MoveFocus(PR_TRUE, aElt) : NS_OK;
+  nsCOMPtr<nsPIDOMWindow> win;
+  GetRootFocusedContentAndWindow(getter_AddRefs(win));
+
+  nsCOMPtr<nsIDOMElement> result;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    return fm->MoveFocus(win, aElt, nsIFocusManager::MOVEFOCUS_FORWARD,
+                         0, getter_AddRefs(result));
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -354,7 +399,7 @@ nsXULCommandDispatcher::UpdateCommands(const nsAString& aEventName)
 
   nsAutoString id;
   nsCOMPtr<nsIDOMElement> element;
-  fc->GetFocusedElement(getter_AddRefs(element));
+  GetFocusedElement(getter_AddRefs(element));
   if (element) {
     nsresult rv = element->GetAttribute(NS_LITERAL_STRING("id"), id);
     NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get element's id");
@@ -459,18 +504,13 @@ nsXULCommandDispatcher::GetControllerForCommand(const char *aCommand, nsIControl
 NS_IMETHODIMP
 nsXULCommandDispatcher::GetSuppressFocusScroll(PRBool* aSuppressFocusScroll)
 {
-  nsIFocusController* fc = GetFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_FAILURE);
-
-  return fc->GetSuppressFocusScroll(aSuppressFocusScroll);
+  *aSuppressFocusScroll = PR_FALSE;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::SetSuppressFocusScroll(PRBool aSuppressFocusScroll)
 {
-  nsIFocusController* fc = GetFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_FAILURE);
-
-  return fc->SetSuppressFocusScroll(aSuppressFocusScroll);
+  return NS_OK;
 }
 
diff --git a/content/xul/document/src/nsXULCommandDispatcher.h b/content/xul/document/src/nsXULCommandDispatcher.h
index 0cd9f8bcee25..9f1f42d0957b 100644
--- a/content/xul/document/src/nsXULCommandDispatcher.h
+++ b/content/xul/document/src/nsXULCommandDispatcher.h
@@ -76,6 +76,8 @@ public:
 protected:
     nsIFocusController* GetFocusController();
 
+    nsIContent* GetRootFocusedContentAndWindow(nsPIDOMWindow** aWindow);
+
     nsCOMPtr<nsIDocument> mDocument;
 
     class Updater {
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index b4bf085ebc13..c93344738225 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -180,6 +180,7 @@
 #include "nsIExternalProtocolService.h"
 
 #include "nsIFocusController.h"
+#include "nsFocusManager.h"
 
 #include "nsITextToSubURI.h"
 
@@ -214,7 +215,6 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 #endif
 
 #include "nsContentErrors.h"
-#include "nsIFocusEventSuppressor.h"
 
 // Number of documents currently loading
 static PRInt32 gNumberOfDocumentsLoading = 0;
@@ -259,31 +259,6 @@ FavorPerformanceHint(PRBool perfOverStarvation, PRUint32 starvationDelay)
         appShell->FavorPerformanceHint(perfOverStarvation, starvationDelay);
 }
 
-//*****************************************************************************
-//***    nsDocShellFocusController
-//*****************************************************************************
-
-class nsDocShellFocusController
-{
-
-public:
-  static nsDocShellFocusController* GetInstance() { return &mDocShellFocusControllerSingleton; }
-  virtual ~nsDocShellFocusController(){}
-
-  void Focus(nsIDocShell* aDS);
-  void ClosingDown(nsIDocShell* aDS);
-
-protected:
-  nsDocShellFocusController(){}
-
-  nsIDocShell* mFocusedDocShell; // very weak reference
-
-private:
-  static nsDocShellFocusController mDocShellFocusControllerSingleton;
-};
-
-nsDocShellFocusController nsDocShellFocusController::mDocShellFocusControllerSingleton;
-
 //*****************************************************************************
 // <a ping> support
 //*****************************************************************************
@@ -701,8 +676,6 @@ nsDocShell::nsDocShell():
     mAllowMetaRedirects(PR_TRUE),
     mAllowImages(PR_TRUE),
     mAllowDNSPrefetch(PR_TRUE),
-    mFocusDocFirst(PR_FALSE),
-    mHasFocus(PR_FALSE),
     mCreatingDocument(PR_FALSE),
     mUseErrorPages(PR_FALSE),
     mObserveErrorPages(PR_TRUE),
@@ -749,10 +722,6 @@ nsDocShell::nsDocShell():
 
 nsDocShell::~nsDocShell()
 {
-    nsDocShellFocusController* dsfc = nsDocShellFocusController::GetInstance();
-    if (dsfc) {
-      dsfc->ClosingDown(this);
-    }
     Destroy();
 
     if (--gDocShellCount == 0) {
@@ -4258,7 +4227,7 @@ nsDocShell::Destroy()
     // Make sure to blow away our mLoadingURI just in case.  No loads
     // from inside this pagehide.
     mLoadingURI = nsnull;
-    
+
     // Fire unload event before we blow anything away.
     (void) FirePageHideNotification(PR_TRUE);
 
@@ -4299,12 +4268,7 @@ nsDocShell::Destroy()
     if (docShellParentAsItem)
         docShellParentAsItem->RemoveChild(this);
 
-    nsCOMPtr<nsIFocusEventSuppressorService> suppressor;
     if (mContentViewer) {
-        suppressor =
-          do_GetService(NS_NSIFOCUSEVENTSUPPRESSORSERVICE_CONTRACTID);
-        NS_ENSURE_STATE(suppressor);
-        suppressor->Suppress();
         mContentViewer->Close(nsnull);
         mContentViewer->Destroy();
         mContentViewer = nsnull;
@@ -4342,9 +4306,6 @@ nsDocShell::Destroy()
     // Cancel any timers that were set for this docshell; this is needed
     // to break the cycle between us and the timers.
     CancelRefreshURITimers();
-    if (suppressor) {
-      suppressor->Unsuppress();
-    }
     return NS_OK;
 }
 
@@ -4615,6 +4576,12 @@ nsDocShell::SetBlurSuppression(PRBool aBlurSuppression)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+NS_IMETHODIMP
+nsDocShell::SetFocus()
+{
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDocShell::GetMainWidget(nsIWidget ** aMainWidget)
 {
@@ -4622,21 +4589,6 @@ nsDocShell::GetMainWidget(nsIWidget ** aMainWidget)
     return GetParentWidget(aMainWidget);
 }
 
-NS_IMETHODIMP
-nsDocShell::SetFocus()
-{
-#ifdef DEBUG_DOCSHELL_FOCUS
-  printf("nsDocShell::SetFocus %p\n", (void*)this);
-#endif
-
-  // Tell itself (and the DocShellFocusController) who has focus
-  // this way focus gets removed from the currently focused DocShell
-
-  SetHasFocus(PR_TRUE);
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDocShell::GetTitle(PRUnichar ** aTitle)
 {
@@ -7281,61 +7233,6 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
         }
     }
 
-    // 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
-    // is destroyed, and the OS focuses the parent window.  This call ends up
-    // notifying the focus controller that the outer window should focus
-    // and this hoses us on any link traversal.
-    //
-    // Please do not touch any of the focus controller code here without
-    // testing bugs #28580 and 50509.  These are immensely important bugs,
-    // so PLEASE take care not to regress them if you decide to alter this 
-    // code later              -- hyatt
-    nsIFocusController *focusController = nsnull;
-    if (mScriptGlobal) {
-        nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(mScriptGlobal);
-        focusController = ourWindow->GetRootFocusController();
-        if (focusController) {
-            // Suppress the command dispatcher.
-            focusController->SetSuppressFocus(PR_TRUE,
-                                              "Win32-Only Link Traversal Issue");
-            // Remove focus from the element that has it
-            nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-            focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-
-            // We want to null out the last focused element if the document containing
-            // it is going away.  If the last focused element is in a descendent
-            // window of our domwindow, its document will be destroyed when we
-            // destroy our children.  So, check for this case and null out the
-            // last focused element.  See bug 70484.
-
-            PRBool isSubWindow = PR_FALSE;
-            nsCOMPtr<nsIDOMWindow> curwin;
-            if (focusedWindow)
-              focusedWindow->GetParent(getter_AddRefs(curwin));
-            while (curwin) {
-              if (curwin == ourWindow) {
-                isSubWindow = PR_TRUE;
-                break;
-              }
-
-              // don't use nsCOMPtr here to avoid extra addref
-              // when assigning to curwin
-              nsIDOMWindow* temp;
-              curwin->GetParent(&temp);
-              if (curwin == temp) {
-                NS_RELEASE(temp);
-                break;
-              }
-              curwin = dont_AddRef(temp);
-            }
-
-            if (ourWindow == focusedWindow || isSubWindow)
-              focusController->ResetElementFocus();
-        }
-    }
-
     nscolor bgcolor = NS_RGBA(0, 0, 0, 0);
     // Ensure that the content viewer is destroyed *after* the GC - bug 71515
     nsCOMPtr<nsIContentViewer> kungfuDeathGrip = mContentViewer;
@@ -7399,23 +7296,6 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
                           NS_ERROR_FAILURE);
     }
 
-    // End copying block (Don't mess with the old content/document viewer
-    // beyond here!!)
-
-    // See the book I wrote above regarding why the focus controller is 
-    // being used here.  -- hyatt
-
-    /* Note it's important that focus suppression be turned off no earlier
-       because in cases where the docshell is lazily creating an about:blank
-       document, mContentViewer->Init finally puts a reference to that
-       document into the DOM window, which prevents an infinite recursion
-       attempting to lazily create the document as focus is unsuppressed
-       (bug 110856). */
-    if (focusController)
-        focusController->SetSuppressFocus(PR_FALSE,
-                                          "Win32-Only Link Traversal Issue");
-
-
     // Stuff the bgcolor from the old pres shell into the new
     // pres shell. This improves page load continuity.
     nsCOMPtr<nsIDocumentViewer> docviewer =
@@ -10030,20 +9910,20 @@ NS_IMETHODIMP nsDocShell::EnsureFind()
     NS_ENSURE_TRUE(scriptGO, NS_ERROR_UNEXPECTED);
 
     // default to our window
-    nsCOMPtr<nsIDOMWindow> rootWindow = do_QueryInterface(scriptGO);
-    nsCOMPtr<nsIDOMWindow> windowToSearch = rootWindow;
+    nsCOMPtr<nsIDOMWindow> windowToSearch(do_QueryInterface(mScriptGlobal));
 
-    // if we can, search the focused window
-    nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(scriptGO);
-    nsIFocusController *focusController = nsnull;
-    if (ourWindow)
-        focusController = ourWindow->GetRootFocusController();
-    if (focusController)
-    {
-        nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-        focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-        if (focusedWindow)
-            windowToSearch = focusedWindow;
+    nsCOMPtr<nsIDocShellTreeItem> root;
+    GetRootTreeItem(getter_AddRefs(root));
+
+    // if the active window is the same window that this docshell is in,
+    // use the currently focused frame
+    nsCOMPtr<nsIDOMWindow> rootWindow = do_GetInterface(root);
+    nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+    if (fm) {
+      nsCOMPtr<nsIDOMWindow> activeWindow;
+      fm->GetActiveWindow(getter_AddRefs(activeWindow));
+      if (activeWindow == rootWindow)
+        fm->GetFocusedWindow(getter_AddRefs(windowToSearch));
     }
 
     nsCOMPtr<nsIWebBrowserFindInFrames> findInFrames = do_QueryInterface(mFind);
@@ -10072,107 +9952,6 @@ nsDocShell::IsFrame()
     return PR_FALSE;
 }
 
-NS_IMETHODIMP
-nsDocShell::GetHasFocus(PRBool *aHasFocus)
-{
-  *aHasFocus = mHasFocus;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocShell::SetHasFocus(PRBool aHasFocus)
-{
-#ifdef DEBUG_DOCSHELL_FOCUS
-    printf(">>>>>>>>>> nsDocShell::SetHasFocus: %p  %s\n", (void*)this,
-           aHasFocus?"Yes":"No");
-#endif
-
-  mHasFocus = aHasFocus;
-
-  nsDocShellFocusController* dsfc = nsDocShellFocusController::GetInstance();
-  if (dsfc && aHasFocus) {
-    dsfc->Focus(this);
-  }
-
-  if (!aHasFocus) {
-      // We may be in a situation where the focus outline was shown
-      // on this document because the user tabbed into it, but the focus
-      // is now switching to another document via a click.  In this case,
-      // we need to make sure the focus outline is removed from this document.
-      SetCanvasHasFocus(PR_FALSE);
-  }
-
-  return NS_OK;
-}
-
-// Find an nsICanvasFrame under aFrame.  Only search the principal
-// child lists.  aFrame must be non-null.
-static nsICanvasFrame* FindCanvasFrame(nsIFrame* aFrame)
-{
-    nsICanvasFrame* canvasFrame = do_QueryFrame(aFrame);
-    if (canvasFrame) {
-        return canvasFrame;
-    }
-
-    nsIFrame* kid = aFrame->GetFirstChild(nsnull);
-    while (kid) {
-        canvasFrame = FindCanvasFrame(kid);
-        if (canvasFrame) {
-            return canvasFrame;
-        }
-        kid = kid->GetNextSibling();
-    }
-
-    return nsnull;
-}
-
-//-------------------------------------------------------
-// Tells the HTMLFrame/CanvasFrame that is now has focus
-NS_IMETHODIMP
-nsDocShell::SetCanvasHasFocus(PRBool aCanvasHasFocus)
-{
-  if (mEditorData && mEditorData->GetEditable())
-    return NS_ERROR_NOT_AVAILABLE;
-
-  nsCOMPtr<nsIPresShell> presShell;
-  GetPresShell(getter_AddRefs(presShell));
-  if (!presShell) return NS_ERROR_FAILURE;
-
-  nsIDocument *doc = presShell->GetDocument();
-  if (!doc) return NS_ERROR_FAILURE;
-
-  nsIContent *rootContent = doc->GetRootContent();
-  if (rootContent) {
-      nsIFrame* frame = presShell->GetPrimaryFrameFor(rootContent);
-      if (frame) {
-          frame = frame->GetParent();
-          if (frame) {
-              nsICanvasFrame* canvasFrame = do_QueryFrame(frame);
-              if (canvasFrame) {
-                  return canvasFrame->SetHasFocus(aCanvasHasFocus);
-              }
-          }
-      }
-  } else {
-      // Look for the frame the hard way
-      nsIFrame* frame = presShell->GetRootFrame();
-      if (frame) {
-          nsICanvasFrame* canvasFrame = FindCanvasFrame(frame);
-          if (canvasFrame) {
-              return canvasFrame->SetHasFocus(aCanvasHasFocus);
-          }
-      }      
-  }
-  
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsDocShell::GetCanvasHasFocus(PRBool *aCanvasHasFocus)
-{
-  return NS_ERROR_FAILURE;
-}
-
 /* boolean IsBeingDestroyed (); */
 NS_IMETHODIMP 
 nsDocShell::IsBeingDestroyed(PRBool *aDoomed)
@@ -10249,36 +10028,6 @@ nsRefreshTimer::Notify(nsITimer * aTimer)
     return NS_OK;
 }
 
-//*****************************************************************************
-//***    nsDocShellFocusController: Object Management
-//*****************************************************************************
-void 
-nsDocShellFocusController::Focus(nsIDocShell* aDocShell)
-{
-#ifdef DEBUG_DOCSHELL_FOCUS
-  printf("****** nsDocShellFocusController Focus To: %p  Blur To: %p\n",
-         (void*)aDocShell, (void*)mFocusedDocShell);
-#endif
-
-  if (aDocShell != mFocusedDocShell) {
-    if (mFocusedDocShell) {
-      mFocusedDocShell->SetHasFocus(PR_FALSE);
-    }
-    mFocusedDocShell = aDocShell;
-  }
-
-}
-
-//--------------------------------------------------
-// This is need for when the document with focus goes away
-void 
-nsDocShellFocusController::ClosingDown(nsIDocShell* aDocShell)
-{
-  if (aDocShell == mFocusedDocShell) {
-    mFocusedDocShell = nsnull;
-  }
-}
-
 //*****************************************************************************
 // nsDocShell::InterfaceRequestorProxy
 //*****************************************************************************
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 6c1a8ba8d331..2589182de060 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -728,8 +728,6 @@ protected:
     PRPackedBool               mAllowMetaRedirects;
     PRPackedBool               mAllowImages;
     PRPackedBool               mAllowDNSPrefetch;
-    PRPackedBool               mFocusDocFirst;
-    PRPackedBool               mHasFocus;
     PRPackedBool               mCreatingDocument; // (should be) debugging only
     PRPackedBool               mUseErrorPages;
     PRPackedBool               mObserveErrorPages;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index a3cd87699de7..90eeb94fcb9e 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -69,7 +69,7 @@ interface nsISecureBrowserUI;
 interface nsIDOMStorage;
 interface nsIPrincipal;
 
-[scriptable, uuid(3156f677-f444-4c3e-a47f-b47e568eafd6)]
+[scriptable, uuid(8ADFB831-1053-4A19-884D-BCDAD7277B4B)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -319,16 +319,6 @@ interface nsIDocShell : nsISupports
    */
   attribute long marginHeight;
 
-  /*
-   * Tells the DocShell that it now has focus or has lost focus
-   */
-  attribute boolean hasFocus;
-
-  /*
-   * Tells the docshell whether the canvas should have focus
-   */
-  attribute boolean canvasHasFocus;
-
   /*
    * Tells the docshell to offer focus to its tree owner.
    * This is currently only necessary for embedding chrome.
diff --git a/docshell/test/chrome/test_bug454235.xul b/docshell/test/chrome/test_bug454235.xul
index 0c9b26ae49aa..4e13b89df4a9 100644
--- a/docshell/test/chrome/test_bug454235.xul
+++ b/docshell/test/chrome/test_bug454235.xul
@@ -32,9 +32,6 @@ function doTest() {
   var offScreenSubBrowser = offScreenBrowser.contentDocument.getElementById("topBrowser");
   var offScreenBurriedBrowser = offScreenBrowser.contentDocument.getElementById("burriedBrowser");
   
-  shownBrowser.contentWindow.focus();
-  ok(shownBrowser.contentDocument.hasFocus(), "visible browser is not visible");  
-
   hiddenBrowser.contentWindow.focus();
   ok(!hiddenBrowser.contentDocument.hasFocus(),"hidden browser is visible");
 
@@ -54,9 +51,8 @@ function doTest() {
 
 
   ]]></script>
-  <deck flex="1" style="border:5px black solid">
-    <browser style="border:5px green solid" id="shownBrowser" src="bug454235-subframe.xul"/>
+  <box flex="1" style="visibility: hidden; border:5px black solid">
     <browser style="border:5px blue solid" id="hiddenBrowser" src="bug454235-subframe.xul"/>
     <browser style="border:5px yellow solid" id="offScreenBrowser" src="bug454235-subframe.xul"/>
-  </deck>
+  </box>
 </window>
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index bceae189f52d..4e6cca2b53e3 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -76,6 +76,7 @@ EXPORTS = \
   nsIScriptTimeoutHandler.h \
   nsPIDOMWindow.h \
   nsPIWindowRoot.h \
+  nsFocusManager.h \
   nsWrapperCache.h \
   $(NULL)
 
@@ -86,6 +87,7 @@ CPPSRCS =			\
 	nsJSEnvironment.cpp	\
 	nsJSTimeoutHandler.cpp	\
 	nsFocusController.cpp	\
+	nsFocusManager.cpp \
 	nsGlobalWindow.cpp      \
 	nsGlobalWindowCommands.cpp \
 	nsLocation.cpp		\
diff --git a/dom/base/crashtests/473284.xul b/dom/base/crashtests/473284.xul
index 233e51a25814..2a00d2783c87 100644
--- a/dom/base/crashtests/473284.xul
+++ b/dom/base/crashtests/473284.xul
@@ -86,7 +86,7 @@ try {
   result += '.';
 }
 
-document.documentElement.textContent = result == '.23.56.89abc' ? 'PASSED' : 'FAILED';
+document.documentElement.textContent = result == '.23.56.89.bc' ? 'PASSED' : 'FAILED';
 if (document.documentElement.textContent == 'PASSED') {
   document.documentElement.removeAttribute('class');
 }
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 3c99fb5da6e2..5786eee63292 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -4755,6 +4755,17 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       rv = WrapNative(cx, frameWin->GetGlobalJSObject(), frame,
                       &NS_GET_IID(nsIDOMWindow), vp,
                       getter_AddRefs(holder));
+
+      if (NS_SUCCEEDED(rv) && !win->IsChromeWindow()) {
+        JSObject *scopeobj = JS_GetScopeChain(cx);
+        if (!scopeobj) {
+          *_retval = JS_FALSE;
+          return NS_ERROR_FAILURE;
+        }
+
+        rv = sXPConnect->GetXOWForObject(cx, scopeobj, JSVAL_TO_OBJECT(*vp),
+                                         vp);
+      }
     }
 
     return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index 741296327f03..9ccb46c32911 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -44,7 +44,7 @@
 #include "nsDOMWindowUtils.h"
 #include "nsGlobalWindow.h"
 #include "nsIDocument.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIEventStateManager.h"
 
 #include "nsIScrollableView.h"
@@ -450,17 +450,12 @@ nsDOMWindowUtils::Focus(nsIDOMElement* aElement)
     "UniversalXPConnect", &hasCap)) || !hasCap)
     return NS_ERROR_DOM_SECURITY_ERR;
 
-  nsPresContext* pc = GetPresContext();
-  if (pc) {
-    nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
-    if (content) {
-      nsCOMPtr<nsIDocument> doc(do_QueryInterface(mWindow->GetExtantDocument()));
-      if (!doc || content->GetCurrentDoc() != doc)
-        return NS_ERROR_FAILURE;
-    }
-
-    pc->EventStateManager()->ChangeFocusWith(content,
-        nsIEventStateManager::eEventFocusedByApplication);
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    if (aElement)
+      fm->SetFocus(aElement, 0);
+    else
+      fm->ClearFocus(mWindow);
   }
 
   return NS_OK;
diff --git a/dom/base/nsFocusController.cpp b/dom/base/nsFocusController.cpp
index 19c3c77e5ea0..16e1c4fbd583 100644
--- a/dom/base/nsFocusController.cpp
+++ b/dom/base/nsFocusController.cpp
@@ -48,22 +48,11 @@
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDocument.h"
-#include "nsPresContext.h"
-#include "nsIPresShell.h"
-#include "nsIScriptGlobalObject.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusController.h"
 #include "prlog.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIEventStateManager.h"
-#include "nsIDocShell.h"
-#include "nsIBaseWindow.h"
-#include "nsIWindowWatcher.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIDocShellTreeOwner.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsServiceManagerUtils.h"
 #include "nsGlobalWindow.h"
+#include "nsFocusManager.h"
 
 #ifdef MOZ_XUL
 #include "nsIDOMXULDocument.h"
@@ -72,19 +61,6 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-nsFocusController::nsFocusController(void)
-: mSuppressFocus(0), 
-  mSuppressFocusScroll(PR_FALSE), 
-  mActive(PR_FALSE),
-  mUpdateWindowWatcher(PR_FALSE),
-  mNeedUpdateCommands(PR_FALSE)
-{
-}
-
-nsFocusController::~nsFocusController(void)
-{
-}
-
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsFocusController)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsFocusController, nsIFocusController)
@@ -93,18 +69,12 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsFocusController,
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFocusController)
   NS_INTERFACE_MAP_ENTRY(nsIFocusController)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
   NS_INTERFACE_MAP_ENTRY(nsSupportsWeakReference)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIFocusController)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsFocusController)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFocusController)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCurrentElement)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPreviousElement)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCurrentWindow)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPreviousWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPopupNode)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
@@ -120,168 +90,49 @@ nsFocusController::Create(nsIFocusController** aResult)
   return NS_OK;
 }
 
-
-////////////////////////////////////////////////////////////////
-// nsIFocusController Interface
-
-NS_IMETHODIMP
-nsFocusController::GetFocusedElement(nsIDOMElement** aElement)
-{
-  *aElement = mCurrentElement;
-  NS_IF_ADDREF(*aElement);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::GetFocusedWindow(nsIDOMWindowInternal** aWindow)
-{
-  *aWindow = mCurrentWindow;
-  NS_IF_ADDREF(*aWindow);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::SetFocusedElement(nsIDOMElement* aElement)
-{
-  if (aElement) {
-    nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
-    NS_ENSURE_ARG(content);
-  }
-  if (mCurrentElement) 
-    mPreviousElement = mCurrentElement;
-  else if (aElement) 
-    mPreviousElement = aElement;
-
-  mNeedUpdateCommands = mNeedUpdateCommands || mCurrentElement != aElement;
-  mCurrentElement = aElement;
-
-  if (!mSuppressFocus) {
-    // Need to update focus commands when focus switches from
-    // an element to no element, so don't test mCurrentElement
-    // before updating.
-    UpdateCommands();
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::RewindFocusState()
-{
-  mCurrentElement = mPreviousElement;
-  mCurrentWindow = mPreviousWindow;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::SetFocusedWindow(nsIDOMWindowInternal* aWindow)
-{
-  nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(aWindow);
-
-  if (win) {
-    win = win->GetOuterWindow();
-  }
-
-  NS_ASSERTION(!win || !win->IsInnerWindow(),
-               "Uh, inner window can't have focus!");
-
-  if (win && (mCurrentWindow != win)) {
-    nsCOMPtr<nsIBaseWindow> basewin = do_QueryInterface(win->GetDocShell());
-    if (basewin)
-      basewin->SetFocus();
-  }
-
-  if (mCurrentWindow) {
-    mPreviousWindow = mCurrentWindow;
-  } else if (win) {
-    mPreviousWindow = win;
-  }
-
-  mNeedUpdateCommands = mNeedUpdateCommands || mCurrentWindow != win;
-  mCurrentWindow = win;
-
-  if (mUpdateWindowWatcher) {
-    NS_ASSERTION(mActive, "This shouldn't happen");
-    if (mCurrentWindow)
-      UpdateWWActiveWindow();
-    mUpdateWindowWatcher = PR_FALSE;
-  }
-
-  return NS_OK;
-}
-
-
-void
-nsFocusController::UpdateCommands()
-{
-  if (!mNeedUpdateCommands) {
-    return;
-  }
-  nsCOMPtr<nsIDOMWindowInternal> window;
-  nsCOMPtr<nsIDocument> doc;
-  if (mCurrentWindow) {
-    window = mCurrentWindow;
-    nsCOMPtr<nsIDOMWindow> domWin(do_QueryInterface(window));
-    nsCOMPtr<nsIDOMDocument> domDoc;
-    domWin->GetDocument(getter_AddRefs(domDoc));
-    doc = do_QueryInterface(domDoc);
-  }
-  else if (mCurrentElement) {
-    nsCOMPtr<nsIDOMDocument> domDoc;
-    mCurrentElement->GetOwnerDocument(getter_AddRefs(domDoc));
-    if (domDoc) {
-      doc = do_QueryInterface(domDoc);
-      window = do_QueryInterface(doc->GetScriptGlobalObject());
-    }
-  }
-
-  // If there is no presshell, it's a zombie document which can't handle the command updates
-  if (window && doc && doc->GetPrimaryShell()) {
-    // Not a zombie document, so we can handle the command update
-    window->UpdateCommands(NS_LITERAL_STRING("focus"));
-    mNeedUpdateCommands = PR_FALSE;
-  }
-}
-
-  
 NS_IMETHODIMP
 nsFocusController::GetControllers(nsIControllers** aResult)
 {
   // XXX: we should fix this so there's a generic interface that
   // describes controllers, so this code would have no special
   // knowledge of what object might have controllers.
-  if (mCurrentElement) {
+  nsCOMPtr<nsIDOMElement> focusedElement;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    fm->GetFocusedElement(getter_AddRefs(focusedElement));
 
+  if (focusedElement) {
 #ifdef MOZ_XUL
-    nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(mCurrentElement));
+    nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(focusedElement));
     if (xulElement)
       return xulElement->GetControllers(aResult);
 #endif
 
     nsCOMPtr<nsIDOMNSHTMLTextAreaElement> htmlTextArea =
-      do_QueryInterface(mCurrentElement);
+      do_QueryInterface(focusedElement);
     if (htmlTextArea)
       return htmlTextArea->GetControllers(aResult);
 
     nsCOMPtr<nsIDOMNSHTMLInputElement> htmlInputElement =
-      do_QueryInterface(mCurrentElement);
+      do_QueryInterface(focusedElement);
     if (htmlInputElement)
       return htmlInputElement->GetControllers(aResult);
 
-    nsCOMPtr<nsIContent> content = do_QueryInterface(mCurrentElement);
+    nsCOMPtr<nsIContent> content = do_QueryInterface(focusedElement);
     if (content && content->IsEditable()) {
       // Move up to the window.
       nsCOMPtr<nsIDOMDocument> domDoc;
-      mCurrentElement->GetOwnerDocument(getter_AddRefs(domDoc));
+      focusedElement->GetOwnerDocument(getter_AddRefs(domDoc));
       nsCOMPtr<nsIDOMWindowInternal> domWindow =
         do_QueryInterface(GetWindowFromDocument(domDoc));
       if (domWindow)
         return domWindow->GetControllers(aResult);
     }
   }
-  else if (mCurrentWindow) {
-    nsCOMPtr<nsIDOMWindowInternal> domWindow =
-      do_QueryInterface(mCurrentWindow);
+  else {
+    nsCOMPtr<nsIDOMWindow> focusedWindow;
+    fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
+    nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(focusedWindow);
     if (domWindow)
       return domWindow->GetControllers(aResult);
   }
@@ -290,138 +141,6 @@ nsFocusController::GetControllers(nsIControllers** aResult)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsFocusController::MoveFocus(PRBool aForward, nsIDOMElement* aElt)
-{
-  // Obtain the doc that we'll be shifting focus inside.
-  nsCOMPtr<nsIDocument> doc;
-  nsCOMPtr<nsIContent> content;
-  if (aElt) {
-    content = do_QueryInterface(aElt);
-    NS_ENSURE_ARG(content);
-    doc = content->GetDocument();
-  }
-  else {
-    if (mCurrentElement) {
-      content = do_QueryInterface(mCurrentElement);
-      doc = content->GetDocument();
-      content = nsnull;
-    }
-    else if (mCurrentWindow) {
-      nsCOMPtr<nsIDOMDocument> domDoc;
-      mCurrentWindow->GetDocument(getter_AddRefs(domDoc));
-      doc = do_QueryInterface(domDoc);
-    }
-  }
-
-  if (!doc) {
-    // No way to obtain an event state manager.  Give up.
-    return NS_ERROR_FAILURE;
-  }
-
-  nsIPresShell *shell = doc->GetPrimaryShell();
-  if (!shell)
-    return NS_ERROR_FAILURE;
-
-  // Make sure frames have been constructed before shifting focus, bug 273092.
-  shell->FlushPendingNotifications(Flush_Frames);
-
-  // Retrieve the context
-  nsCOMPtr<nsPresContext> presContext = shell->GetPresContext();
-
-  // Make this ESM shift the focus per our instructions.
-  return presContext->EventStateManager()->ShiftFocus(aForward, content);
-}
-
-/////
-// nsIDOMFocusListener
-/////
-
-nsresult 
-nsFocusController::Focus(nsIDOMEvent* aEvent)
-{
-  if (mSuppressFocus)
-    return NS_OK;
-
-  nsCOMPtr<nsIDOMEventTarget> t;
-
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
-  if (nsevent) {
-    nsevent->GetOriginalTarget(getter_AddRefs(t));
-  }
-
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(t);
-  if (domElement && (domElement != mCurrentElement)) {
-    SetFocusedElement(domElement);
-
-    // Also set focus to our innermost window.
-    // XXX Must be done for the Ender case, since ender causes a blur,
-    // but we don't hear the subsequent focus to the Ender window.
-    nsCOMPtr<nsIDOMDocument> ownerDoc;
-    domElement->GetOwnerDocument(getter_AddRefs(ownerDoc));
-    nsCOMPtr<nsIDOMWindowInternal> domWindow = GetWindowFromDocument(ownerDoc);
-    if (domWindow)
-      SetFocusedWindow(domWindow);
-  }
-  else {
-    // We're focusing a window.  We only want to do an update commands
-    // if no element is focused.
-    nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t);
-    if (domDoc) {
-      nsCOMPtr<nsIDOMWindowInternal> domWindow = GetWindowFromDocument(domDoc);
-      if (domWindow) {
-        SetFocusedWindow(domWindow);
-        if (mCurrentElement) {
-          // Make sure this element is in our window. If not, we
-          // should clear this field.
-          nsCOMPtr<nsIDOMDocument> ownerDoc;
-          mCurrentElement->GetOwnerDocument(getter_AddRefs(ownerDoc));
-          nsCOMPtr<nsIDOMDocument> windowDoc;
-          mCurrentWindow->GetDocument(getter_AddRefs(windowDoc));
-          if (ownerDoc != windowDoc)
-            mCurrentElement = mPreviousElement = nsnull;
-        }
-        else
-          mPreviousElement = nsnull;
-
-        if (!mCurrentElement) {
-          UpdateCommands();
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult 
-nsFocusController::Blur(nsIDOMEvent* aEvent)
-{
-  if (mSuppressFocus)
-    return NS_OK;
-
-  nsCOMPtr<nsIDOMEventTarget> t;
-
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
-
-  if (nsevent) {
-    nsevent->GetOriginalTarget(getter_AddRefs(t));
-  }
-
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(t);
-  if (domElement) {
-    SetFocusedElement(nsnull);
-  }
-  
-  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t);
-  if (domDoc) {
-    nsCOMPtr<nsIDOMWindowInternal> domWindow = GetWindowFromDocument(domDoc);
-    if (domWindow)
-      SetFocusedWindow(nsnull);
-  }
-
-  return NS_OK;
-}
 
 nsPIDOMWindow *
 nsFocusController::GetWindowFromDocument(nsIDOMDocument* aDocument)
@@ -451,24 +170,17 @@ nsFocusController::GetControllerForCommand(const char * aCommand,
       return NS_OK;
     }
   }
-  
-  nsCOMPtr<nsPIDOMWindow> currentWindow;
-  if (mCurrentElement) {
-    // Move up to the window.
-    nsCOMPtr<nsIDOMDocument> domDoc;
-    mCurrentElement->GetOwnerDocument(getter_AddRefs(domDoc));
-    currentWindow = do_QueryInterface(GetWindowFromDocument(domDoc));
-  }
-  else if (mCurrentWindow) {
-    nsGlobalWindow *win =
-      static_cast<nsGlobalWindow *>
-                 (static_cast<nsIDOMWindowInternal *>(mCurrentWindow));
-    currentWindow = win->GetPrivateParent();
-  }
-  else return NS_OK;
 
-  while(currentWindow) {
-    nsCOMPtr<nsIDOMWindowInternal> domWindow(do_QueryInterface(currentWindow));
+  nsCOMPtr<nsIDOMElement> focusedElement;
+  nsCOMPtr<nsIDOMWindow> focusedWindow;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    fm->GetFocusedElement(getter_AddRefs(focusedElement));
+    fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
+  }
+
+  while (focusedWindow) {
+    nsCOMPtr<nsIDOMWindowInternal> domWindow(do_QueryInterface(focusedWindow));
 
     nsCOMPtr<nsIControllers> controllers2;
     domWindow->GetControllers(getter_AddRefs(controllers2));
@@ -481,124 +193,17 @@ nsFocusController::GetControllerForCommand(const char * aCommand,
       }
     }
 
+    // XXXndeakin P3 is this casting safe?
+    nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(focusedWindow); 
     nsGlobalWindow *win =
       static_cast<nsGlobalWindow *>
-                 (static_cast<nsIDOMWindowInternal *>(currentWindow));
-    currentWindow = win->GetPrivateParent();
+                 (static_cast<nsIDOMWindowInternal *>(piWindow));
+    focusedWindow = win->GetPrivateParent();
   }
   
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsFocusController::GetSuppressFocusScroll(PRBool* aSuppressFocusScroll)
-{
-  *aSuppressFocusScroll = mSuppressFocusScroll;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::SetSuppressFocusScroll(PRBool aSuppressFocusScroll)
-{
-  mSuppressFocusScroll = aSuppressFocusScroll;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::GetSuppressFocus(PRBool* aSuppressFocus)
-{
-  *aSuppressFocus = (mSuppressFocus > 0);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::SetSuppressFocus(PRBool aSuppressFocus, const char* aReason)
-{
-  if(aSuppressFocus) {
-    ++mSuppressFocus;
-    //#ifdef DEBUG_hyatt
-    //printf("[%p] SuppressFocus incremented to %d. The reason is %s.\n", this, mSuppressFocus, aReason);
-    //#endif
-  }
-  else if(mSuppressFocus > 0) {
-    --mSuppressFocus;
-    //#ifdef DEBUG_hyatt
-    //printf("[%p] SuppressFocus decremented to %d. The reason is %s.\n", this, mSuppressFocus, aReason);
-    //#endif
-  }
-  else 
-    // It's ok to unsuppress even if no suppression is active (bug 112294)
-    return NS_OK;
-
-  // we are unsuppressing after activating, so update focus-related commands
-  // we need this to update command, including the case where there is no element
-  // because nsPresShell::UnsuppressPainting may have just now unsuppressed
-  // focus on the currently focused window
-  if (!mSuppressFocus) {
-    // Always update commands if we have a current element
-    // and mNeedUpdateCommands is true (checked in nsFC::UpdateCommands)
-    UpdateCommands();
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::GetActive(PRBool* aActive)
-{
-  *aActive = mActive;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::SetActive(PRBool aActive)
-{
-  mActive = aActive;
-
-  // We may be activated before we ever have a focused window set.
-  // This happens on window creation, where the FocusController
-  // is activated just prior to setting the focused window.
-  // (see nsEventStateManager::PreHandleEvent/NS_ACTIVATE)
-  // If this is the case, we need to queue a notification of the
-  // WindowWatcher until SetFocusedWindow is called.
-  if (mActive) {
-    if (mCurrentWindow)
-      UpdateWWActiveWindow();
-    else
-      mUpdateWindowWatcher = PR_TRUE;
-  } else
-    mUpdateWindowWatcher = PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFocusController::ResetElementFocus()
-{
-  mCurrentElement = mPreviousElement = nsnull;
-  return NS_OK;
-}
-
-void
-nsFocusController::UpdateWWActiveWindow()
-{
-  // Inform the window watcher of the new active window.
-  nsCOMPtr<nsIWindowWatcher> wwatch = do_GetService("@mozilla.org/embedcomp/window-watcher;1");
-  if (!wwatch) return;
-
-  // This gets the toplevel DOMWindow
-  nsCOMPtr<nsIDocShellTreeItem> docShellAsItem =
-    do_QueryInterface(mCurrentWindow->GetDocShell());
-  if (!docShellAsItem) return;
-
-  nsCOMPtr<nsIDocShellTreeItem> rootItem;
-  docShellAsItem->GetRootTreeItem(getter_AddRefs(rootItem));
-  NS_ASSERTION(rootItem, "Invalid docshell tree - no root!");
-
-  nsCOMPtr<nsIDOMWindow> domWin = do_GetInterface(rootItem);
-  wwatch->SetActiveWindow(domWin);
-}
-
 NS_IMETHODIMP
 nsFocusController::GetPopupNode(nsIDOMNode** aNode)
 {
diff --git a/dom/base/nsFocusController.h b/dom/base/nsFocusController.h
index d34b5082d3d9..20da028b4c2d 100644
--- a/dom/base/nsFocusController.h
+++ b/dom/base/nsFocusController.h
@@ -55,76 +55,30 @@ class nsPIDOMWindow;
 class nsIController;
 class nsIControllers;
 
-class nsFocusController : public nsIFocusController, 
-                          public nsIDOMFocusListener,
+class nsFocusController : public nsIFocusController,
                           public nsSupportsWeakReference
 {
 public:
   static NS_IMETHODIMP Create(nsIFocusController** aResult);
 
-protected:
-  nsFocusController(void);
-  virtual ~nsFocusController(void);
-
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
-  NS_IMETHOD GetFocusedElement(nsIDOMElement** aResult);
-  NS_IMETHOD SetFocusedElement(nsIDOMElement* aElement);
-
-  NS_IMETHOD GetFocusedWindow(nsIDOMWindowInternal** aResult);
-  NS_IMETHOD SetFocusedWindow(nsIDOMWindowInternal* aResult);
-
-  NS_IMETHOD GetSuppressFocus(PRBool* aSuppressFlag);
-  NS_IMETHOD SetSuppressFocus(PRBool aSuppressFlag, const char* aReason);
-
-  NS_IMETHOD GetSuppressFocusScroll(PRBool* aSuppressFlag);
-  NS_IMETHOD SetSuppressFocusScroll(PRBool aSuppressFlag);
-  
-  NS_IMETHOD GetActive(PRBool* aActive);
-  NS_IMETHOD SetActive(PRBool aActive);
-
   NS_IMETHOD GetPopupNode(nsIDOMNode** aNode);
   NS_IMETHOD SetPopupNode(nsIDOMNode* aNode);
 
   NS_IMETHOD GetControllerForCommand(const char *aCommand, nsIController** aResult);
   NS_IMETHOD GetControllers(nsIControllers** aResult);
 
-  NS_IMETHOD MoveFocus(PRBool aForward, nsIDOMElement* aElt);
-  NS_IMETHOD RewindFocusState();
-
-  NS_IMETHOD ResetElementFocus();
-
-  // nsIDOMFocusListener
-  NS_IMETHOD Focus(nsIDOMEvent* aEvent);
-  NS_IMETHOD Blur(nsIDOMEvent* aEvent);
-
-  // nsIDOMEventListener
-  NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; }
-
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsFocusController,
                                            nsIFocusController)
 
-protected:
-  void UpdateCommands();
-  void UpdateWWActiveWindow();
-
 public:
   static nsPIDOMWindow *GetWindowFromDocument(nsIDOMDocument* aElement);
 
 // Members
 protected:
-  nsCOMPtr<nsIDOMElement> mCurrentElement; // [OWNER]
-  nsCOMPtr<nsIDOMElement> mPreviousElement; // [OWNER]
-  nsCOMPtr<nsPIDOMWindow> mCurrentWindow; // [OWNER]
-  nsCOMPtr<nsPIDOMWindow> mPreviousWindow; // [OWNER]
   nsCOMPtr<nsIDOMNode> mPopupNode; // [OWNER]
-
-  PRUint32 mSuppressFocus;
-  PRPackedBool mSuppressFocusScroll;
-  PRPackedBool mActive;
-  PRPackedBool mUpdateWindowWatcher;
-  PRPackedBool mNeedUpdateCommands;
 };
 
 #endif // nsFocusController_h__
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
new file mode 100644
index 000000000000..500ef4cbbe53
--- /dev/null
+++ b/dom/base/nsFocusManager.cpp
@@ -0,0 +1,2821 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozila.org code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsFocusManager.h"
+
+#include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsIServiceManager.h"
+#include "nsIEnumerator.h"
+#include "nsTPtrArray.h"
+#include "nsGkAtoms.h"
+#include "nsIPrefBranch2.h"
+#include "nsContentUtils.h"
+#include "nsIDocument.h"
+#include "nsIDOMWindow.h"
+#include "nsPIDOMWindow.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMXULElement.h"
+#include "nsIDOMNSHTMLFrameElement.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMHTMLMapElement.h"
+#include "nsIDOMHTMLLegendElement.h"
+#include "nsIDOMDocumentRange.h"
+#include "nsIDOMRange.h"
+#include "nsIHTMLDocument.h"
+#include "nsIFormControlFrame.h"
+#include "nsGenericHTMLElement.h"
+#include "nsIDocShell.h"
+#include "nsIEditorDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDocShellTreeOwner.h"
+#include "nsLayoutUtils.h"
+#include "nsIPresShell.h"
+#include "nsIContentViewer.h"
+#include "nsFrameTraversal.h"
+#include "nsObjectFrame.h"
+#include "nsEventDispatcher.h"
+#include "nsIEventStateManager.h"
+#include "nsIMEStateManager.h"
+#include "nsIWebNavigation.h"
+#include "nsCaret.h"
+#include "nsWidgetsCID.h"
+#include "nsILookAndFeel.h"
+#include "nsIWidget.h"
+#include "nsIBaseWindow.h"
+#include "nsIViewManager.h"
+#include "nsFrameSelection.h"
+#include "nsXULPopupManager.h"
+#include "nsImageMapUtils.h"
+
+#ifdef MOZ_XUL
+#include "nsIDOMXULTextboxElement.h"
+#include "nsIDOMXULMenuListElement.h"
+#endif
+
+//#define DEBUG_FOCUS 1
+//#define DEBUG_FOCUS_NAVIGATION 1
+#define PRINTTAGF(format, content)                     \
+  {                                                    \
+    nsAutoString tag(NS_LITERAL_STRING("(none)"));     \
+    if (content)                                       \
+      content->Tag()->ToString(tag);                   \
+    printf(format, NS_ConvertUTF16toUTF8(tag).get());  \
+  }
+
+struct nsDelayedBlurOrFocusEvent
+{
+  nsDelayedBlurOrFocusEvent(PRUint32 aType,
+                            nsIPresShell* aPresShell,
+                            nsIDocument* aDocument,
+                            nsPIDOMEventTarget* aTarget)
+   : mType(aType),
+     mPresShell(aPresShell),
+     mDocument(aDocument),
+     mTarget(aTarget) { }
+
+  nsDelayedBlurOrFocusEvent(const nsDelayedBlurOrFocusEvent& aOther)
+   : mType(aOther.mType),
+     mPresShell(aOther.mPresShell),
+     mDocument(aOther.mDocument),
+     mTarget(aOther.mTarget) { }
+
+  PRUint32 mType;
+  nsCOMPtr<nsIPresShell> mPresShell;
+  nsCOMPtr<nsIDocument> mDocument;
+  nsCOMPtr<nsPIDOMEventTarget> mTarget;
+};
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFocusManager)
+  NS_INTERFACE_MAP_ENTRY(nsIFocusManager)
+  NS_INTERFACE_MAP_ENTRY(nsIObserver)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIFocusManager)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFocusManager)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFocusManager)
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsFocusManager)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFocusManager)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mActiveWindow)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFocusedWindow)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFocusedContent)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstBlurEvent)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstFocusEvent)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mWindowBeingLowered)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFocusManager)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mActiveWindow)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFocusedWindow)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFocusedContent)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstBlurEvent)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstFocusEvent)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mWindowBeingLowered)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
+
+nsIFocusManager* nsFocusManager::sInstance = nsnull;
+
+nsFocusManager::nsFocusManager()
+{ }
+
+nsFocusManager::~nsFocusManager()
+{
+  nsCOMPtr<nsIPrefBranch2> prefBranch =
+    do_QueryInterface(nsContentUtils::GetPrefBranch());
+
+  if (prefBranch) {
+    prefBranch->RemoveObserver("accessibility.browsewithcaret", this);
+    prefBranch->RemoveObserver("accessibility.tabfocus_applies_to_xul", this);
+  }
+}
+
+// static
+nsresult
+nsFocusManager::Init()
+{
+  nsFocusManager* fm = new nsFocusManager();
+  NS_ENSURE_TRUE(fm, NS_ERROR_OUT_OF_MEMORY);
+  NS_ADDREF(fm);
+  sInstance = fm;
+
+  nsIContent::sTabFocusModelAppliesToXUL =
+    nsContentUtils::GetBoolPref("accessibility.tabfocus_applies_to_xul",
+                                nsIContent::sTabFocusModelAppliesToXUL);
+
+  nsCOMPtr<nsIPrefBranch2> prefBranch =
+    do_QueryInterface(nsContentUtils::GetPrefBranch());
+  prefBranch->AddObserver("accessibility.browsewithcaret", fm, PR_TRUE);
+  prefBranch->AddObserver("accessibility.tabfocus_applies_to_xul", fm, PR_TRUE);
+
+  return NS_OK;
+}
+
+// static
+void
+nsFocusManager::Shutdown()
+{
+  NS_IF_RELEASE(sInstance);
+}
+
+NS_IMETHODIMP
+nsFocusManager::Observe(nsISupports *aSubject,
+                        const char *aTopic,
+                        const PRUnichar *aData)
+{
+  nsDependentString data(aData);
+  if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
+    if (data.EqualsLiteral("accessibility.browsewithcaret")) {
+      UpdateCaret(PR_FALSE, PR_TRUE, mFocusedContent);
+    }
+    else if (data.EqualsLiteral("accessibility.tabfocus_applies_to_xul")) {
+      nsIContent::sTabFocusModelAppliesToXUL =
+        nsContentUtils::GetBoolPref("accessibility.tabfocus_applies_to_xul",
+                                    nsIContent::sTabFocusModelAppliesToXUL);
+    }
+  }
+
+  return NS_OK;
+}
+
+// given a frame content node, retrieve the nsIDOMWindow displayed in it 
+static nsPIDOMWindow*
+GetContentWindow(nsIContent* aContent)
+{
+  nsIDocument* doc = aContent->GetCurrentDoc();
+  if (doc) {
+    nsIDocument* subdoc = doc->GetSubDocumentFor(aContent);
+    if (subdoc)
+      return subdoc->GetWindow();
+  }
+
+  return nsnull;
+}
+
+// get the current window for the given content node 
+static nsPIDOMWindow*
+GetCurrentWindow(nsIContent* aContent)
+{
+  nsIDocument *doc = aContent->GetCurrentDoc();
+  return doc ? doc->GetWindow() : nsnull;
+}
+
+// static
+nsIContent*
+nsFocusManager::GetFocusedDescendant(nsPIDOMWindow* aWindow, PRBool aDeep,
+                                     nsPIDOMWindow** aFocusedWindow)
+{
+  NS_ENSURE_TRUE(aWindow, nsnull);
+
+  *aFocusedWindow = nsnull;
+
+  nsIContent* currentContent = nsnull;
+  nsPIDOMWindow* window = aWindow->GetOuterWindow();
+  while (window) {
+    *aFocusedWindow = window;
+    currentContent = window->GetFocusedNode();
+    if (!currentContent || !aDeep)
+      break;
+
+    window = GetContentWindow(currentContent);
+  }
+
+  NS_IF_ADDREF(*aFocusedWindow);
+
+  return currentContent;
+}
+
+// static
+nsIContent*
+nsFocusManager::GetRedirectedFocus(nsIContent* aContent)
+{
+#ifdef MOZ_XUL
+  if (aContent->IsNodeOfType(nsINode::eXUL)) {
+    nsCOMPtr<nsIDOMNode> inputField;
+
+    nsCOMPtr<nsIDOMXULTextBoxElement> textbox = do_QueryInterface(aContent);
+    if (textbox) {
+      textbox->GetInputField(getter_AddRefs(inputField));
+    }
+    else {
+      nsCOMPtr<nsIDOMXULMenuListElement> menulist = do_QueryInterface(aContent);
+      if (menulist) {
+        menulist->GetInputField(getter_AddRefs(inputField));
+      }
+      else if (aContent->Tag() == nsGkAtoms::scale) {
+        nsCOMPtr<nsIDocument> doc = aContent->GetCurrentDoc();
+        if (!doc)
+          return nsnull;
+
+        nsINodeList* children = doc->BindingManager()->GetXBLChildNodesFor(aContent);
+        if (children) {
+          nsIContent* child = children->GetNodeAt(0);
+          if (child && child->Tag() == nsGkAtoms::slider)
+            return child;
+        }
+      }
+    }
+
+    if (inputField) {
+      nsCOMPtr<nsIContent> retval = do_QueryInterface(inputField);
+      return retval;
+    }
+  }
+#endif
+
+  return nsnull;
+}
+
+NS_IMETHODIMP
+nsFocusManager::GetActiveWindow(nsIDOMWindow** aWindow)
+{
+  NS_IF_ADDREF(*aWindow = mActiveWindow);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::SetActiveWindow(nsIDOMWindow* aWindow)
+{
+  // only top-level windows can be made active
+  nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(aWindow);
+  NS_ASSERTION(piWindow && piWindow->IsOuterWindow(), "outer window expected");
+
+  NS_ENSURE_TRUE(piWindow && (piWindow == piWindow->GetPrivateRoot()),
+                 NS_ERROR_INVALID_ARG);
+
+  RaiseWindow(piWindow);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::GetFocusedWindow(nsIDOMWindow** aFocusedWindow)
+{
+  NS_IF_ADDREF(*aFocusedWindow = mFocusedWindow);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFocusManager::SetFocusedWindow(nsIDOMWindow* aWindowToFocus)
+{
+#ifdef DEBUG_FOCUS
+  printf("<<SetFocusedWindow begin>>\n");
+#endif
+
+  nsCOMPtr<nsPIDOMWindow> windowToFocus(do_QueryInterface(aWindowToFocus));
+  NS_ENSURE_TRUE(windowToFocus, NS_ERROR_FAILURE);
+
+  windowToFocus = windowToFocus->GetOuterWindow();
+
+  nsCOMPtr<nsIContent> frameContent =
+    do_QueryInterface(windowToFocus->GetFrameElementInternal());
+  if (frameContent) {
+    // pass false so that the caret does not get updated and scrolling does
+    // not occur.
+    SetFocusInner(frameContent, 0, PR_FALSE);
+  }
+  else {
+    // this is a top-level window. If the window has a child frame focused,
+    // clear the focus. Otherwise, focus should already be in this frame, or
+    // already cleared. This ensures that focus will be in this frame and not
+    // in a child.
+    nsIContent* content = windowToFocus->GetFocusedNode();
+    if (content) {
+      nsCOMPtr<nsIDOMWindow> childWindow = GetContentWindow(content);
+      if (childWindow)
+        ClearFocus(childWindow);
+    }
+  }
+
+  nsCOMPtr<nsPIDOMWindow> rootWindow = windowToFocus->GetPrivateRoot();
+  if (rootWindow)
+    RaiseWindow(rootWindow);
+
+#ifdef DEBUG_FOCUS
+  printf("<<SetFocusedWindow end>>\n");
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::GetFocusedElement(nsIDOMElement** aFocusedElement)
+{
+  if (mFocusedContent)
+    CallQueryInterface(mFocusedContent, aFocusedElement);
+  else
+    *aFocusedElement = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::GetLastFocusMethod(nsIDOMWindow* aWindow, PRUint32* aLastFocusMethod)
+{
+  // the focus method is stored on the inner window
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  if (window)
+    window = window->GetCurrentInnerWindow();
+  if (!window)
+    window = mFocusedWindow;
+
+  *aLastFocusMethod = window ? window->GetFocusMethod() : 0;
+
+  NS_ASSERTION((*aLastFocusMethod & FOCUSMETHOD_MASK) == *aLastFocusMethod,
+               "invalid focus method");
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::SetFocus(nsIDOMElement* aElement, PRUint32 aFlags)
+{
+#ifdef DEBUG_FOCUS
+  printf("<<SetFocus>>\n");
+#endif
+
+  nsCOMPtr<nsIContent> newFocus = do_QueryInterface(aElement);
+  NS_ENSURE_ARG(newFocus);
+
+  SetFocusInner(newFocus, aFlags, PR_TRUE);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::MoveFocus(nsIDOMWindow* aWindow, nsIDOMElement* aStartElement,
+                          PRUint32 aType, PRUint32 aFlags, nsIDOMElement** aElement)
+{
+  *aElement = nsnull;
+
+#ifdef DEBUG_FOCUS
+  printf("<<MoveFocus Type: %d Flags: %d>>\n<<", aType, aFlags);
+
+  nsCOMPtr<nsPIDOMWindow> focusedWindow = mFocusedWindow;
+  if (focusedWindow) {
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(focusedWindow->GetExtantDocument());
+    if (doc) {
+      nsCAutoString spec;
+      doc->GetDocumentURI()->GetSpec(spec);
+      printf(" [%p] Focused Window: %s", mFocusedWindow.get(), spec.get());
+    }
+  }
+  PRINTTAGF(">> $[[%s]]\n", mFocusedContent);
+#endif
+
+  nsCOMPtr<nsPIDOMWindow> window;
+  nsCOMPtr<nsIContent> startContent;
+  if (aStartElement) {
+    startContent = do_QueryInterface(aStartElement);
+    NS_ENSURE_TRUE(startContent, NS_ERROR_INVALID_ARG);
+
+    window = GetCurrentWindow(startContent);
+  }
+  else {
+    window = aWindow ? do_QueryInterface(aWindow) : mFocusedWindow;
+    NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
+    window = window->GetOuterWindow();
+  }
+
+  NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
+
+  nsCOMPtr<nsIContent> newFocus;
+  nsresult rv = DetermineElementToMoveFocus(window, startContent, aType,
+                                            getter_AddRefs(newFocus));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+#ifdef DEBUG_FOCUS_NAVIGATION
+  PRINTTAGF("-> Element to be focused: %s\n", newFocus);
+#endif
+
+  if (newFocus) {
+    // for caret movement, pass false for the aFocusChanged argument,
+    // otherwise the caret will end up moving to the focus position. This
+    // would be a problem because the caret would move to the beginning of the
+    // focused link making it impossible to navigate the caret over a link.
+    SetFocusInner(newFocus, aFlags, aType != MOVEFOCUS_CARET);
+    CallQueryInterface(newFocus, aElement);
+  }
+  else if (aType == MOVEFOCUS_ROOT || aType == MOVEFOCUS_CARET) {
+    // no content was found, so clear the focus for these two types.
+    ClearFocus(window);
+  }
+
+#ifdef DEBUG_FOCUS
+  printf("<<MoveFocus end>>\n");
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::ClearFocus(nsIDOMWindow* aWindow)
+{
+#ifdef DEBUG_FOCUS
+  printf("<<ClearFocus begin>>\n");
+#endif
+
+  // if the window to clear is the focused window or an ancestor of the
+  // focused window, then blur the existing focused content. Otherwise, the
+  // focus is somewhere else so just update the current node.
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, NS_ERROR_INVALID_ARG);
+
+  window = window->GetOuterWindow();
+  NS_ENSURE_TRUE(window, NS_ERROR_INVALID_ARG);
+
+  if (IsSameOrAncestor(window, mFocusedWindow)) {
+    PRBool isAncestor = (window != mFocusedWindow);
+    if (Blur(window, nsnull, isAncestor)) {
+      // if we are clearing the focus on an ancestor of the focused window,
+      // the ancestor will become the new focused window, so focus it
+      if (isAncestor)
+        Focus(window, nsnull, 0, PR_TRUE, PR_FALSE, PR_FALSE);
+    }
+  }
+  else {
+    window->SetFocusedNode(nsnull);
+  }
+
+#ifdef DEBUG_FOCUS
+  printf("<<ClearFocus end>>\n");
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::GetFocusedElementForWindow(nsIDOMWindow* aWindow,
+                                           PRBool aDeep,
+                                           nsIDOMWindow** aFocusedWindow,
+                                           nsIDOMElement** aElement)
+{
+  *aElement = nsnull;
+  if (aFocusedWindow)
+    *aFocusedWindow = nsnull;
+
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, NS_ERROR_INVALID_ARG);
+
+  window = window->GetOuterWindow();
+  NS_ENSURE_TRUE(window, NS_ERROR_INVALID_ARG);
+
+  nsCOMPtr<nsPIDOMWindow> focusedWindow;
+  nsCOMPtr<nsIContent> focusedContent =
+    GetFocusedDescendant(window, aDeep, getter_AddRefs(focusedWindow));
+  if (focusedContent)
+    CallQueryInterface(focusedContent, aElement);
+
+  if (aFocusedWindow)
+    NS_IF_ADDREF(*aFocusedWindow = focusedWindow);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::MoveCaretToFocus(nsIDOMWindow* aWindow)
+{
+  PRInt32 itemType = nsIDocShellTreeItem::typeChrome;
+
+  nsCOMPtr<nsIWebNavigation> webnav = do_GetInterface(aWindow);
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(webnav);
+  if (dsti) {
+    dsti->GetItemType(&itemType);
+    if (itemType != nsIDocShellTreeItem::typeChrome) {
+      // don't move the caret for editable documents
+      nsCOMPtr<nsIEditorDocShell> editorDocShell(do_QueryInterface(dsti));
+      if (editorDocShell) {
+        PRBool isEditable;
+        editorDocShell->GetEditable(&isEditable);
+        if (isEditable)
+          return NS_OK;
+      }
+
+      nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(dsti);
+      NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
+
+      nsCOMPtr<nsIPresShell> presShell;
+      docShell->GetPresShell(getter_AddRefs(presShell));
+      NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
+
+      nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+      nsCOMPtr<nsIContent> content = window->GetFocusedNode();
+      if (content)
+        MoveCaretToFocus(presShell, content);
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::WindowRaised(nsIDOMWindow* aWindow)
+{
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
+  NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);
+
+#ifdef DEBUG_FOCUS
+  printf("Window %p Raised [Currently: %p %p] <<", aWindow, mActiveWindow.get(), mFocusedWindow.get());
+  nsCAutoString spec;
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
+  if (doc) {
+    doc->GetDocumentURI()->GetSpec(spec);
+    printf("[%p] Raised Window: %s", aWindow, spec.get());
+  }
+  if (mActiveWindow) {
+    doc = do_QueryInterface(mActiveWindow->GetExtantDocument());
+    if (doc) {
+      doc->GetDocumentURI()->GetSpec(spec);
+      printf(" [%p] Active Window: %s", mActiveWindow.get(), spec.get());
+    }
+  }
+  printf(">>\n");
+#endif
+
+  if (mActiveWindow == window) {
+    // The window is already active, so there is no need to focus anything,
+    // but make sure that the right widget is focused. This is a special case
+    // for Windows because when restoring a minimized window, a second
+    // activation will occur and the top-level widget could be focused instead
+    // of the child we want. We solve this by calling SetFocus to ensure that
+    // what the focus manager thinks should be the current widget is actually
+    // focused.
+    EnsureCurrentWidgetFocused();
+    return NS_OK;
+  }
+
+  // lower the existing window, if any. This shouldn't happen usually.
+  if (mActiveWindow)
+    WindowLowered(mActiveWindow);
+
+  nsCOMPtr<nsIWebNavigation> webnav(do_GetInterface(aWindow));
+  nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(webnav));
+  // If there's no docShellAsItem, this window must have been closed,
+  // in that case there is no tree owner.
+  NS_ENSURE_TRUE(docShellAsItem, NS_OK);
+
+  // set this as the active window
+  mActiveWindow = window;
+
+  // ensure that the window is enabled and visible
+  nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
+  docShellAsItem->GetTreeOwner(getter_AddRefs(treeOwner));
+  nsCOMPtr<nsIBaseWindow> baseWindow = do_QueryInterface(treeOwner);
+  if (baseWindow) {
+    PRBool isEnabled = PR_TRUE;
+    if (NS_SUCCEEDED(baseWindow->GetEnabled(&isEnabled)) && !isEnabled) {
+      return NS_ERROR_FAILURE;
+    }
+
+    baseWindow->SetVisibility(PR_TRUE);
+  }
+
+  // inform the DOM window that it has activated, so that the active attribute
+  // is updated on the window
+  window->ActivateOrDeactivate(PR_TRUE);
+
+  // retrieve the last focused element within the window that was raised
+  nsCOMPtr<nsPIDOMWindow> currentWindow;
+  nsCOMPtr<nsIContent> currentFocus =
+    GetFocusedDescendant(window, PR_TRUE, getter_AddRefs(currentWindow));
+
+  NS_ASSERTION(currentWindow, "window raised with no window current");
+  if (!currentWindow)
+    return NS_OK;
+
+  nsCOMPtr<nsIDocShell> currentDocShell = currentWindow->GetDocShell();
+
+  nsCOMPtr<nsIPresShell> presShell;
+  currentDocShell->GetPresShell(getter_AddRefs(presShell));
+  if (presShell) {
+    // disable selection mousedown state on activation
+    // XXXndeakin P3 not sure if this is necessary, but it doesn't hurt
+    nsCOMPtr<nsFrameSelection> frameSelection = presShell->FrameSelection();
+    frameSelection->SetMouseDownState(PR_FALSE);
+  }
+
+  Focus(currentWindow, currentFocus, 0, PR_TRUE, PR_FALSE, PR_TRUE);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::WindowLowered(nsIDOMWindow* aWindow)
+{
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
+  NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);
+
+#ifdef DEBUG_FOCUS
+  printf("Window %p Lowered [Currently: %p %p] <<", aWindow, mActiveWindow.get(), mFocusedWindow.get());
+  nsCAutoString spec;
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
+  if (doc) {
+    doc->GetDocumentURI()->GetSpec(spec);
+    printf("[%p] Lowered Window: %s", aWindow, spec.get());
+  }
+  if (mActiveWindow) {
+    doc = do_QueryInterface(mActiveWindow->GetExtantDocument());
+    if (doc) {
+      doc->GetDocumentURI()->GetSpec(spec);
+      printf(" [%p] Active Window: %s", mActiveWindow.get(), spec.get());
+    }
+  }
+  printf(">>\n");
+#endif
+
+  if (mActiveWindow != window)
+    return NS_OK;
+
+  // inform the DOM window that it has deactivated, so that the active
+  // attribute is updated on the window
+  window->ActivateOrDeactivate(PR_FALSE);
+
+  // keep track of the window being lowered, so that attempts to raise the
+  // window can be prevented until we return. Otherwise, focus can get into
+  // an unusual state.
+  mWindowBeingLowered = mActiveWindow;
+  mActiveWindow = nsnull;
+
+  if (mFocusedWindow)
+    Blur(nsnull, nsnull, PR_TRUE);
+
+  mWindowBeingLowered = nsnull;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
+{
+  NS_ENSURE_ARG(aDocument);
+  NS_ENSURE_ARG(aContent);
+
+  nsPIDOMWindow *window = aDocument->GetWindow();
+  if (!window)
+    return NS_OK;
+
+  // if the content is currently focused in the window, or is an ancestor
+  // of the currently focused element, reset the focus within that window.
+  // Note that nothing special needs to happen when the focused node is an
+  // iframe; in that case, DocumentUnloaded should be called to invalidate the
+  // child frame.
+  nsCOMPtr<nsIContent> content = window->GetFocusedNode();
+  if (content && nsContentUtils::ContentIsDescendantOf(content, aContent)) {
+    window->SetFocusedNode(nsnull);
+
+    nsCOMPtr<nsIDocShell> docShell = window->GetDocShell();
+    if (docShell) {
+      nsCOMPtr<nsIPresShell> presShell;
+      docShell->GetPresShell(getter_AddRefs(presShell));
+      nsIMEStateManager::OnRemoveContent(presShell->GetPresContext(), content);
+    }
+
+    // if this window is currently focused, clear the global focused
+    // element as well, but don't fire any events.
+    if (window == mFocusedWindow)
+      mFocusedContent = nsnull;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::WindowShown(nsIDOMWindow* aWindow)
+{
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
+  NS_ENSURE_TRUE(window, NS_ERROR_INVALID_ARG);
+
+  window = window->GetOuterWindow();
+
+#ifdef DEBUG_FOCUS
+  printf("Window %p Shown [Currently: %p %p] <<", window.get(), mActiveWindow.get(), mFocusedWindow.get());
+  nsCAutoString spec;
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
+  if (doc) {
+    doc->GetDocumentURI()->GetSpec(spec);
+    printf("Shown Window: %s", spec.get());
+  }
+
+  if (mFocusedWindow) {
+    doc = do_QueryInterface(mFocusedWindow->GetExtantDocument());
+    if (doc) {
+      doc->GetDocumentURI()->GetSpec(spec);
+      printf(" Focused Window: %s", spec.get());
+    }
+  }
+  printf(">>\n");
+#endif
+
+  if (mFocusedWindow != window)
+    return NS_OK;
+
+  nsCOMPtr<nsPIDOMWindow> currentWindow;
+  nsCOMPtr<nsIContent> currentFocus =
+    GetFocusedDescendant(window, PR_TRUE, getter_AddRefs(currentWindow));
+  if (currentWindow)
+    Focus(currentWindow, currentFocus, 0, PR_TRUE, PR_FALSE, PR_FALSE);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::WindowHidden(nsIDOMWindow* aWindow)
+{
+  // if there is no window or it is not the same or an ancestor of the
+  // currently focused window, just return, as the current focus will not
+  // be affected.
+
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
+  NS_ENSURE_TRUE(window, NS_ERROR_INVALID_ARG);
+
+  window = window->GetOuterWindow();
+
+#ifdef DEBUG_FOCUS
+  printf("Window %p Hidden [Currently: %p %p] <<", window.get(), mActiveWindow.get(), mFocusedWindow.get());
+  nsCAutoString spec;
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
+  if (doc) {
+    doc->GetDocumentURI()->GetSpec(spec);
+    printf("Hide Window: %s", spec.get());
+  }
+
+  if (mFocusedWindow) {
+    doc = do_QueryInterface(mFocusedWindow->GetExtantDocument());
+    if (doc) {
+      doc->GetDocumentURI()->GetSpec(spec);
+      printf(" Focused Window: %s", spec.get());
+    }
+  }
+
+  if (mActiveWindow) {
+    doc = do_QueryInterface(mActiveWindow->GetExtantDocument());
+    if (doc) {
+      doc->GetDocumentURI()->GetSpec(spec);
+      printf(" Active Window: %s", spec.get());
+    }
+  }
+  printf(">>\n");
+#endif
+
+  if (!IsSameOrAncestor(window, mFocusedWindow))
+    return NS_OK;
+
+  // at this point, we know that the window being hidden is either the focused
+  // window, or an ancestor of the focused window. Either way, the focus is no
+  // longer valid, so it needs to be updated.
+
+  nsCOMPtr<nsIDocShell> focusedDocShell = mFocusedWindow->GetDocShell();
+  nsCOMPtr<nsIPresShell> presShell;
+  focusedDocShell->GetPresShell(getter_AddRefs(presShell));
+  if (presShell) {
+    nsPresContext* presContext = presShell->GetPresContext();
+    presContext->EventStateManager()->SetContentState(mFocusedContent, NS_EVENT_STATE_FOCUS);  
+  }
+
+  mFocusedContent = nsnull;
+
+  nsIMEStateManager::OnTextStateBlur(nsnull, nsnull);
+  if (presShell) {
+    nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nsnull);
+    SetCaretVisible(presShell, PR_FALSE, nsnull);
+  }
+
+  // if the docshell being hidden is being destroyed, then we want to move
+  // focus somewhere else. Call ClearFocus on the toplevel window, which
+  // will have the effect of clearing the focus and moving the focused window
+  // to the toplevel window. But if the window isn't being destroyed, we are
+  // likely just loading a new document in it, so we want to maintain the
+  // focused window so that the new document gets properly focused.
+  PRBool beingDestroyed;
+  nsCOMPtr<nsIDocShell> docShellBeingHidden = window->GetDocShell();
+  docShellBeingHidden->IsBeingDestroyed(&beingDestroyed);
+  if (beingDestroyed) {
+    // There is usually no need to do anything if a toplevel window is going
+    // away, as we assume that WindowLowered will be called. However, this may
+    // not happen if nsIAppStartup::eForceQuit is used to quit, and can cause
+    // a leak. So if the active window is being destroyed, call WindowLowered
+    // directly.
+    NS_ASSERTION(mFocusedWindow->IsOuterWindow(), "outer window expected");
+    if (mActiveWindow == mFocusedWindow || mActiveWindow == window)
+      WindowLowered(mActiveWindow);
+    else
+      ClearFocus(mActiveWindow);
+    return NS_OK;
+  }
+
+  // if the window being hidden is an ancestor of the focused window, adjust
+  // the focused window so that it points to the one being hidden. This
+  // ensures that the focused window isn't in a chain of frames that doesn't
+  // exist any more.
+  if (window != mFocusedWindow) {
+    nsCOMPtr<nsIWebNavigation> webnav(do_GetInterface(window));
+    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(webnav);
+    if (dsti) {
+      dsti->GetParent(getter_AddRefs(dsti));
+      nsCOMPtr<nsPIDOMWindow> parentWindow = do_GetInterface(dsti);
+      if (parentWindow)
+        parentWindow->SetFocusedNode(nsnull);
+
+    }
+
+    mFocusedWindow = window;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFocusManager::FireDelayedEvents(nsIDocument* aDocument)
+{
+  NS_ENSURE_ARG(aDocument);
+
+  // fire any delayed focus and blur events in the same order that they were added
+  for (PRUint32 i = 0; i < mDelayedBlurFocusEvents.Length(); i++)
+  {
+    if (mDelayedBlurFocusEvents[i].mDocument == aDocument &&
+        !aDocument->EventHandlingSuppressed()) {
+      PRUint32 type = mDelayedBlurFocusEvents[i].mType;
+      nsCOMPtr<nsPIDOMEventTarget> target = mDelayedBlurFocusEvents[i].mTarget;
+      nsCOMPtr<nsIPresShell> presShell = mDelayedBlurFocusEvents[i].mPresShell;
+      mDelayedBlurFocusEvents.RemoveElementAt(i);
+      SendFocusOrBlurEvent(type, presShell, aDocument, target, 0);
+      --i;
+    }
+  }
+
+  return NS_OK;
+}
+
+// static
+void
+nsFocusManager::EnsureCurrentWidgetFocused()
+{
+  if (!mFocusedWindow)
+    return;
+
+  // get the main child widget for the focused window and ensure that the
+  // platform knows that this widget is focused.
+  nsCOMPtr<nsIDocShell> docShell = mFocusedWindow->GetDocShell();
+  if (docShell) {
+    nsCOMPtr<nsIPresShell> presShell;
+    docShell->GetPresShell(getter_AddRefs(presShell));
+    if (presShell) {
+      nsIViewManager* vm = presShell->GetViewManager();
+      if (vm) {
+        nsCOMPtr<nsIWidget> widget;
+        vm->GetWidget(getter_AddRefs(widget));
+        if (widget)
+          widget->SetFocus(PR_TRUE);
+      }
+    }
+  }
+}
+
+void
+nsFocusManager::SetFocusInner(nsIContent* aNewContent, PRInt32 aFlags,
+                              PRBool aFocusChanged)
+{
+  // if the element is not focusable, just return and leave the focus as is
+  nsCOMPtr<nsIContent> contentToFocus = CheckIfFocusable(aNewContent, aFlags);
+  if (!contentToFocus)
+    return;
+
+  // check if the element to focus is a frame (iframe) containing a child
+  // document. Frames are never directly focused; instead focusing a frame
+  // means focus what is inside the frame. To do this, the descendant content
+  // within the frame is retrieved and that will be focused instead.
+  nsCOMPtr<nsPIDOMWindow> newWindow;
+  nsCOMPtr<nsPIDOMWindow> subWindow = GetContentWindow(contentToFocus);
+  if (subWindow) {
+    contentToFocus = GetFocusedDescendant(subWindow, PR_TRUE, getter_AddRefs(newWindow));
+    // since a window is being refocused, clear aFocusChanged so that the
+    // caret position isn't updated.
+    aFocusChanged = PR_FALSE;
+  }
+
+  // unless it was set above, retrieve the window for the element to focus
+  if (!newWindow)
+    newWindow = GetCurrentWindow(contentToFocus);
+
+  // if the element is already focused, just return. Note that this happens
+  // after the frame check above so that we compare the element that will be
+  // focused rather than the frame it is in.
+  if (!newWindow || newWindow == mFocusedWindow && contentToFocus == mFocusedContent)
+    return;
+
+  // don't allow focus to be placed in docshells or descendants of docshells
+  // that are being destroyed
+  nsCOMPtr<nsIDocShell> newDocShell = newWindow->GetDocShell();
+  nsCOMPtr<nsIDocShell> docShell = newDocShell;
+  while (docShell) {
+    PRBool beingDestroyed;
+    docShell->IsBeingDestroyed(&beingDestroyed);
+    if (beingDestroyed)
+      return;
+
+    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(docShell);
+    dsti->GetParent(getter_AddRefs(dsti));
+    docShell = do_QueryInterface(dsti);
+  }
+
+  // if the new element is in the same window as the currently focused element 
+  PRBool isElementInFocusedWindow = (mFocusedWindow == newWindow);
+
+  // to check if the new element is in the active window, compare the
+  // new root docshell for the new element with the active window's docshell.
+  PRBool isElementInActiveWindow = PR_FALSE;
+
+  nsCOMPtr<nsIWebNavigation> webnav = do_GetInterface(newWindow);
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(webnav);
+  nsCOMPtr<nsPIDOMWindow> newRootWindow;
+  if (dsti) {
+    nsCOMPtr<nsIDocShellTreeItem> root;
+    dsti->GetRootTreeItem(getter_AddRefs(root));
+    newRootWindow = do_GetInterface(root);
+
+    isElementInActiveWindow = (mActiveWindow && newRootWindow == mActiveWindow);
+  }
+
+#ifdef DEBUG_FOCUS
+  PRINTTAGF("Shift Focus: %s", contentToFocus);
+  printf(" Flags: %d Current Window: %p New Window: %p Current Element: %p",
+         aFlags, mFocusedWindow.get(), newWindow.get(), mFocusedContent.get());
+  printf(" In Active Window: %d In Focused Window: %d\n",
+         isElementInActiveWindow, isElementInFocusedWindow);
+#endif
+
+  // if the FLAG_NOSWITCHFRAME flag is used, only allow the focus to be
+  // shifted away from the current element if the new shell to focus is
+  // the same or an ancestor shell of the currently focused shell.
+  PRBool allowFrameSwitch = !(aFlags & FLAG_NOSWITCHFRAME) ||
+                            IsSameOrAncestor(newWindow, mFocusedWindow);
+
+  // if the element is in the active window, frame switching is allowed and
+  // the content is in a visible window, fire blur and focus events.
+  if (isElementInActiveWindow && allowFrameSwitch && IsWindowVisible(newWindow)) {
+    // return if blurring fails or the focus changes during the blur
+    if (mFocusedWindow) {
+      // if the focus is being moved to another element in the same document,
+      // or to a descendant, pass the existing window to Blur so that the
+      // current node in the existing window is cleared. If moving to a
+      // window elsewhere, we want to maintain the current node in the
+      // window but still blur it.
+      PRBool currentIsSameOrAncestor = IsSameOrAncestor(mFocusedWindow, newWindow);
+      // find the common ancestor of the currently focused window and the new
+      // window. The ancestor will need to have its currently focused node
+      // cleared once the document has been blurred. Otherwise, we'll be in a
+      // state where a document is blurred yet the chain of windows above it
+      // still points to that document.
+      // For instance, in the following frame tree:
+      //   A
+      //  B C
+      //  D
+      // D is focused and we want to focus C. Once D has been blurred, we need
+      // to clear out the focus in A, otherwise A would still maintain that B
+      // was focused, and B that D was focused.
+      nsCOMPtr<nsPIDOMWindow> commonAncestor;
+      if (!isElementInFocusedWindow)
+        commonAncestor = GetCommonAncestor(newWindow, mFocusedWindow);
+
+      if (!Blur(currentIsSameOrAncestor ? mFocusedWindow : nsnull,
+                commonAncestor, !isElementInFocusedWindow))
+      return;
+    }
+
+    Focus(newWindow, contentToFocus, aFlags, !isElementInFocusedWindow,
+          aFocusChanged, PR_FALSE);
+  }
+  else {
+    // otherwise, for inactive windows, update the node in the window, and
+    // raise the window if desired.
+    if (allowFrameSwitch)
+      AdjustWindowFocus(newWindow);
+
+    // set the focus node and method as needed
+    PRUint32 focusMethod = aFocusChanged ? aFlags & FOCUSMETHOD_MASK :
+                                           newWindow->GetFocusMethod();
+    newWindow->SetFocusedNode(contentToFocus, focusMethod);
+    if (aFocusChanged) {
+      nsCOMPtr<nsIDocShell> docShell = newWindow->GetDocShell();
+
+      nsCOMPtr<nsIPresShell> presShell;
+      docShell->GetPresShell(getter_AddRefs(presShell));
+      if (presShell)
+        ScrollIntoView(presShell, contentToFocus, aFlags);
+    }
+
+    // update the commands even when inactive so that the attributes for that
+    // window are up to date.
+    if (allowFrameSwitch)
+      newWindow->UpdateCommands(NS_LITERAL_STRING("focus"));
+
+    if (aFlags & FLAG_RAISE)
+      RaiseWindow(newRootWindow);
+  }
+}
+
+PRBool
+nsFocusManager::IsSameOrAncestor(nsPIDOMWindow* aPossibleAncestor,
+                                 nsPIDOMWindow* aWindow)
+{
+  nsCOMPtr<nsIWebNavigation> awebnav(do_GetInterface(aPossibleAncestor));
+  nsCOMPtr<nsIDocShellTreeItem> ancestordsti = do_QueryInterface(awebnav);
+
+  nsCOMPtr<nsIWebNavigation> fwebnav(do_GetInterface(aWindow));
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(fwebnav);
+  while (dsti) {
+    if (dsti == ancestordsti)
+      return PR_TRUE;
+    dsti->GetParent(getter_AddRefs(dsti));
+  }
+
+  return PR_FALSE;
+}
+
+already_AddRefed<nsPIDOMWindow>
+nsFocusManager::GetCommonAncestor(nsPIDOMWindow* aWindow1,
+                                  nsPIDOMWindow* aWindow2)
+{
+  nsCOMPtr<nsIWebNavigation> webnav(do_GetInterface(aWindow1));
+  nsCOMPtr<nsIDocShellTreeItem> dsti1 = do_QueryInterface(webnav);
+
+  webnav = do_GetInterface(aWindow2);
+  nsCOMPtr<nsIDocShellTreeItem> dsti2 = do_QueryInterface(webnav);
+
+  nsAutoTPtrArray<nsIDocShellTreeItem, 30> parents1, parents2;
+  do {
+    parents1.AppendElement(dsti1);
+    dsti1->GetParent(getter_AddRefs(dsti1));
+  } while (dsti1);
+  do {
+    parents2.AppendElement(dsti2);
+    dsti2->GetParent(getter_AddRefs(dsti2));
+  } while (dsti2);
+
+  PRUint32 pos1 = parents1.Length();
+  PRUint32 pos2 = parents2.Length();
+  nsIDocShellTreeItem* parent = nsnull;
+  PRUint32 len;
+  for (len = PR_MIN(pos1, pos2); len > 0; --len) {
+    nsIDocShellTreeItem* child1 = parents1.ElementAt(--pos1);
+    nsIDocShellTreeItem* child2 = parents2.ElementAt(--pos2);
+    if (child1 != child2) {
+      break;
+    }
+    parent = child1;
+  }
+
+  nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(parent);
+  return window.forget();
+}
+
+void
+nsFocusManager::AdjustWindowFocus(nsPIDOMWindow* aWindow)
+{
+  PRBool isVisible = IsWindowVisible(aWindow);
+
+  nsCOMPtr<nsPIDOMWindow> window(aWindow);
+  while (window) {
+    // get the containing <iframe> or equivalent element so that it can be
+    // focused below.
+    nsCOMPtr<nsIContent> frameContent =
+      do_QueryInterface(window->GetFrameElementInternal());
+
+    nsCOMPtr<nsIWebNavigation> webnav(do_GetInterface(window));
+    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(webnav);
+    dsti->GetParent(getter_AddRefs(dsti));
+
+    window = do_GetInterface(dsti);
+    if (window) {
+      // if the parent window is visible but aWindow was not, then we have
+      // likely moved up and out from a hidden tab to the browser window, or a
+      // similar such arrangement. Stop adjusting the current nodes.
+      if (IsWindowVisible(window) != isVisible)
+        break;
+
+      window->SetFocusedNode(frameContent);
+    }
+  }
+}
+
+PRBool
+nsFocusManager::IsWindowVisible(nsPIDOMWindow* aWindow)
+{
+  if (!aWindow)
+    return PR_FALSE;
+
+  nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
+  nsCOMPtr<nsIBaseWindow> baseWin(do_QueryInterface(docShell));
+  if (!baseWin)
+    return PR_FALSE;
+
+  PRBool visible = PR_FALSE;
+  baseWin->GetVisibility(&visible);
+  return visible;
+}
+
+nsIContent*
+nsFocusManager::CheckIfFocusable(nsIContent* aContent, PRUint32 aFlags)
+{
+  if (!aContent)
+    return nsnull;
+
+  // this is a special case for some XUL elements where an anonymous child is
+  // actually focusable and not the element itself.
+  nsIContent* redirectedFocus = GetRedirectedFocus(aContent);
+  if (redirectedFocus)
+    return CheckIfFocusable(redirectedFocus, aFlags);
+
+  nsCOMPtr<nsIDocument> doc = aContent->GetCurrentDoc();
+  // can't focus elements that are not in documents
+  if (!doc)
+    return nsnull;
+
+  // Make sure that our frames are up to date
+  if (doc)
+    doc->FlushPendingNotifications(Flush_Frames);
+
+  nsIPresShell *shell = doc->GetPrimaryShell();
+  if (!shell)
+    return nsnull;
+
+  // the root content can always be focused
+  if (aContent == doc->GetRootContent())
+    return aContent;
+
+  // cannot focus content in print preview mode. Only the root can be focused.
+  nsPresContext* presContext = shell->GetPresContext();
+  if (presContext && presContext->Type() == nsPresContext::eContext_PrintPreview)
+    return nsnull;
+
+  nsIFrame* frame = shell->GetPrimaryFrameFor(aContent);
+  if (!frame)
+    return nsnull;
+
+  if (aContent->Tag() == nsGkAtoms::area && aContent->IsNodeOfType(nsINode::eHTML)) {
+    // HTML areas do not have their own frame, and the img frame we get from
+    // GetPrimaryFrameFor() is not relevant as to whether it is focusable or
+    // not, so we have to do all the relevant checks manually for them.
+    return frame->AreAncestorViewsVisible() &&
+           frame->GetStyleVisibility()->IsVisible() &&
+           aContent->IsFocusable() ? aContent : nsnull;
+  }
+
+  // if this is a child frame content node, check if it is visible and
+  // call the content node's IsFocusable method instead of the frame's
+  // IsFocusable method. This skips checking the style system and ensures that
+  // offscreen browsers can still be focused.
+  nsIDocument* subdoc = doc->GetSubDocumentFor(aContent);
+  if (subdoc && IsWindowVisible(subdoc->GetWindow())) {
+    const nsStyleUserInterface* ui = frame->GetStyleUserInterface();
+    PRInt32 tabIndex = (ui->mUserFocus == NS_STYLE_USER_FOCUS_IGNORE ||
+                        ui->mUserFocus == NS_STYLE_USER_FOCUS_NONE) ? -1 : 0;
+    return aContent->IsFocusable(&tabIndex) ? aContent : nsnull;
+  }
+  
+  return frame->IsFocusable(nsnull, aFlags & FLAG_BYMOUSE) ? aContent : nsnull;
+}
+
+PRBool
+nsFocusManager::Blur(nsPIDOMWindow* aWindowToClear,
+                     nsPIDOMWindow* aAncestorWindowToFocus,
+                     PRBool aIsLeavingDocument)
+{
+  // hold a reference to the focused window
+  nsCOMPtr<nsPIDOMWindow> window = mFocusedWindow;
+  if (!window)
+    return PR_TRUE;
+
+  // hold a reference to the focused content, which may be null
+  nsCOMPtr<nsIContent> content = mFocusedContent;
+  if (content && (content == mFirstBlurEvent || !content->IsInDoc()))
+    return PR_TRUE;
+
+  nsCOMPtr<nsIDocShell> docShell = window->GetDocShell();
+  if (!docShell)
+    return PR_TRUE;
+
+  // Keep a ref to presShell since dispatching the DOM event may cause
+  // the document to be destroyed.
+  nsCOMPtr<nsIPresShell> presShell;
+  docShell->GetPresShell(getter_AddRefs(presShell));
+  if (!presShell)
+    return PR_TRUE;
+
+  PRBool clearFirstBlurEvent = PR_FALSE;
+  if (!mFirstBlurEvent) {
+    mFirstBlurEvent = content;
+    clearFirstBlurEvent = PR_TRUE;
+  }
+
+  // if there is still an active window, adjust the IME state.
+  // This has to happen before the focus is cleared below, otherwise, the IME
+  // compositionend event won't get fired at the element being blurred.
+  nsIMEStateManager::OnTextStateBlur(nsnull, nsnull);
+  nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nsnull);
+
+  // now adjust the actual focus, by clearing the fields in the focus manager
+  // and in the window.
+  mFocusedContent = nsnull;
+  if (aWindowToClear)
+    aWindowToClear->SetFocusedNode(nsnull);
+
+#ifdef DEBUG_FOCUS
+  PRINTTAGF("**Element %s has been blurred\n", content);
+#endif
+
+  PRBool isRootContent = content && content == content->GetCurrentDoc()->GetRootContent();
+  if (content) {
+    if (!isRootContent) {
+      // unusual to pass a content node to SetContentState on a blur,
+      // but we are just calling it to get the ContentStatesChanged notifications
+      nsPresContext* presContext = presShell->GetPresContext();
+      presContext->EventStateManager()->SetContentState(content, NS_EVENT_STATE_FOCUS);  
+    }
+
+    // if an object/plug-in is being blurred, move the system focus to the
+    // parent window, otherwise events will still get fired at the plugin.
+    nsIFrame* contentFrame = presShell->GetPrimaryFrameFor(content);
+    nsIObjectFrame* objectFrame = do_QueryFrame(contentFrame);
+    if (objectFrame) {
+      // note that the presshell's widget is being retrieved here, not the one
+      // for the object frame.
+      nsIViewManager* vm = presShell->GetViewManager();
+      if (vm) {
+        nsCOMPtr<nsIWidget> widget;
+        vm->GetWidget(getter_AddRefs(widget));
+        if (widget)
+          widget->SetFocus(PR_TRUE);
+      }
+    }
+  }
+
+  PRBool result = PR_TRUE;
+  if (content && !isRootContent) {
+    // if there is an active window, update commands. If there isn't an active
+    // window, then this was a blur caused by the active window being lowered,
+    // so there is no need to update the commands
+    if (mActiveWindow)
+      window->UpdateCommands(NS_LITERAL_STRING("focus"));
+
+    SendFocusOrBlurEvent(NS_BLUR_CONTENT, presShell,
+                         content->GetCurrentDoc(), content, 1);
+  }
+
+  // if we are leaving the document or the window was lowered, make the caret
+  // invisible.
+  if (aIsLeavingDocument || !mActiveWindow)
+    SetCaretVisible(presShell, PR_FALSE, nsnull);
+
+  // at this point, it is expected that this window will be still be
+  // focused, but the focused content will be null, as it was cleared before
+  // the event. If this isn't the case, then something else was focused during
+  // the blur event above and we should just return. However, if
+  // aIsLeavingDocument is set, a new document is desired, so make sure to
+  // blur the document and window.
+  if (mFocusedWindow != window ||
+      (mFocusedContent != nsnull && !aIsLeavingDocument)) {
+    result = PR_FALSE;
+  }
+  else if (aIsLeavingDocument) {
+    window->TakeFocus(PR_FALSE, 0);
+
+    // clear the focus so that the ancestor frame hierarchy is in the correct
+    // state. Pass true because aAncestorWindowToFocus is thought to be
+    // focused at this point.
+    if (aAncestorWindowToFocus)
+      aAncestorWindowToFocus->SetFocusedNode(nsnull, 0, PR_TRUE);
+
+    mFocusedWindow = nsnull;
+    mFocusedContent = nsnull;
+
+    // pass 1 for the focus method when calling SendFocusOrBlurEvent just so
+    // that the check is made for suppressed documents
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
+    SendFocusOrBlurEvent(NS_BLUR_CONTENT, presShell, doc, doc, 1);
+    if (mFocusedWindow == nsnull)
+      SendFocusOrBlurEvent(NS_BLUR_CONTENT, presShell, doc, window, 1);
+
+    // check if a different window was focused
+    result = (mFocusedWindow == nsnull && mActiveWindow);
+  }
+  else if (mActiveWindow) {
+    // Otherwise, the blur of the element without blurring the document
+    // occured normally. Call UpdateCaret to redisplay the caret at the right
+    // location within the document. This is needed to ensure that the caret
+    // used for caret browsing is made visible again when an input field is
+    // blurred.
+    UpdateCaret(PR_FALSE, PR_TRUE, nsnull);
+  }
+
+  if (clearFirstBlurEvent)
+    mFirstBlurEvent = nsnull;
+
+  return result;
+}
+
+void
+nsFocusManager::Focus(nsPIDOMWindow* aWindow,
+                      nsIContent* aContent,
+                      PRUint32 aFlags,
+                      PRBool aIsNewDocument,
+                      PRBool aFocusChanged,
+                      PRBool aWindowRaised)
+{
+  if (!aWindow)
+    return;
+
+  if (aContent && aContent == mFirstFocusEvent)
+    return;
+
+  // Keep a reference to the presShell since dispatching the DOM event may
+  // cause the document to be destroyed.
+  nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
+
+  nsCOMPtr<nsIPresShell> presShell;
+  docShell->GetPresShell(getter_AddRefs(presShell));
+  if (!presShell)
+    return;
+
+  // If the focus actually changed, set the focus method (mouse, keyboard, etc).
+  // Otherwise, just get the current focus method and use that. This ensures
+  // that the method is set during the document and window focus events.
+  PRUint32 focusMethod = aFocusChanged ? aFlags & FOCUSMETHOD_MASK :
+                                         aWindow->GetFocusMethod();
+
+  if (!IsWindowVisible(aWindow)) {
+    // if the window isn't visible, for instance because it is a hidden tab,
+    // update the current focus and scroll it into view but don't do anything else
+    if (CheckIfFocusable(aContent, aFlags)) {
+      aWindow->SetFocusedNode(aContent, focusMethod);
+      if (aFocusChanged)
+        ScrollIntoView(presShell, aContent, aFlags);
+    }
+    return;
+  }
+
+  PRBool clearFirstFocusEvent = PR_FALSE;
+  if (!mFirstFocusEvent) {
+    mFirstFocusEvent = aContent;
+    clearFirstFocusEvent = PR_TRUE;
+  }
+
+#ifdef DEBUG_FOCUS
+  PRINTTAGF("**Element %s has been focused", aContent);
+  nsCOMPtr<nsIDocument> docm = do_QueryInterface(aWindow->GetExtantDocument());
+  if (docm)
+    PRINTTAGF(" from %s", docm->GetRootContent());
+  printf(" [Newdoc: %d FocusChanged: %d Raised: %d Flags: %d]\n",
+         aIsNewDocument, aFocusChanged, aWindowRaised, aFlags);
+#endif
+
+  // if this is a new document, update the parent chain of frames so that
+  // focus can be traversed from the top level down to the newly focused
+  // window.
+  if (aIsNewDocument)
+    AdjustWindowFocus(aWindow);
+
+  // indicate that the window has taken focus.
+  if (aWindow->TakeFocus(PR_TRUE, focusMethod))
+    aIsNewDocument = PR_TRUE;
+
+  mFocusedWindow = aWindow;
+
+  // update the system focus.
+  nsIViewManager* vm = presShell->GetViewManager();
+  if (vm) {
+    nsCOMPtr<nsIWidget> widget;
+    vm->GetWidget(getter_AddRefs(widget));
+    if (widget)
+      widget->SetFocus(PR_TRUE);
+  }
+
+  // if switching to a new document, first fire the focus event on the
+  // document and then the window.
+  if (aIsNewDocument) {
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(aWindow->GetExtantDocument());
+    SendFocusOrBlurEvent(NS_FOCUS_CONTENT, presShell, doc,
+                         doc, aFlags & FOCUSMETHOD_MASK);
+    if (mFocusedWindow == aWindow && mFocusedContent == nsnull)
+      SendFocusOrBlurEvent(NS_FOCUS_CONTENT, presShell, doc,
+                           aWindow, aFlags & FOCUSMETHOD_MASK);
+  }
+
+  // check to ensure that the element is still focusable, and that nothing
+  // else was focused during the events above.
+  if (CheckIfFocusable(aContent, aFlags) &&
+      mFocusedWindow == aWindow && mFocusedContent == nsnull) {
+    mFocusedContent = aContent;
+    aWindow->SetFocusedNode(aContent, focusMethod);
+
+    // don't fire events on the root content
+    PRBool isRootContent = aContent &&
+                           aContent->IsInDoc() &&
+                           aContent == aContent->GetCurrentDoc()->GetRootContent();
+    if (!isRootContent) {
+      // if the focused element changed, scroll it into view
+      if (aFocusChanged)
+        ScrollIntoView(presShell, aContent, aFlags);
+
+      // inform the EventStateManager so that content state change notifications
+      // are made.
+      nsPresContext* presContext = presShell->GetPresContext();
+      presContext->EventStateManager()->SetContentState(aContent, NS_EVENT_STATE_FOCUS);  
+
+      // if this is an object/plug-in, focus the plugin's widget
+      nsIFrame* contentFrame = presShell->GetPrimaryFrameFor(aContent);
+      nsIObjectFrame* objectFrame = do_QueryFrame(contentFrame);
+      if (objectFrame) {
+        nsIView* view = contentFrame->GetViewExternal();
+        NS_ASSERTION(view, "Object frames must have views");
+        nsCOMPtr<nsIWidget> widget = view->GetWidget();
+        if (widget)
+          widget->SetFocus(PR_TRUE);
+      }
+
+      nsIMEStateManager::OnChangeFocus(presContext, aContent);
+
+      // as long as this focus wasn't because a window was raised, update the
+      // commands
+      // XXXndeakin P2 someone could adjust the focus during the update
+      if (!aWindowRaised)
+        aWindow->UpdateCommands(NS_LITERAL_STRING("focus"));
+
+      SendFocusOrBlurEvent(NS_FOCUS_CONTENT, presShell, aContent->GetCurrentDoc(),
+                           aContent, aFlags & FOCUSMETHOD_MASK);
+
+      nsIMEStateManager::OnTextStateFocus(presContext, aContent);
+    }
+  }
+  else {
+    nsPresContext* presContext = presShell->GetPresContext();
+    nsIMEStateManager::OnTextStateBlur(presContext, nsnull);
+    nsIMEStateManager::OnChangeFocus(presContext, nsnull);
+
+    if (!aWindowRaised)
+      aWindow->UpdateCommands(NS_LITERAL_STRING("focus"));
+  }
+
+  // update the caret visibility and position to match the newly focused
+  // element. However, don't update the position if this was a focus due to a
+  // mouse click as the selection code would already have moved the caret as
+  // needed. If this is a different document than was focused before, also
+  // update the caret's visibility. If this is the same document, the caret
+  // visibility should be the same as before so there is no need to update it.
+  if (mFocusedContent == aContent)
+    UpdateCaret(aFocusChanged && !(aFlags & FLAG_BYMOUSE), aIsNewDocument,
+                mFocusedContent);
+
+  if (clearFirstFocusEvent)
+    mFirstFocusEvent = nsnull;
+}
+
+void
+nsFocusManager::SendFocusOrBlurEvent(PRUint32 aType,
+                                     nsIPresShell* aPresShell,
+                                     nsIDocument* aDocument,
+                                     nsISupports* aTarget,
+                                     PRUint32 aFocusMethod)
+{
+  NS_ASSERTION(aType == NS_FOCUS_CONTENT || aType == NS_BLUR_CONTENT,
+               "Wrong event type for SendFocusOrBlurEvent");
+
+  nsCOMPtr<nsPIDOMEventTarget> eventTarget = do_QueryInterface(aTarget);
+
+  // for focus events, if this event was from a mouse or key and event
+  // handling on the document is suppressed, queue the event and fire it
+  // later. For blur events, a non-zero value would be set for aFocusMethod.
+  if (aFocusMethod && aDocument->EventHandlingSuppressed()) {
+    for (PRUint32 i = mDelayedBlurFocusEvents.Length(); i > 0; --i) {
+      // if this event was already queued, remove it and append it to the end
+      if (mDelayedBlurFocusEvents[i - 1].mType == aType &&
+          mDelayedBlurFocusEvents[i - 1].mPresShell == aPresShell &&
+          mDelayedBlurFocusEvents[i - 1].mDocument == aDocument &&
+          mDelayedBlurFocusEvents[i - 1].mTarget == eventTarget) {
+        mDelayedBlurFocusEvents.RemoveElementAt(i - 1);
+      }
+    }
+
+    mDelayedBlurFocusEvents.AppendElement(
+      nsDelayedBlurOrFocusEvent(aType, aPresShell, aDocument, eventTarget));
+    return;
+  }
+
+  nsCOMPtr<nsPresContext> presContext = aPresShell->GetPresContext();
+
+  nsEventStatus status = nsEventStatus_eIgnore;
+  nsEvent event(PR_TRUE, aType);
+  event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
+
+  nsEventDispatcher::Dispatch(aTarget, presContext, &event, nsnull, &status);
+}
+
+void
+nsFocusManager::ScrollIntoView(nsIPresShell* aPresShell,
+                               nsIContent* aContent,
+                               PRUint32 aFlags)
+{
+  // if the noscroll flag isn't set, scroll the newly focused element into view
+  if (!(aFlags & FLAG_NOSCROLL))
+    aPresShell->ScrollContentIntoView(aContent,
+                                      NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
+                                      NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+}
+
+
+void
+nsFocusManager::RaiseWindow(nsPIDOMWindow* aWindow)
+{
+  // don't raise windows that are already raised or are in the process of
+  // being lowered
+  if (aWindow == mActiveWindow || aWindow == mWindowBeingLowered)
+    return;
+
+  nsCOMPtr<nsIWebNavigation> webnav = do_GetInterface(aWindow);
+  nsCOMPtr<nsIBaseWindow> treeOwnerAsWin = do_QueryInterface(webnav);
+  if (treeOwnerAsWin) {
+    nsCOMPtr<nsIWidget> widget;
+    treeOwnerAsWin->GetMainWidget(getter_AddRefs(widget));
+    if (widget)
+      widget->SetFocus(PR_TRUE);
+  }
+}
+
+void
+nsFocusManager::UpdateCaret(PRBool aMoveCaretToFocus,
+                            PRBool aUpdateVisibility,
+                            nsIContent* aContent)
+{
+#ifdef DEBUG_FOCUS
+  printf("Update Caret: %d %d\n", aMoveCaretToFocus, aUpdateVisibility);
+#endif
+
+  if (!mFocusedWindow)
+    return;
+
+  // this is called when a document is focused or when the caretbrowsing
+  // preference is changed
+  nsCOMPtr<nsIDocShell> focusedDocShell = mFocusedWindow->GetDocShell();
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(focusedDocShell);
+  if (!dsti)
+    return;
+
+  PRInt32 itemType;
+  dsti->GetItemType(&itemType);
+  if (itemType == nsIDocShellTreeItem::typeChrome)
+    return;  // Never browse with caret in chrome
+
+  PRPackedBool browseWithCaret =
+    nsContentUtils::GetBoolPref("accessibility.browsewithcaret");
+
+  nsCOMPtr<nsIPresShell> presShell;
+  focusedDocShell->GetPresShell(getter_AddRefs(presShell));
+  if (!presShell)
+    return;
+
+  // If this is an editable document which isn't contentEditable, or a
+  // contentEditable document and the node to focus is contentEditable,
+  // return, so that we don't mess with caret visibility.
+  PRBool isEditable = PR_FALSE;
+  nsCOMPtr<nsIEditorDocShell> editorDocShell(do_QueryInterface(dsti));
+  if (editorDocShell) {
+    editorDocShell->GetEditable(&isEditable);
+
+    if (isEditable) {
+      nsCOMPtr<nsIHTMLDocument> doc =
+        do_QueryInterface(presShell->GetDocument());
+
+      PRBool isContentEditableDoc =
+        doc && doc->GetEditingState() == nsIHTMLDocument::eContentEditable;
+
+      PRBool isFocusEditable =
+        aContent && aContent->HasFlag(NODE_IS_EDITABLE);
+      if (!isContentEditableDoc || isFocusEditable)
+        return;
+    }
+  }
+
+  if (!isEditable && aMoveCaretToFocus)
+    MoveCaretToFocus(presShell, aContent);
+
+  if (!aUpdateVisibility)
+    return;
+
+  // XXXndeakin this doesn't seem right. It should be checking for this only
+  // on the nearest ancestor frame which is a chrome frame. But this is
+  // what the existing code does, so just leave it for now.
+  if (!browseWithCaret) {
+    nsCOMPtr<nsIContent> docContent =
+      do_QueryInterface(mFocusedWindow->GetFrameElementInternal());
+    if (docContent)
+      browseWithCaret = docContent->AttrValueIs(kNameSpaceID_None,
+                                                nsGkAtoms::showcaret,
+                                                NS_LITERAL_STRING("true"),
+                                                eCaseMatters);
+  }
+
+  SetCaretVisible(presShell, browseWithCaret, aContent);
+}
+
+void
+nsFocusManager::MoveCaretToFocus(nsIPresShell* aPresShell, nsIContent* aContent)
+{
+  // rangeDoc is a document interface we can create a range with
+  nsCOMPtr<nsIDOMDocumentRange> rangeDoc(do_QueryInterface(aPresShell->GetDocument()));
+  if (rangeDoc) {
+    nsCOMPtr<nsFrameSelection> frameSelection = aPresShell->FrameSelection();
+    nsCOMPtr<nsISelection> domSelection = frameSelection->
+      GetSelection(nsISelectionController::SELECTION_NORMAL);
+    if (domSelection) {
+      nsCOMPtr<nsIDOMNode> currentFocusNode(do_QueryInterface(aContent));
+      // First clear the selection. This way, if there is no currently focused
+      // content, the selection will just be cleared.
+      domSelection->RemoveAllRanges();
+      if (currentFocusNode) {
+        nsCOMPtr<nsIDOMRange> newRange;
+        nsresult rv = rangeDoc->CreateRange(getter_AddRefs(newRange));
+        if (NS_SUCCEEDED(rv)) {
+          // Set the range to the start of the currently focused node
+          // Make sure it's collapsed
+          newRange->SelectNodeContents(currentFocusNode);
+          nsCOMPtr<nsIDOMNode> firstChild;
+          currentFocusNode->GetFirstChild(getter_AddRefs(firstChild));
+          if (!firstChild ||
+              aContent->IsNodeOfType(nsINode::eHTML_FORM_CONTROL)) {
+            // If current focus node is a leaf, set range to before the
+            // node by using the parent as a container.
+            // This prevents it from appearing as selected.
+            newRange->SetStartBefore(currentFocusNode);
+            newRange->SetEndBefore(currentFocusNode);
+          }
+          domSelection->AddRange(newRange);
+          domSelection->CollapseToStart();
+        }
+      }
+    }
+  }
+}
+
+nsresult
+nsFocusManager::SetCaretVisible(nsIPresShell* aPresShell,
+                                PRBool aVisible,
+                                nsIContent* aContent)
+{
+  // When browsing with caret, make sure caret is visible after new focus
+  // Return early if there is no caret. This can happen for the testcase
+  // for bug 308025 where a window is closed in a blur handler.
+  nsRefPtr<nsCaret> caret;
+  aPresShell->GetCaret(getter_AddRefs(caret));
+  if (!caret)
+    return NS_OK;
+
+  PRBool caretVisible = PR_FALSE;
+  caret->GetCaretVisible(&caretVisible);
+  if (!aVisible && !caretVisible)
+    return NS_OK;
+
+  nsCOMPtr<nsFrameSelection> frameSelection;
+  if (aContent) {
+    nsIFrame *focusFrame = aPresShell->GetPrimaryFrameFor(aContent);
+    if (focusFrame)
+      frameSelection = focusFrame->GetFrameSelection();
+  }
+
+  nsCOMPtr<nsFrameSelection> docFrameSelection = aPresShell->FrameSelection();
+
+  if (docFrameSelection && caret &&
+     (frameSelection == docFrameSelection || !aContent)) {
+    nsISelection* domSelection = docFrameSelection->
+      GetSelection(nsISelectionController::SELECTION_NORMAL);
+    if (domSelection) {
+      // First, tell the caret which selection to use
+      caret->SetCaretDOMSelection(domSelection);
+
+      // In content, we need to set the caret. The only special case is edit
+      // fields, which have a different frame selection from the document.
+      // They will take care of making the caret visible themselves.
+
+      nsCOMPtr<nsISelectionController> selCon(do_QueryInterface(aPresShell));
+      if (!selCon)
+        return NS_ERROR_FAILURE;
+
+      selCon->SetCaretEnabled(aVisible);
+      caret->SetCaretVisible(aVisible);
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsFocusManager::GetSelectionLocation(nsIDocument* aDocument,
+                                     nsIPresShell* aPresShell,
+                                     nsIContent **aStartContent,
+                                     nsIContent **aEndContent)
+{
+  *aStartContent = *aEndContent = nsnull;
+  nsresult rv = NS_ERROR_FAILURE;
+
+  nsPresContext* presContext = aPresShell->GetPresContext();
+  NS_ASSERTION(presContext, "mPresContent is null!!");
+
+  nsCOMPtr<nsFrameSelection> frameSelection;
+  frameSelection = aPresShell->FrameSelection();
+
+  nsCOMPtr<nsISelection> domSelection;
+  if (frameSelection) {
+    domSelection = frameSelection->
+      GetSelection(nsISelectionController::SELECTION_NORMAL);
+  }
+
+  nsCOMPtr<nsIDOMNode> startNode, endNode;
+  PRBool isCollapsed = PR_FALSE;
+  nsCOMPtr<nsIContent> startContent, endContent;
+  PRInt32 startOffset = 0;
+  if (domSelection) {
+    domSelection->GetIsCollapsed(&isCollapsed);
+    nsCOMPtr<nsIDOMRange> domRange;
+    rv = domSelection->GetRangeAt(0, getter_AddRefs(domRange));
+    if (domRange) {
+      PRInt32 startOffset;
+      domRange->GetStartContainer(getter_AddRefs(startNode));
+      domRange->GetEndContainer(getter_AddRefs(endNode));
+      domRange->GetStartOffset(&startOffset);
+
+      nsIContent *childContent = nsnull;
+
+      startContent = do_QueryInterface(startNode);
+      if (startContent && startContent->IsNodeOfType(nsINode::eELEMENT)) {
+        NS_ASSERTION(startOffset >= 0, "Start offset cannot be negative");  
+        childContent = startContent->GetChildAt(startOffset);
+        if (childContent) {
+          startContent = childContent;
+        }
+      }
+
+      endContent = do_QueryInterface(endNode);
+      if (endContent && endContent->IsNodeOfType(nsINode::eELEMENT)) {
+        PRInt32 endOffset = 0;
+        domRange->GetEndOffset(&endOffset);
+        NS_ASSERTION(endOffset >= 0, "End offset cannot be negative");
+        childContent = endContent->GetChildAt(endOffset);
+        if (childContent) {
+          endContent = childContent;
+        }
+      }
+    }
+  }
+  else {
+    rv = NS_ERROR_INVALID_ARG;
+  }
+
+  nsIFrame *startFrame = nsnull;
+  if (startContent) {
+    startFrame = aPresShell->GetPrimaryFrameFor(startContent);
+    if (isCollapsed) {
+      // Next check to see if our caret is at the very end of a node
+      // If so, the caret is actually sitting in front of the next
+      // logical frame's primary node - so for this case we need to
+      // change caretContent to that node.
+
+      nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(startContent));
+      PRUint16 nodeType;
+      domNode->GetNodeType(&nodeType);
+
+      if (nodeType == nsIDOMNode::TEXT_NODE) {
+        nsAutoString nodeValue;
+        domNode->GetNodeValue(nodeValue);
+
+        PRBool isFormControl =
+          startContent->IsNodeOfType(nsINode::eHTML_FORM_CONTROL);
+
+        if (nodeValue.Length() == (PRUint32)startOffset && !isFormControl &&
+            startContent != aDocument->GetRootContent()) {
+          // Yes, indeed we were at the end of the last node
+          nsCOMPtr<nsIFrameEnumerator> frameTraversal;
+          nsresult rv = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
+                                             presContext, startFrame,
+                                             eLeaf,
+                                             PR_FALSE, // aVisual
+                                             PR_FALSE, // aLockInScrollView
+                                             PR_TRUE   // aFollowOOFs
+                                             );
+          NS_ENSURE_SUCCESS(rv, rv);
+
+          nsIFrame *newCaretFrame = nsnull;
+          nsCOMPtr<nsIContent> newCaretContent = startContent;
+          PRBool endOfSelectionInStartNode(startContent == endContent);
+          do {
+            // Continue getting the next frame until the primary content for the frame
+            // we are on changes - we don't want to be stuck in the same place
+            frameTraversal->Next();
+            nsIFrame* newCaretFrame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
+            if (nsnull == newCaretFrame)
+              break;
+            newCaretContent = newCaretFrame->GetContent();            
+          } while (!newCaretContent || newCaretContent == startContent);
+
+          if (newCaretFrame && newCaretContent) {
+            // If the caret is exactly at the same position of the new frame,
+            // then we can use the newCaretFrame and newCaretContent for our position
+            nsRefPtr<nsCaret> caret;
+            aPresShell->GetCaret(getter_AddRefs(caret));
+            nsRect caretRect;
+            nsIView *caretView;
+            caret->GetCaretCoordinates(nsCaret::eClosestViewCoordinates, 
+                                       domSelection, &caretRect,
+                                       &isCollapsed, &caretView);
+            nsPoint framePt;
+            nsIView *frameClosestView = newCaretFrame->GetClosestView(&framePt);
+            if (caretView == frameClosestView && caretRect.y == framePt.y &&
+                caretRect.x == framePt.x) {
+              // The caret is at the start of the new element.
+              startFrame = newCaretFrame;
+              startContent = newCaretContent;
+              if (endOfSelectionInStartNode) {
+                endContent = newCaretContent; // Ensure end of selection is not before start
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  *aStartContent = startContent;
+  *aEndContent = endContent;
+  NS_IF_ADDREF(*aStartContent);
+  NS_IF_ADDREF(*aEndContent);
+
+  return rv;
+}
+
+nsresult
+nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
+                                            nsIContent* aStartContent,
+                                            PRInt32 aType,
+                                            nsIContent** aNextContent)
+{
+  *aNextContent = nsnull;
+
+  nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
+  if (!docShell)
+    return NS_OK;
+
+  nsCOMPtr<nsIContent> startContent = aStartContent;
+  if (!startContent && aType != MOVEFOCUS_CARET)
+    startContent = aWindow->GetFocusedNode();
+
+  nsCOMPtr<nsIDocument> doc;
+  if (startContent)
+    doc = startContent->GetCurrentDoc();
+  else
+    doc = do_QueryInterface(aWindow->GetExtantDocument());
+  if (!doc)
+    return NS_OK;
+
+  nsCOMPtr<nsILookAndFeel> lookNFeel(do_GetService(kLookAndFeelCID));
+  lookNFeel->GetMetric(nsILookAndFeel::eMetric_TabFocusModel,
+                       nsIContent::sTabFocusModel);
+
+  if (aType == MOVEFOCUS_ROOT) {
+    NS_IF_ADDREF(*aNextContent = GetRootForFocus(aWindow, doc, PR_FALSE, PR_FALSE));
+    return NS_OK;
+  }
+  if (aType == MOVEFOCUS_FORWARDDOC) {
+    NS_IF_ADDREF(*aNextContent = GetNextTabbableDocument(PR_TRUE));
+    return NS_OK;
+  }
+  if (aType == MOVEFOCUS_BACKWARDDOC) {
+    NS_IF_ADDREF(*aNextContent = GetNextTabbableDocument(PR_FALSE));
+    return NS_OK;
+  }
+  
+  nsIContent* rootContent = doc->GetRootContent();
+  NS_ENSURE_TRUE(rootContent, NS_OK);
+
+  nsIPresShell *presShell = doc->GetPrimaryShell();
+  NS_ENSURE_TRUE(presShell, NS_OK);
+
+  if (aType == MOVEFOCUS_FIRST) {
+    if (!aStartContent)
+      startContent = rootContent;
+    return GetNextTabbableContent(presShell, startContent,
+                                  nsnull, startContent,
+                                  PR_TRUE, 1, PR_FALSE, aNextContent);
+  }
+  if (aType == MOVEFOCUS_LAST) {
+    if (!aStartContent)
+      startContent = rootContent;
+    return GetNextTabbableContent(presShell, startContent,
+                                  nsnull, startContent,
+                                  PR_FALSE, 0, PR_FALSE, aNextContent);
+  }
+
+  PRBool forward = (aType == MOVEFOCUS_FORWARD);
+  PRBool doNavigation = PR_TRUE;
+  PRBool ignoreTabIndex = PR_FALSE;
+  // when a popup is open, we want to ensure that tab navigation occurs only
+  // within the most recently opened panel. If a popup is open, its frame will
+  // be stored in popupFrame.
+  nsIFrame* popupFrame = nsnull;
+
+  PRInt32 tabIndex = forward ? 1 : 0;
+  if (startContent) {
+    nsIFrame* frame = presShell->GetPrimaryFrameFor(startContent);
+    if (startContent->Tag() == nsGkAtoms::area &&
+        startContent->IsNodeOfType(nsINode::eHTML))
+      startContent->IsFocusable(&tabIndex);
+    else if (frame)
+      frame->IsFocusable(&tabIndex, 0);
+
+    // if the current element isn't tabbable, ignore the tabindex and just
+    // look for the next element. The root content won't have a tabindex
+    // so just treat this as the beginning of the tab order.
+    if (tabIndex < 0) {
+      tabIndex = 1;
+      if (startContent != rootContent)
+        ignoreTabIndex = PR_TRUE;
+    }
+
+    // check if the focus is currently inside a popup. Elements such as the
+    // autocomplete widget use the noautofocus attribute to allow the focus to
+    // remain outside the popup when it is opened.
+    if (frame) {
+      popupFrame = nsLayoutUtils::GetClosestFrameOfType(frame,
+                                                        nsGkAtoms::menuPopupFrame);
+    }
+
+    if (popupFrame) {
+      // Don't navigate outside of a popup, so pretend that the
+      // root content is the popup itself
+      rootContent = popupFrame->GetContent();
+      NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");
+    }
+    else if (!forward && startContent == rootContent) {
+      doNavigation = PR_FALSE;
+    }
+  }
+  else {
+#ifdef MOZ_XUL
+    // if there is no focus, yet a panel is open, focus the first item in
+    // the panel
+    nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
+    if (pm)
+      popupFrame = pm->GetTopPopup(ePopupTypePanel);
+#endif
+    if (popupFrame) {
+      rootContent = popupFrame->GetContent();
+      NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");
+      startContent = rootContent;
+    }
+    else {
+      // Otherwise, for content shells, start from the location of the caret.
+      PRInt32 itemType;
+      nsCOMPtr<nsIDocShellTreeItem> shellItem = do_QueryInterface(docShell);
+      shellItem->GetItemType(&itemType);
+      if (itemType != nsIDocShellTreeItem::typeChrome) {
+        nsCOMPtr<nsIContent> endSelectionContent;
+        GetSelectionLocation(doc, presShell,
+                             getter_AddRefs(startContent),
+                             getter_AddRefs(endSelectionContent));
+        // If the selection is on the rootContent, then there is no selection
+        if (startContent == rootContent) {
+          startContent = nsnull;
+        }
+        else if (startContent && startContent->HasFlag(NODE_IS_EDITABLE)) {
+          // Don't start from the selection if the selection is in a
+          // contentEditable region.
+          nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(doc);
+          if (htmlDoc &&
+              htmlDoc->GetEditingState() == nsIHTMLDocument::eContentEditable)
+            startContent = nsnull;
+        }
+
+        if (startContent) {
+          if (aType == MOVEFOCUS_CARET) {
+            GetFocusInSelection(aWindow, startContent,
+                                endSelectionContent, aNextContent);
+            return NS_OK;
+          }
+          
+          // when starting from a selection, we always want to find the next or
+          // previous element in the document. So the tabindex on elements
+          // should be ignored.
+          ignoreTabIndex = PR_TRUE;
+        }
+      }
+
+      if (!startContent) {
+        // otherwise, just use the root content as the starting point
+        startContent = rootContent;
+        NS_ENSURE_TRUE(startContent, NS_OK);
+      }
+    }
+  }
+
+  NS_ASSERTION(startContent, "starting content not set");
+
+  // keep a reference to the starting content. If we find that again, it means
+  // we've iterated around completely and we don't want to adjust the focus.
+  // The skipOriginalContentCheck will be set to true only for the first time
+  // GetNextTabbableContent is called. This ensures that we don't break out
+  // when nothing is focused to start with. Specifically,
+  // GetNextTabbableContent first checks the root content -- which happens to
+  // be the same as the start content -- when nothing is focused and tabbing
+  // forward. Without skipOriginalContentCheck set to true, we'd end up
+  // returning right away and focusing nothing. Luckily, GetNextTabbableContent
+  // will never wrap around on its own, and can only return the original
+  // content when it is called a second time or later.
+  PRBool skipOriginalContentCheck = PR_TRUE;
+  nsIContent* originalStartContent = startContent;
+
+#ifdef DEBUG_FOCUS_NAVIGATION
+  PRINTTAGF("Focus Navigation Start Content %s\n", startContent);
+  printf("[Tabindex: %d Ignore: %d]", tabIndex, ignoreTabIndex);
+#endif
+
+  while (doc) {
+    if (doNavigation) {
+      nsCOMPtr<nsIContent> nextFocus;
+      nsresult rv = GetNextTabbableContent(presShell, rootContent,
+                                           skipOriginalContentCheck ? nsnull : originalStartContent,
+                                           startContent, forward,
+                                           tabIndex, ignoreTabIndex,
+                                           getter_AddRefs(nextFocus));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      // found a content node to focus.
+      if (nextFocus) {
+#ifdef DEBUG_FOCUS_NAVIGATION
+        PRINTTAGF("Next Content: %s\n", nextFocus);
+#endif
+        // as long as the found node was not the same as the starting node,
+        // set it as the return value.
+        if (nextFocus != originalStartContent)
+          NS_ADDREF(*aNextContent = nextFocus);
+        return NS_OK;
+      }
+
+      if (popupFrame) {
+        // in a popup, so start again from the beginning of the popup. However,
+        // if we already started at the beginning, then there isn't anything to
+        // focus, so just return
+        if (startContent != rootContent) {
+          startContent = rootContent;
+          tabIndex = forward ? 1 : 0;
+          continue;
+        }
+        return NS_OK;
+      }
+    }
+
+    doNavigation = PR_TRUE;
+    skipOriginalContentCheck = PR_FALSE;
+    ignoreTabIndex = PR_FALSE;
+
+    // reached the beginning or end of the document. Traverse up to the parent
+    // document and try again.
+    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(docShell);
+
+    nsCOMPtr<nsIDocShellTreeItem> docShellParent;
+    dsti->GetParent(getter_AddRefs(docShellParent));
+    if (docShellParent) {
+      // move up to the parent shell and try again from there.
+
+      // first, get the frame element this window is inside.
+      nsCOMPtr<nsPIDOMWindow> piWindow = do_GetInterface(docShell);
+      NS_ENSURE_TRUE(piWindow, NS_ERROR_FAILURE);
+
+      // Next, retrieve the parent docshell, document and presshell.
+      docShell = do_QueryInterface(docShellParent);
+      NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
+
+      nsCOMPtr<nsPIDOMWindow> piParentWindow = do_GetInterface(docShellParent);
+      NS_ENSURE_TRUE(piParentWindow, NS_ERROR_FAILURE);
+      doc = do_QueryInterface(piParentWindow->GetExtantDocument());
+      NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
+
+      presShell = doc->GetPrimaryShell();
+
+      rootContent = doc->GetRootContent();
+      startContent = do_QueryInterface(piWindow->GetFrameElementInternal());
+      if (startContent) {
+        nsIFrame* frame = presShell->GetPrimaryFrameFor(startContent);
+        if (!frame)
+          return NS_OK;
+
+        frame->IsFocusable(&tabIndex, 0);
+        if (tabIndex < 0) {
+          tabIndex = 1;
+          ignoreTabIndex = PR_TRUE;
+        }
+
+        // if the frame is inside a popup, make sure to scan only within the
+        // popup. This handles the situation of tabbing amongst elements
+        // inside an iframe which is itself inside a popup. Otherwise,
+        // navigation would move outside the popup when tabbing outside the
+        // iframe.
+        popupFrame = nsLayoutUtils::GetClosestFrameOfType(frame,
+                                                          nsGkAtoms::menuPopupFrame);
+        if (popupFrame) {
+          rootContent = popupFrame->GetContent();
+          NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");
+        }
+      }
+      else {
+        startContent = rootContent;
+        tabIndex = forward ? 1 : 0;
+      }
+    }
+    else {
+      // no parent, so call the tree owner. This will tell the embedder that
+      // it should take the focus.
+      PRBool tookFocus;
+      docShell->TabToTreeOwner(forward, &tookFocus);
+      // if the tree owner, took the focus, blur the current content
+      if (tookFocus) {
+        nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(docShell);
+        if (window->GetFocusedNode() == mFocusedContent)
+          Blur(mFocusedWindow, nsnull, PR_TRUE);
+        else
+          window->SetFocusedNode(nsnull);
+        return NS_OK;
+      }
+
+      // reset the tab index and start again from the beginning or end
+      startContent = rootContent;
+      tabIndex = forward ? 1 : 0;
+    }
+
+    // wrapped all the way around and didn't find anything to move the focus
+    // to, so just break out
+    if (startContent == originalStartContent)
+      break;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
+                                       nsIContent* aRootContent,
+                                       nsIContent* aOriginalStartContent,
+                                       nsIContent* aStartContent,
+                                       PRBool aForward,
+                                       PRInt32 aCurrentTabIndex,
+                                       PRBool aIgnoreTabIndex,
+                                       nsIContent** aResultContent)
+{
+  *aResultContent = nsnull;
+
+  if (!aStartContent)
+    return NS_OK;
+
+#ifdef DEBUG_FOCUS_NAVIGATION
+  PRINTTAGF("GetNextTabbable: %s", aStartContent);
+  printf(" tabindex: %d\n", aCurrentTabIndex);
+#endif
+
+  nsPresContext* presContext = aPresShell->GetPresContext();
+
+  while (1) {
+    nsIFrame* aStartFrame = aPresShell->GetPrimaryFrameFor(aStartContent);
+    if (!aStartFrame) {
+      // if there is no frame, just get the root frame
+      aStartFrame = aPresShell->GetPrimaryFrameFor(aRootContent);
+      if (!aStartFrame)
+        return NS_OK;
+      aStartContent = aRootContent;
+    }
+
+    nsCOMPtr<nsIFrameEnumerator> frameTraversal;
+    nsresult rv = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
+                                       presContext, aStartFrame,
+                                       ePreOrder,
+                                       PR_FALSE, // aVisual
+                                       PR_FALSE, // aLockInScrollView
+                                       PR_TRUE   // aFollowOOFs
+                                       );
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (aStartContent == aRootContent) {
+      if (!aForward)
+        frameTraversal->Last();
+    }
+    else if (!aStartContent || aStartContent->Tag() != nsGkAtoms::area ||
+             !aStartContent->IsNodeOfType(nsINode::eHTML)) {
+      // Need to do special check in case we're in an imagemap which has multiple
+      // content nodes per frame, so don't skip over the starting frame.
+      if (aForward)
+        frameTraversal->Next();
+      else
+        frameTraversal->Prev();
+    }
+
+    // Walk frames to find something tabbable matching mCurrentTabIndex
+    nsIFrame* frame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
+    while (frame) {
+      // TabIndex not set defaults to 0 for form elements, anchors and other
+      // elements that are normally focusable. Tabindex defaults to -1
+      // for elements that are not normally focusable.
+      // The returned computed tabindex from IsFocusable() is as follows:
+      //          < 0 not tabbable at all
+      //          == 0 in normal tab order (last after positive tabindexed items)
+      //          > 0 can be tabbed to in the order specified by this value
+
+      PRInt32 tabIndex;
+      frame->IsFocusable(&tabIndex, 0);
+
+#ifdef DEBUG_FOCUS_NAVIGATION
+      if (frame->GetContent()) {
+        PRINTTAGF("Next Tabbable %s:", frame->GetContent());
+        printf(" with tabindex: %d expected: %d\n", tabIndex, aCurrentTabIndex);
+      }
+#endif
+
+      nsIContent* currentContent = frame->GetContent();
+      if (tabIndex >= 0) {
+        NS_ASSERTION(currentContent, "IsFocusable set a tabindex for a frame with no content");
+        if (currentContent->Tag() == nsGkAtoms::img &&
+            currentContent->HasAttr(kNameSpaceID_None, nsGkAtoms::usemap)) {
+          // This is an image with a map. Image map areas are not traversed by
+          // nsIFrameTraversal so look for the next or previous area element.
+          nsIContent *areaContent =
+            GetNextTabbableMapArea(aForward, aCurrentTabIndex,
+                                   currentContent, aStartContent);
+          if (areaContent) {
+            NS_ADDREF(*aResultContent = areaContent);
+            return NS_OK;
+          }
+        }
+        else if (aIgnoreTabIndex || aCurrentTabIndex == tabIndex) {
+          // break out if we've wrapped around to the start again.
+          if (aOriginalStartContent && currentContent == aOriginalStartContent) {
+            NS_ADDREF(*aResultContent = currentContent);
+            return NS_OK;
+          }
+
+          // found a node with a matching tab index. Check if it is a child
+          // frame. If so, navigate into the child frame instead.
+          nsIDocument* doc = currentContent->GetCurrentDoc();
+          NS_ASSERTION(doc, "content not in document");
+          nsIDocument* subdoc = doc->GetSubDocumentFor(currentContent);
+          if (subdoc) {
+            if (!subdoc->EventHandlingSuppressed()) {
+              if (aForward) {
+                // when tabbing forward into a frame, return the root
+                // frame so that the canvas becomes focused.
+                nsCOMPtr<nsPIDOMWindow> subframe = subdoc->GetWindow();
+                if (subframe) {
+                  *aResultContent = GetRootForFocus(subframe, subdoc, PR_FALSE, PR_TRUE);
+                  if (*aResultContent) {
+                    NS_ADDREF(*aResultContent);
+                    return NS_OK;
+                  }
+                }
+              }
+              nsIContent* rootContent = subdoc->GetRootContent();
+              nsIPresShell* subShell = subdoc->GetPrimaryShell();
+              if (rootContent && subShell) {
+                rv = GetNextTabbableContent(subShell, rootContent,
+                                            aOriginalStartContent, rootContent,
+                                            aForward, (aForward ? 1 : 0),
+                                            PR_FALSE, aResultContent);
+                NS_ENSURE_SUCCESS(rv, rv);
+                if (*aResultContent)
+                  return NS_OK;
+              }
+            }
+          }
+          // otherwise, use this as the next content node to tab to, unless
+          // this was the element we started on. This would happen for
+          // instance on an element with child frames, where frame navigation
+          // could return the original element again. In that case, just skip
+          // it. Also, if the next content node is the root content, then
+          // return it. This latter case would happen only if someone made a
+          // popup focusable.
+          else if (currentContent != aStartContent ||
+                   currentContent == aRootContent) {
+            NS_ADDREF(*aResultContent = currentContent);
+            return NS_OK;
+          }
+        }
+      }
+      else if (aOriginalStartContent && currentContent == aOriginalStartContent) {
+        // not focusable, so return if we have wrapped around to the original
+        // content. This is necessary in case the original starting content was
+        // not focusable.
+        NS_ADDREF(*aResultContent = currentContent);
+        return NS_OK;
+      }
+
+      // Move to the next or previous frame, but ignore continuation frames
+      // since only the first frame should be involved in focusability.
+      // Otherwise, a loop will occur in the following example:
+      //   <span tabindex="1">...<a/><a/>...</span>
+      // where the text wraps onto multiple lines. Tabbing from the second
+      // link can find one of the span's continuation frames between the link
+      // and the end of the span, and the span would end up getting focused
+      // again.
+      do {
+        if (aForward)
+          frameTraversal->Next();
+        else
+          frameTraversal->Prev();
+        frame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
+      } while (frame && frame->GetPrevContinuation());
+    }
+
+    // If already at lowest priority tab (0), end search completely.
+    // A bit counterintuitive but true, tabindex order goes 1, 2, ... 32767, 0
+    if (aCurrentTabIndex == (aForward ? 0 : 1)) {
+      // if going backwards, the canvas should be focused once the beginning
+      // has been reached.
+      if (!aForward) {
+        nsCOMPtr<nsPIDOMWindow> window = GetCurrentWindow(aRootContent);
+        NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
+        NS_IF_ADDREF(*aResultContent =
+                     GetRootForFocus(window, aRootContent->GetCurrentDoc(), PR_FALSE, PR_TRUE));
+      }
+      break;
+    }
+
+    // continue looking for next highest priority tabindex
+    aCurrentTabIndex = GetNextTabIndex(aRootContent, aCurrentTabIndex, aForward);
+    aStartContent = aRootContent;
+  }
+
+  return NS_OK;
+}
+
+nsIContent*
+nsFocusManager::GetNextTabbableMapArea(PRBool aForward,
+                                       PRInt32 aCurrentTabIndex,
+                                       nsIContent* aImageContent,
+                                       nsIContent* aStartContent)
+{
+  nsAutoString useMap;
+  aImageContent->GetAttr(kNameSpaceID_None, nsGkAtoms::usemap, useMap);
+
+  nsCOMPtr<nsIDocument> doc = aImageContent->GetDocument();
+  if (doc) {
+    nsCOMPtr<nsIDOMHTMLMapElement> imageMap = nsImageMapUtils::FindImageMap(doc, useMap);
+    if (!imageMap)
+      return nsnull;
+    nsCOMPtr<nsIContent> mapContent = do_QueryInterface(imageMap);
+    PRUint32 count = mapContent->GetChildCount();
+    // First see if the the start content is in this map
+
+    PRInt32 index = mapContent->IndexOf(aStartContent);
+    PRInt32 tabIndex;
+    if (index < 0 || (aStartContent->IsFocusable(&tabIndex) &&
+                      tabIndex != aCurrentTabIndex)) {
+      // If aStartContent is in this map we must start iterating past it.
+      // We skip the case where aStartContent has tabindex == aStartContent
+      // since the next tab ordered element might be before it
+      // (or after for backwards) in the child list.
+      index = aForward ? -1 : (PRInt32)count;
+    }
+
+    // GetChildAt will return nsnull if our index < 0 or index >= count
+    nsCOMPtr<nsIContent> areaContent;
+    while ((areaContent = mapContent->GetChildAt(aForward ? ++index : --index)) != nsnull) {
+      if (areaContent->IsFocusable(&tabIndex) && tabIndex == aCurrentTabIndex) {
+        return areaContent;
+      }
+    }
+  }
+
+  return nsnull;
+}
+
+PRInt32
+nsFocusManager::GetNextTabIndex(nsIContent* aParent,
+                                PRInt32 aCurrentTabIndex,
+                                PRBool aForward)
+{
+  PRInt32 tabIndex, childTabIndex;
+  nsIContent *child;
+
+  PRUint32 count = aParent->GetChildCount();
+
+  if (aForward) {
+    tabIndex = 0;
+    for (PRUint32 index = 0; index < count; index++) {
+      child = aParent->GetChildAt(index);
+      childTabIndex = GetNextTabIndex(child, aCurrentTabIndex, aForward);
+      if (childTabIndex > aCurrentTabIndex && childTabIndex != tabIndex) {
+        tabIndex = (tabIndex == 0 || childTabIndex < tabIndex) ? childTabIndex : tabIndex;
+      }
+
+      nsAutoString tabIndexStr;
+      child->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndexStr);
+      PRInt32 ec, val = tabIndexStr.ToInteger(&ec);
+      if (NS_SUCCEEDED (ec) && val > aCurrentTabIndex && val != tabIndex) {
+        tabIndex = (tabIndex == 0 || val < tabIndex) ? val : tabIndex;
+      }
+    }
+  }
+  else { /* !aForward */
+    tabIndex = 1;
+    for (PRUint32 index = 0; index < count; index++) {
+      child = aParent->GetChildAt(index);
+      childTabIndex = GetNextTabIndex(child, aCurrentTabIndex, aForward);
+      if ((aCurrentTabIndex == 0 && childTabIndex > tabIndex) ||
+          (childTabIndex < aCurrentTabIndex && childTabIndex > tabIndex)) {
+        tabIndex = childTabIndex;
+      }
+
+      nsAutoString tabIndexStr;
+      child->GetAttr(kNameSpaceID_None, nsGkAtoms::tabindex, tabIndexStr);
+      PRInt32 ec, val = tabIndexStr.ToInteger(&ec);
+      if (NS_SUCCEEDED (ec)) {
+        if ((aCurrentTabIndex == 0 && val > tabIndex) ||
+            (val < aCurrentTabIndex && val > tabIndex) ) {
+          tabIndex = val;
+        }
+      }
+    }
+  }
+
+  return tabIndex;
+}
+
+nsIContent*
+nsFocusManager::GetRootForFocus(nsPIDOMWindow* aWindow,
+                                nsIDocument* aDocument,
+                                PRBool aIsForDocNavigation,
+                                PRBool aCheckVisibility)
+{
+  // the root element's canvas may be focused as long as the document is in a
+  // a non-chrome shell and does not contain a frameset.
+  if (aIsForDocNavigation) {
+    nsCOMPtr<nsIContent> docContent =
+      do_QueryInterface(aWindow->GetFrameElementInternal());
+    if (docContent && docContent->Tag() == nsGkAtoms::iframe)
+      return nsnull;
+  }
+  else  {
+    PRInt32 itemType;
+    nsCOMPtr<nsIDocShellTreeItem> shellItem = do_QueryInterface(aWindow->GetDocShell());
+    shellItem->GetItemType(&itemType);
+
+    if (itemType == nsIDocShellTreeItem::typeChrome)
+      return nsnull;
+  }
+
+  if (aCheckVisibility && !IsWindowVisible(aWindow))
+    return nsnull;
+
+  nsIContent *rootContent = aDocument->GetRootContent();
+  if (rootContent) {
+    if (aCheckVisibility) {
+      nsIPresShell* presShell = aDocument->GetPrimaryShell();
+      if (!presShell || !presShell->GetPrimaryFrameFor(rootContent))
+        return nsnull;
+    }
+
+    // Finally, check if this is a frameset
+    nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(aDocument);
+    if (htmlDoc) {
+      PRUint32 childCount = rootContent->GetChildCount();
+      for (PRUint32 i = 0; i < childCount; ++i) {
+        nsIContent *childContent = rootContent->GetChildAt(i);
+        nsINodeInfo *ni = childContent->NodeInfo();
+        if (childContent->IsNodeOfType(nsINode::eHTML) &&
+            ni->Equals(nsGkAtoms::frameset))
+          return nsnull;
+      }
+    }
+  }
+
+  return rootContent;
+}
+
+void
+nsFocusManager::GetLastDocShell(nsIDocShellTreeItem* aItem,
+                                nsIDocShellTreeItem** aResult)
+{
+  *aResult = nsnull;
+
+  nsCOMPtr<nsIDocShellTreeItem> curItem = aItem;
+  while (curItem) {
+    PRInt32 childCount = 0;
+    curItem->GetChildCount(&childCount);
+    if (!childCount) {
+      *aResult = curItem;
+      NS_ADDREF(*aResult);
+      return;
+    }
+
+    
+    curItem->GetChildAt(childCount - 1, getter_AddRefs(curItem));
+  }
+}
+
+void
+nsFocusManager::GetNextDocShell(nsIDocShellTreeItem* aItem,
+                                nsIDocShellTreeItem** aResult)
+{
+  *aResult = nsnull;
+
+  PRInt32 childCount = 0;
+  aItem->GetChildCount(&childCount);
+  if (childCount) {
+    aItem->GetChildAt(0, aResult);
+    if (*aResult)
+      return;
+  }
+
+  nsCOMPtr<nsIDocShellTreeItem> curItem = aItem;
+  while (curItem) {
+    nsCOMPtr<nsIDocShellTreeItem> parentItem;
+    curItem->GetParent(getter_AddRefs(parentItem));
+    if (!parentItem)
+      return;
+
+    // Note that we avoid using GetChildOffset() here because docshell
+    // child offsets can't be trusted to be correct. bug 162283.
+    nsCOMPtr<nsIDocShellTreeItem> iterItem;
+    childCount = 0;
+    parentItem->GetChildCount(&childCount);
+    for (PRInt32 index = 0; index < childCount; ++index) {
+      parentItem->GetChildAt(index, getter_AddRefs(iterItem));
+      if (iterItem == curItem) {
+        ++index;
+        if (index < childCount) {
+          parentItem->GetChildAt(index, aResult);
+          if (*aResult)
+            return;
+        }
+        break;
+      }
+    }
+
+    curItem = parentItem;
+  }
+}
+
+void
+nsFocusManager::GetPreviousDocShell(nsIDocShellTreeItem* aItem,
+                                    nsIDocShellTreeItem** aResult)
+{
+  *aResult = nsnull;
+
+  nsCOMPtr<nsIDocShellTreeItem> parentItem;
+  aItem->GetParent(getter_AddRefs(parentItem));
+  if (!parentItem)
+    return;
+
+  // Note that we avoid using GetChildOffset() here because docshell
+  // child offsets can't be trusted to be correct. bug 162283.
+  PRInt32 childCount = 0;
+  parentItem->GetChildCount(&childCount);
+  nsCOMPtr<nsIDocShellTreeItem> prevItem, iterItem;
+  for (PRInt32 index = 0; index < childCount; ++index) {
+    parentItem->GetChildAt(index, getter_AddRefs(iterItem));
+    if (iterItem == aItem)
+      break;
+    prevItem = iterItem;
+  }
+
+  if (prevItem)
+    GetLastDocShell(prevItem, aResult);
+  else
+    NS_ADDREF(*aResult = parentItem);
+}
+
+nsIContent*
+nsFocusManager::GetNextTabbableDocument(PRBool aForward)
+{
+  nsCOMPtr<nsIDocShellTreeItem> startItem;
+  if (mFocusedWindow) {
+    startItem = do_QueryInterface(mFocusedWindow->GetDocShell());
+  }
+  else {
+    nsCOMPtr<nsIWebNavigation> webnav = do_GetInterface(mActiveWindow);
+    startItem = do_QueryInterface(webnav);
+  }
+  if (!startItem)
+    return nsnull;
+
+  // perform a depth first search (preorder) of the docshell tree
+  // looking for an HTML Frame or a chrome document
+  nsIContent* content = nsnull;
+  nsCOMPtr<nsIDocShellTreeItem> curItem = startItem;
+  nsCOMPtr<nsIDocShellTreeItem> nextItem;
+  do {
+    if (aForward) {
+      GetNextDocShell(curItem, getter_AddRefs(nextItem));
+      if (!nextItem) {
+        // wrap around to the beginning, which is the top of the tree
+        startItem->GetRootTreeItem(getter_AddRefs(nextItem));
+      }
+    }
+    else {
+      GetPreviousDocShell(curItem, getter_AddRefs(nextItem));
+      if (!nextItem) {
+        // wrap around to the end, which is the last item in the tree
+        nsCOMPtr<nsIDocShellTreeItem> rootItem;
+        startItem->GetRootTreeItem(getter_AddRefs(rootItem));
+        GetLastDocShell(rootItem, getter_AddRefs(nextItem));
+      }
+    }
+
+    curItem = nextItem;
+    nsCOMPtr<nsPIDOMWindow> nextFrame = do_GetInterface(nextItem);
+    if (!nextFrame)
+      return nsnull;
+
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(nextFrame->GetExtantDocument());
+    if (doc && !doc->EventHandlingSuppressed()) {
+      content = GetRootForFocus(nextFrame, doc, PR_TRUE, PR_TRUE);
+      if (content && !GetRootForFocus(nextFrame, doc, PR_FALSE, PR_FALSE)) {
+        // if the found content is in a chrome shell or a frameset, navigate
+        // forward one tabbable item so that the first item is focused. Note
+        // that we always go forward and not back here.
+        nsCOMPtr<nsIContent> nextFocus;
+        nsIContent* rootContent = doc->GetRootContent();
+        nsIPresShell* presShell = doc->GetPrimaryShell();
+        if (presShell) {
+          nsresult rv = GetNextTabbableContent(presShell, rootContent,
+                                               nsnull, rootContent,
+                                               PR_TRUE, 1, PR_FALSE,
+                                               getter_AddRefs(nextFocus));
+          return NS_SUCCEEDED(rv) ? nextFocus.get() : nsnull;
+        }
+      }
+    }
+  } while (!content);
+
+  return content;
+}
+
+void
+nsFocusManager::GetFocusInSelection(nsPIDOMWindow* aWindow,
+                                    nsIContent* aStartSelection,
+                                    nsIContent* aEndSelection,
+                                    nsIContent** aFocusedContent)
+{
+  *aFocusedContent = nsnull;
+
+  nsCOMPtr<nsIContent> testContent = aStartSelection;
+  nsCOMPtr<nsIContent> nextTestContent = aEndSelection;
+
+  nsCOMPtr<nsIContent> currentFocus = aWindow->GetFocusedNode();
+
+  // We now have the correct start node in selectionContent!
+  // Search for focusable elements, starting with selectionContent
+
+  // Method #1: Keep going up while we look - an ancestor might be focusable
+  // We could end the loop earlier, such as when we're no longer
+  // in the same frame, by comparing getPrimaryFrameFor(selectionContent)
+  // with a variable holding the starting selectionContent
+  while (testContent) {
+    // Keep testing while selectionContent is equal to something,
+    // eventually we'll run out of ancestors
+
+    nsCOMPtr<nsIURI> uri;
+    if (testContent == currentFocus ||
+        testContent->IsLink(getter_AddRefs(uri))) {
+      NS_ADDREF(*aFocusedContent = testContent);
+      return;
+    }
+
+    // Get the parent
+    testContent = testContent->GetParent();
+
+    if (!testContent) {
+      // We run this loop again, checking the ancestor chain of the selection's end point
+      testContent = nextTestContent;
+      nextTestContent = nsnull;
+    }
+  }
+
+  // We couldn't find an anchor that was an ancestor of the selection start
+  // Method #2: look for anchor in selection's primary range (depth first search)
+
+  // Turn into nodes so that we can use GetNextSibling() and GetFirstChild()
+  nsCOMPtr<nsIDOMNode> selectionNode(do_QueryInterface(aStartSelection));
+  nsCOMPtr<nsIDOMNode> endSelectionNode(do_QueryInterface(aEndSelection));
+  nsCOMPtr<nsIDOMNode> testNode;
+
+  do {
+    testContent = do_QueryInterface(selectionNode);
+
+    // We're looking for any focusable link that could be part of the
+    // main document's selection.
+    nsCOMPtr<nsIURI> uri;
+    if (testContent == currentFocus ||
+        testContent->IsLink(getter_AddRefs(uri))) {
+      NS_ADDREF(*aFocusedContent = testContent);
+      return;
+    }
+
+    selectionNode->GetFirstChild(getter_AddRefs(testNode));
+    if (testNode) {
+      selectionNode = testNode;
+      continue;
+    }
+
+    if (selectionNode == endSelectionNode)
+      break;
+    selectionNode->GetNextSibling(getter_AddRefs(testNode));
+    if (testNode) {
+      selectionNode = testNode;
+      continue;
+    }
+
+    do {
+      selectionNode->GetParentNode(getter_AddRefs(testNode));
+      if (!testNode || testNode == endSelectionNode) {
+        selectionNode = nsnull;
+        break;
+      }
+      testNode->GetNextSibling(getter_AddRefs(selectionNode));
+      if (selectionNode)
+        break;
+      selectionNode = testNode;
+    } while (PR_TRUE);
+  }
+  while (selectionNode && selectionNode != endSelectionNode);
+}
+
+nsresult
+NS_NewFocusManager(nsIFocusManager** aResult)
+{
+  NS_IF_ADDREF(*aResult = nsFocusManager::GetFocusManager());
+  return NS_OK;
+}
diff --git a/dom/base/nsFocusManager.h b/dom/base/nsFocusManager.h
new file mode 100644
index 000000000000..f5f4713344f1
--- /dev/null
+++ b/dom/base/nsFocusManager.h
@@ -0,0 +1,444 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozila.org code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsFocusManager_h___
+#define nsFocusManager_h___
+
+#include "nsIFocusManager.h"
+#include "nsWeakReference.h"
+#include "nsIObserver.h"
+#include "nsIContent.h"
+
+#define FOCUSMETHOD_MASK 0xF000
+
+#define FOCUSMANAGER_CONTRACTID "@mozilla.org/focus-manager;1"
+
+class nsIDocShellTreeItem;
+class nsPIDOMWindow;
+struct nsDelayedBlurOrFocusEvent;
+
+/**
+ * The focus manager keeps track of where the focus is, that is, the node
+ * which receives key events.
+ */
+
+class nsFocusManager : public nsIFocusManager,
+                       public nsIObserver,
+                       public nsSupportsWeakReference
+{
+public:
+
+  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsFocusManager, nsIFocusManager)
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+  NS_DECL_NSIFOCUSMANAGER
+
+  // called to initialize and stop the focus manager at startup and shutdown
+  static nsresult Init();
+  static void Shutdown();
+
+  /**
+   * Retrieve the single focus manager.
+   */
+  static nsIFocusManager* GetFocusManager() { return sInstance; }
+
+  /**
+   * Returns the content node that would be focused if aWindow was in an
+   * active window. This will traverse down the frame hierarchy, starting at
+   * the given window aWindow. Sets aFocusedWindow to the window with the
+   * document containing aFocusedContent. If no element is focused,
+   * aFocusedWindow may be still be set -- this means that the document is
+   * focused but no element within it is focused.
+   *
+   * aWindow and aFocusedWindow must both be non-null.
+   */
+  static nsIContent* GetFocusedDescendant(nsPIDOMWindow* aWindow, PRBool aDeep,
+                                          nsPIDOMWindow** aFocusedWindow);
+
+  /**
+   * Returns the content node that focus will be redirected to if aContent was
+   * focused. This is used for the special case of certain XUL elements such
+   * as textboxes which redirect focus to an anonymous child.
+   *
+   * aContent must be non-null.
+   *
+   * XXXndeakin this should be removed eventually but I want to do that as
+   * followup work.
+   */
+  static nsIContent* GetRedirectedFocus(nsIContent* aContent);
+
+protected:
+
+  nsFocusManager();
+  ~nsFocusManager();
+
+  /**
+   * Ensure that the widget associated with the currently focused window is
+   * focused at the widget level.
+   */
+  void EnsureCurrentWidgetFocused();
+
+  /**
+   * Blur whatever is currently focused and focus aNewContent. aFlags is a
+   * bitmask of the flags defined in nsIFocusManager. If aFocusChanged is
+   * true, then the focus has actually shifted and the caret position will be
+   * updated to the new focus, aNewContent will be scrolled into view (unless
+   * a flag disables this) and the focus method for the window will be updated.
+   *
+   * All actual focus changes must use this method to do so. (as opposed
+   * to those that update the focus in an inactive window for instance).
+   */
+  void SetFocusInner(nsIContent* aNewContent, PRInt32 aFlags, PRBool aFocusChanged);
+
+  /**
+   * Returns true if aPossibleAncestor is the same as aWindow or an
+   * ancestor of aWindow.
+   */
+  PRBool IsSameOrAncestor(nsPIDOMWindow* aPossibleAncestor,
+                          nsPIDOMWindow* aWindow);
+
+  /**
+   * Returns the window that is the lowest common ancestor of both aWindow1
+   * and aWindow2, or null if they share no common ancestor.
+   */
+  already_AddRefed<nsPIDOMWindow> GetCommonAncestor(nsPIDOMWindow* aWindow1,
+                                                    nsPIDOMWindow* aWindow2);
+
+  /**
+   * When aNewWindow is focused, adjust the ancestors of aNewWindow so that they
+   * also have their corresponding frames focused. Thus, one can start at
+   * the active top-level window and navigate down the currently focused
+   * elements for each frame in the tree to get to aNewWindow.
+   */
+  void AdjustWindowFocus(nsPIDOMWindow* aNewWindow);
+
+  /**
+   * Returns true if aWindow is visible.
+   */
+  PRBool IsWindowVisible(nsPIDOMWindow* aWindow);
+
+  /**
+   * Checks and returns aContent if it may be focused, another content node if
+   * the focus should be retargeted at another node, or null if the node
+   * cannot be focused. aFlags are the flags passed to SetFocus and similar
+   * methods.
+   *
+   * An element is focusable if it is in a document, the document isn't in
+   * print preview mode and the element has an nsIFrame where the
+   * CheckIfFocusable method returns true. For <area> elements, there is no
+   * frame, so only the IsFocusable method on the content node must be
+   * true.
+   */
+  nsIContent* CheckIfFocusable(nsIContent* aContent, PRUint32 aFlags);
+
+  /**
+   * Blurs the currently focused element.
+   *
+   * The currently focused element within aWindowToClear will be cleared.
+   * aWindowToClear may be null, which means that no window is cleared. This
+   * will be the case, for example, when lowering a window, as we want to fire
+   * a blur, but not actually change what element would be focused, so that
+   * the same element will be focused again when the window is raised.
+   *
+   * aAncestorWindowToFocus should be set to the common ancestor of the window
+   * that is being blurred and the window that is going to focused, when
+   * switching focus to a sibling window.
+   *
+   * aIsLeavingDocument should be set to true if the document/window is being
+   * blurred as well. Document/window blur events will be fired. It should be
+   * false if an element is the same document is about to be focused.
+   */
+  PRBool Blur(nsPIDOMWindow* aWindowToClear,
+              nsPIDOMWindow* aAncestorWindowToFocus,
+              PRBool aIsLeavingDocument);
+
+  /**
+   * Focus an element in the active window and child frame.
+   *
+   * aWindow is the window containing the element aContent to focus.
+   *
+   * aFlags is the flags passed to the various focus methods in
+   * nsIFocusManager.
+   *
+   * aIsNewDocument should be true if a new document is being focused.
+   * Document/window focus events will be fired.
+   *
+   * aFocusChanged should be true if a new content node is being focused, so
+   * the focused content will be scrolled into view and the caret position
+   * will be updated. If false is passed, then a window is simply being
+   * refocused, for instance, due to a window being raised, or a tab is being
+   * switched to.
+   *
+   * If aFocusChanged is true, then the focus has moved to a new location.
+   * Otherwise, the focus is just being updated because the window was
+   * raised.
+   *
+   * aWindowRaised should be true if the window is being raised. In this case,
+   * command updaters will not be called.
+   */
+  void Focus(nsPIDOMWindow* aWindow,
+             nsIContent* aContent,
+             PRUint32 aFlags,
+             PRBool aIsNewDocument,
+             PRBool aFocusChanged,
+             PRBool aWindowRaised);
+
+  /**
+   * Fires a focus or blur event at aTarget.
+   *
+   * aType should be either NS_FOCUS_CONTENT or NS_BLUR_CONTENT. For blur
+   * events, aFocusMethod should normally be non-zero.
+   */
+  void SendFocusOrBlurEvent(PRUint32 aType,
+                            nsIPresShell* aPresShell,
+                            nsIDocument* aDocument,
+                            nsISupports* aTarget,
+                            PRUint32 aFocusMethod);
+
+  /**
+   * Scrolls aContent into view unless the FLAG_NOSCROLL flag is set.
+   */
+  void ScrollIntoView(nsIPresShell* aPresShell,
+                      nsIContent* aContent,
+                      PRUint32 aFlags);
+
+  /**
+   * Raises the top-level window aWindow at the widget level.
+   */
+  void RaiseWindow(nsPIDOMWindow* aWindow);
+
+  /**
+   * Updates the caret positon and visibility to match the focus.
+   *
+   * aMoveCaretToFocus should be true to move the caret to aContent.
+   *
+   * aUpdateVisibility should be true to update whether the caret is
+   * visible or not.
+   */
+  void UpdateCaret(PRBool aMoveCaretToFocus,
+                   PRBool aUpdateVisibility,
+                   nsIContent* aContent);
+
+  /**
+   * Helper method to move the caret to the focused element aContent.
+   */
+  void MoveCaretToFocus(nsIPresShell* aPresShell, nsIContent* aContent);
+
+  /**
+   * Makes the caret visible or not, depending on aVisible.
+   */
+  nsresult SetCaretVisible(nsIPresShell* aPresShell,
+                           PRBool aVisible,
+                           nsIContent* aContent);
+
+
+  // the remaining functions are used for tab key and document-navigation
+
+  /**
+   * Retrieves the start and end points of the current selection for
+   * aDocument and stores them in aStartContent and aEndContent.
+   */
+  nsresult GetSelectionLocation(nsIDocument* aDocument,
+                                nsIPresShell* aPresShell,
+                                nsIContent **aStartContent,
+                                nsIContent **aEndContent);
+
+  /**
+   * Helper function for MoveFocus which determines the next element
+   * to move the focus to and returns it in aNextContent.
+   *
+   * aWindow is the window to adjust the focus within, and aStart is
+   * the element to start navigation from. For tab key navigation,
+   * this should be the currently focused element.
+   *
+   * aType is the type passed to MoveFocus.
+   */
+  nsresult DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
+                                       nsIContent* aStart,
+                                       PRInt32 aType,
+                                       nsIContent** aNextContent);
+
+  /**
+   * Retrieve the next tabbable element within a document, using focusability
+   * and tabindex to determine the tab order. The element is returned in
+   * aResultContent.
+   *
+   * aRootContent is the root node -- nodes above this will not be examined.
+   * Typically this will be the root node of a document, but could also be
+   * a popup node.
+   *
+   * aOriginalStartContent is the content which was originally the starting
+   * node, in the case of recursive or looping calls.
+   *
+   * aStartContent is the starting point for this call of this method.
+   *
+   * aForward should be true for forward navigation or false for backward
+   * navigation.
+   *
+   * aCurrentTabIndex is the current tabindex.
+   *
+   * aIgnoreTabIndex to ignore the current tabindex and find the element
+   * irrespective or the tab index. This will be true when a selection is
+   * active, since we just want to focus the next element in tree order
+   * from where the selection is. Similarly, if the starting element isn't
+   * focusable, since it doesn't really have a defined tab index.
+   */
+  nsresult GetNextTabbableContent(nsIPresShell* aPresShell,
+                                  nsIContent* aRootContent,
+                                  nsIContent* aOriginalStartContent,
+                                  nsIContent* aStartContent,
+                                  PRBool aForward,
+                                  PRInt32 aCurrentTabIndex,
+                                  PRBool aIgnoreTabIndex,
+                                  nsIContent** aResultContent);
+
+  /**
+   * Get the next tabbable image map area and returns it.
+   *
+   * aForward should be true for forward navigation or false for backward
+   * navigation.
+   *
+   * aCurrentTabIndex is the current tabindex.
+   *
+   * aImageContent is the image.
+   *
+   * aStartContent is the current image map area.
+   */
+  nsIContent* GetNextTabbableMapArea(PRBool aForward,
+                                     PRInt32 aCurrentTabIndex,
+                                     nsIContent* aImageContent,
+                                     nsIContent* aStartContent);
+
+  /**
+   * Return the next valid tabindex value after aCurrentTabIndex, if aForward
+   * is true, or the previous tabindex value if aForward is false. aParent is
+   * the node from which to start looking for tab indicies.
+   */
+  PRInt32 GetNextTabIndex(nsIContent* aParent,
+                          PRInt32 aCurrentTabIndex,
+                          PRBool aForward);
+
+  /**
+   * Retrieves and returns the root node from aDocument to be focused. Will
+   * return null if the root node cannot be focused. There are several reasons
+   * for this:
+   *
+   * - if aIsForDocNavigation is true, and aWindow is in an <iframe>.
+   * - if aIsForDocNavigation is false, and aWindow is a chrome shell.
+   * - if aCheckVisibility is true and the aWindow is not visible.
+   * - if aDocument is a frameset document.
+   */
+  nsIContent* GetRootForFocus(nsPIDOMWindow* aWindow,
+                              nsIDocument* aDocument,
+                              PRBool aIsForDocNavigation,
+                              PRBool aCheckVisibility);
+
+  /**
+   * Get the last docshell child of aItem and return it in aResult.
+   */
+  void GetLastDocShell(nsIDocShellTreeItem* aItem,
+                       nsIDocShellTreeItem** aResult);
+
+  /**
+   * Get the next docshell child of aItem and return it in aResult.
+   */
+  void GetNextDocShell(nsIDocShellTreeItem* aItem,
+                       nsIDocShellTreeItem** aResult);
+
+  /**
+   * Get the previous docshell child of aItem and return it in aResult.
+   */
+  void GetPreviousDocShell(nsIDocShellTreeItem* aItem,
+                           nsIDocShellTreeItem** aResult);
+
+  /**
+   * Get the tabbable next document from the currently focused frame if
+   * aForward is true, or the previously tabbable document if aForward is
+   * false. If this document is a chrome or frameset document, returns
+   * the first focusable element within this document, otherwise, returns
+   * the root node of the document.
+   *
+   * This method would be used for document navigation, which is typically
+   * invoked by pressing F6.
+   */
+  nsIContent* GetNextTabbableDocument(PRBool aForward);
+
+  /**
+   * Retreives a focusable element within the current selection of aWindow.
+   * Currently, this only detects links.
+   *  
+   * This is used when MoveFocus is called with a type of MOVEFOCUS_CARET,
+   * which is used, for example, to focus links as the caret is moved over
+   * them.
+   */
+  void GetFocusInSelection(nsPIDOMWindow* aWindow,
+                           nsIContent* aStartSelection,
+                           nsIContent* aEndSelection,
+                           nsIContent** aFocusedContent);
+
+  // the currently active and front-most top-most window
+  nsCOMPtr<nsPIDOMWindow> mActiveWindow;
+
+  // the child or top-level window that is currently focused. This window will
+  // either be the same window as mActiveWindow or a descendant of it.
+  nsCOMPtr<nsPIDOMWindow> mFocusedWindow;
+
+  // the currently focused content, which is always inside mFocusedWindow. This
+  // is a cached copy of the mFocusedWindow's current content. This may be null
+  // if no content is focused.
+  nsCOMPtr<nsIContent> mFocusedContent;
+
+  // these fields store a content node temporarily while it is being focused
+  // or blurred to ensure that a recursive call doesn't refire the same event.
+  // They will always be cleared afterwards.
+  nsCOMPtr<nsIContent> mFirstBlurEvent;
+  nsCOMPtr<nsIContent> mFirstFocusEvent;
+
+  // keep track of a window while it is being lowered
+  nsCOMPtr<nsPIDOMWindow> mWindowBeingLowered;
+
+  // synchronized actions cannot be interrupted with events, so queue these up
+  // and fire them later.
+  nsTArray<nsDelayedBlurOrFocusEvent> mDelayedBlurFocusEvents;
+
+  // the single focus manager
+  static nsIFocusManager* sInstance;
+};
+
+nsresult
+NS_NewFocusManager(nsIFocusManager** aResult);
+
+#endif
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 5297ee3556a7..18f9b05f49bf 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -82,6 +82,8 @@
 #include "nsDOMThreadService.h"
 
 // Interfaces Needed
+#include "nsIFrame.h"
+#include "nsICanvasFrame.h"
 #include "nsIWidget.h"
 #include "nsIBaseWindow.h"
 #include "nsIContent.h"
@@ -90,6 +92,7 @@
 #include "nsIDocShellLoadInfo.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeNode.h"
+#include "nsIEditorDocShell.h"
 #include "nsIDocCharset.h"
 #include "nsIDocument.h"
 #include "nsIHTMLDocument.h"
@@ -163,6 +166,7 @@
 #include "nsIObserverService.h"
 #include "nsIXULAppInfo.h"
 #include "nsNetUtil.h"
+#include "nsFocusManager.h"
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
 #endif
@@ -622,12 +626,15 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
     mFireOfflineStatusChangeEventOnThaw(PR_FALSE),
     mCreatingInnerWindow(PR_FALSE),
     mIsChrome(PR_FALSE),
+    mNeedsFocus(PR_TRUE),
+    mHasFocus(PR_FALSE),
     mTimeoutInsertionPoint(nsnull),
     mTimeoutPublicIdCounter(1),
     mTimeoutFiringDepth(0),
     mJSObject(nsnull),
     mPendingStorageEvents(nsnull),
-    mTimeoutsSuspendDepth(0)
+    mTimeoutsSuspendDepth(0),
+    mFocusMethod(0)
 #ifdef DEBUG
     , mSetOpenerWindowCalled(PR_FALSE)
 #endif
@@ -1063,6 +1070,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow)
   // Traverse mDummyJavaPluginOwner
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDummyJavaPluginOwner)
 
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFocusedNode)
+
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
@@ -1097,6 +1106,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
     NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDummyJavaPluginOwner)
   }
 
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFocusedNode)
+
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 struct TraceData
@@ -1490,32 +1501,32 @@ WindowStateHolder::WindowStateHolder(nsGlobalWindow *aWindow,
   NS_STID_FOR_INDEX(lang_ndx) {
     mInnerWindowHolders[lang_ndx] = aHolders[lang_ndx];
   }
-  nsIFocusController *fc = aWindow->GetRootFocusController();
-  NS_ASSERTION(fc, "null focus controller");
 
-  // We want to save the focused element/window only if they are inside of
-  // this window.
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    // We want to save the focused element/window only if they are inside of
+    // this window.
 
-  nsCOMPtr<nsIDOMWindowInternal> focusWinInternal;
-  fc->GetFocusedWindow(getter_AddRefs(focusWinInternal));
+    nsCOMPtr<nsIDOMWindow> window;
+    fm->GetFocusedWindow(getter_AddRefs(window));
+    nsCOMPtr<nsPIDOMWindow> focusedWindow = do_QueryInterface(window);
 
-  nsCOMPtr<nsPIDOMWindow> focusedWindow = do_QueryInterface(focusWinInternal);
+    // The outer window is used for focus purposes, so make sure that's what
+    // we're looking for.
+    nsPIDOMWindow *targetWindow = aWindow->GetOuterWindow();
 
-  // The outer window is used for focus purposes, so make sure that's what
-  // we're looking for.
-  nsPIDOMWindow *targetWindow = aWindow->GetOuterWindow();
+    while (focusedWindow) {
+      if (focusedWindow == targetWindow) {
+        mFocusedWindow = do_QueryInterface(window);
+        fm->GetFocusedElement(getter_AddRefs(mFocusedElement));
+        break;
+      }
 
-  while (focusedWindow) {
-    if (focusedWindow == targetWindow) {
-      fc->GetFocusedWindow(getter_AddRefs(mFocusedWindow));
-      fc->GetFocusedElement(getter_AddRefs(mFocusedElement));
-      break;
+      focusedWindow =
+        static_cast<nsGlobalWindow*>
+                   (static_cast<nsPIDOMWindow*>
+                               (focusedWindow))->GetPrivateParent();
     }
-
-    focusedWindow =
-      static_cast<nsGlobalWindow*>
-                 (static_cast<nsPIDOMWindow*>
-                             (focusedWindow))->GetPrivateParent();
   }
 
   aWindow->SuspendTimeouts();
@@ -2118,19 +2129,23 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell)
     // if we are closing the window while in full screen mode, be sure
     // to restore os chrome
     if (mFullScreen) {
-      nsIFocusController *focusController =
-        nsGlobalWindow::GetRootFocusController();
-      PRBool isActive = PR_FALSE;
-      if (focusController)
-        focusController->GetActive(&isActive);
       // only restore OS chrome if the closing window was active
+      nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+      if (fm) {
+        nsCOMPtr<nsIDOMWindow> activeWindow;
+        fm->GetActiveWindow(getter_AddRefs(activeWindow));
 
-      if (isActive) {
-        nsCOMPtr<nsIFullScreen> fullScreen =
-          do_GetService("@mozilla.org/browser/fullscreen;1");
+        nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(mDocShell);
+        nsCOMPtr<nsIDocShellTreeItem> rootItem;
+        treeItem->GetRootTreeItem(getter_AddRefs(rootItem));
+        nsCOMPtr<nsIDOMWindow> rootWin = do_GetInterface(rootItem);
+        if (rootWin == activeWindow) {
+          nsCOMPtr<nsIFullScreen> fullScreen =
+            do_GetService("@mozilla.org/browser/fullscreen;1");
 
-        if (fullScreen)
-          fullScreen->ShowAllOSChrome();
+          if (fullScreen)
+            fullScreen->ShowAllOSChrome();
+        }
       }
     }
 
@@ -2289,68 +2304,6 @@ nsGlobalWindow::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
    without this addref. */
   nsCOMPtr<nsPIDOMEventTarget> kungFuDeathGrip1(mChromeEventHandler);
   nsCOMPtr<nsIScriptContext> kungFuDeathGrip2(GetContextInternal());
-  nsGlobalWindow* outer = GetOuterWindowInternal();
-
-  if (aVisitor.mEvent->message == NS_DEACTIVATE ||
-      aVisitor.mEvent->message == NS_ACTIVATE) {
-    // if the window is deactivated while in full screen mode,
-    // restore OS chrome, and hide it again upon re-activation
-    if (outer && outer->mFullScreen) {
-      nsCOMPtr<nsIFullScreen> fullScreen =
-        do_GetService("@mozilla.org/browser/fullscreen;1");
-      if (fullScreen) {
-        if (aVisitor.mEvent->message == NS_DEACTIVATE)
-          fullScreen->ShowAllOSChrome();
-        else
-          fullScreen->HideAllOSChrome();
-      }
-    }
-
-    // Set / unset the "active" attribute on the documentElement
-    // of the top level window
-    nsCOMPtr<nsIWidget> mainWidget = GetMainWidget();
-    if (mainWidget) {
-      // Get the top level widget (if the main widget is a sheet, this will
-      // be the sheet's top (non-sheet) parent).
-      nsCOMPtr<nsIWidget> topLevelWidget = mainWidget->GetSheetWindowParent();
-      if (!topLevelWidget)
-        topLevelWidget = mainWidget;
-
-      // Get the top level widget's nsGlobalWindow
-      nsCOMPtr<nsIDOMWindowInternal> topLevelWindow;
-      if (topLevelWidget == mainWidget) {
-        topLevelWindow = static_cast<nsIDOMWindowInternal *>(this);
-      } else {
-        // This is a workaround for the following problem:
-        // When a window with an open sheet loses focus, only the sheet window
-        // receives the NS_DEACTIVATE event. However, it's not the sheet that
-        // should lose the "active" attribute, but the containing top level window.
-        void* clientData;
-        topLevelWidget->GetClientData(clientData); // clientData is nsXULWindow
-        nsISupports* data = static_cast<nsISupports*>(clientData);
-        nsCOMPtr<nsIInterfaceRequestor> req(do_QueryInterface(data));
-        topLevelWindow = do_GetInterface(req);
-      }
-
-      if (topLevelWindow) {
-        // Only set the attribute if the document is a XUL document and the
-        // window is a chrome window
-        nsCOMPtr<nsIDOMDocument> domDoc;
-        topLevelWindow->GetDocument(getter_AddRefs(domDoc));
-        nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
-        nsCOMPtr<nsIDOMXULDocument> xulDoc(do_QueryInterface(doc));
-        nsCOMPtr<nsIDOMChromeWindow> chromeWin = do_QueryInterface(topLevelWindow);
-        if (xulDoc && chromeWin) {
-          nsCOMPtr<nsIContent> rootElem = doc->GetRootContent();
-          if (aVisitor.mEvent->message == NS_ACTIVATE)
-            rootElem->SetAttr(kNameSpaceID_None, nsGkAtoms::active,
-                              NS_LITERAL_STRING("true"), PR_TRUE);
-          else
-            rootElem->UnsetAttr(kNameSpaceID_None, nsGkAtoms::active, PR_TRUE);
-        }
-      }
-    }
-  }
 
   if (aVisitor.mEvent->message == NS_RESIZE_EVENT) {
     mIsHandlingResizeEvent = PR_FALSE;
@@ -4243,6 +4196,10 @@ nsGlobalWindow::Focus()
 {
   FORWARD_TO_OUTER(Focus, (), NS_ERROR_NOT_INITIALIZED);
 
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return NS_OK;
+
   nsCOMPtr<nsIBaseWindow> baseWin = do_QueryInterface(mDocShell);
 
   PRBool isVisible = PR_FALSE;
@@ -4267,12 +4224,15 @@ nsGlobalWindow::Focus()
     CanSetProperty("dom.disable_window_flip") ||
     CheckOpenAllow(CheckForAbusePoint()) == allowNoAbuse;
 
-  PRBool isActive = PR_FALSE;
-  nsIFocusController *focusController =
-    nsGlobalWindow::GetRootFocusController();
-  if (focusController) {
-    focusController->GetActive(&isActive);
-  }
+  nsCOMPtr<nsIDOMWindow> activeWindow;
+  fm->GetActiveWindow(getter_AddRefs(activeWindow));
+
+  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(mDocShell);
+  NS_ASSERTION(treeItem, "What happened?");
+  nsCOMPtr<nsIDocShellTreeItem> rootItem;
+  treeItem->GetRootTreeItem(getter_AddRefs(rootItem));
+  nsCOMPtr<nsIDOMWindow> rootWin = do_GetInterface(rootItem);
+  PRBool isActive = (rootWin == activeWindow);
 
   nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
   GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
@@ -4283,56 +4243,67 @@ nsGlobalWindow::Focus()
       return NS_OK;
     }
 
-    treeOwnerAsWin->SetVisibility(PR_TRUE);
+    // XXXndeakin not sure what this is for or if it should go somewhere else
     nsCOMPtr<nsIEmbeddingSiteWindow> embeddingWin(do_GetInterface(treeOwnerAsWin));
     if (embeddingWin)
       embeddingWin->SetFocus();
   }
 
+  if (!mDocShell)
+    return NS_OK;
+
   nsCOMPtr<nsIPresShell> presShell;
-  if (mDocShell) {
-    // Don't look for a presshell if we're a root chrome window that's got
-    // about:blank loaded.  We don't want to focus our widget in that case.
-    // XXXbz should we really be checking for IsInitialDocument() instead?
-    PRBool lookForPresShell = PR_TRUE;
-    PRInt32 itemType = nsIDocShellTreeItem::typeContent;
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(mDocShell));
-    NS_ASSERTION(treeItem, "What happened?");
-    treeItem->GetItemType(&itemType);
-    if (itemType == nsIDocShellTreeItem::typeChrome &&
-        GetPrivateRoot() == static_cast<nsIDOMWindowInternal*>(this) &&
-        mDocument) {
-      nsCOMPtr<nsIDocument> doc(do_QueryInterface(mDocument));
-      NS_ASSERTION(doc, "Bogus doc?");
-      nsIURI* ourURI = doc->GetDocumentURI();
-      if (ourURI) {
-        lookForPresShell = !IsAboutBlank(ourURI);
-      }
-    }
-      
-    if (lookForPresShell) {
-      mDocShell->GetEldestPresShell(getter_AddRefs(presShell));
+  // Don't look for a presshell if we're a root chrome window that's got
+  // about:blank loaded.  We don't want to focus our widget in that case.
+  // XXXbz should we really be checking for IsInitialDocument() instead?
+  PRBool lookForPresShell = PR_TRUE;
+  PRInt32 itemType = nsIDocShellTreeItem::typeContent;
+  treeItem->GetItemType(&itemType);
+  if (itemType == nsIDocShellTreeItem::typeChrome &&
+      GetPrivateRoot() == static_cast<nsIDOMWindowInternal*>(this) &&
+      mDocument) {
+    nsCOMPtr<nsIDocument> doc(do_QueryInterface(mDocument));
+    NS_ASSERTION(doc, "Bogus doc?");
+    nsIURI* ourURI = doc->GetDocumentURI();
+    if (ourURI) {
+      lookForPresShell = !IsAboutBlank(ourURI);
     }
   }
 
-  nsresult result = NS_OK;
-  if (presShell && (canFocus || isActive)) {
-    nsIViewManager* vm = presShell->GetViewManager();
-    if (vm) {
-      nsCOMPtr<nsIWidget> widget;
-      vm->GetWidget(getter_AddRefs(widget));
-      if (widget)
-        // raise the window since this was a focus call on the window.
-        result = widget->SetFocus(PR_TRUE);
-    }
-  }
-  else {
-    if (focusController) {
-      focusController->SetFocusedWindow(this);
-    }
+  if (lookForPresShell) {
+    mDocShell->GetEldestPresShell(getter_AddRefs(presShell));
   }
 
-  return result;
+  nsCOMPtr<nsIDocShellTreeItem> parentDsti;
+  treeItem->GetParent(getter_AddRefs(parentDsti));
+
+  // set the parent's current focus to the frame containing this window.
+  nsCOMPtr<nsIDOMWindow> parent(do_GetInterface(parentDsti));
+  if (parent) {
+    nsCOMPtr<nsIDOMDocument> parentdomdoc;
+    parent->GetDocument(getter_AddRefs(parentdomdoc));
+
+    nsCOMPtr<nsIDocument> parentdoc = do_QueryInterface(parentdomdoc);
+    if (!parentdoc)
+      return NS_OK;
+
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
+    nsIContent* frame = parentdoc->FindContentForSubDocument(doc);
+    nsCOMPtr<nsIDOMElement> frameElement = do_QueryInterface(frame);
+    if (frameElement) {
+      PRUint32 flags = nsIFocusManager::FLAG_NOSCROLL;
+      if (canFocus)
+        flags |= nsIFocusManager::FLAG_RAISE;
+      return fm->SetFocus(frameElement, flags);
+    }
+  }
+  else if (canFocus) {
+    // if there is no parent, this must be a toplevel window, so raise the
+    // window if canFocus is true
+    return fm->SetActiveWindow(this);
+  }
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -4351,8 +4322,16 @@ nsGlobalWindow::Blur()
     // This method call may cause mDocShell to become nsnull.
     rv = siteWindow->Blur();
 
-    if (NS_SUCCEEDED(rv) && mDocShell)
-      mDocShell->SetHasFocus(PR_FALSE);
+    // if the root is focused, clear the focus
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
+    if (fm && mDocument) {
+      nsCOMPtr<nsIDOMElement> element;
+      fm->GetFocusedElementForWindow(this, PR_FALSE, nsnull, getter_AddRefs(element));
+      nsCOMPtr<nsIContent> content = do_QueryInterface(element);
+      if (content == doc->GetRootContent())
+        fm->ClearFocus(this);
+    }
   }
 
   return rv;
@@ -6613,61 +6592,67 @@ nsGlobalWindow::GetLocation(nsIDOMLocation ** aLocation)
   return NS_OK;
 }
 
-static nsresult
-FireWidgetEvent(nsIDocShell *aDocShell, PRUint32 aMsg)
+void
+nsGlobalWindow::ActivateOrDeactivate(PRBool aActivate)
 {
-  nsCOMPtr<nsIPresShell> presShell;
-  aDocShell->GetPresShell(getter_AddRefs(presShell));
-  NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
-
-  nsIViewManager* vm = presShell->GetViewManager();
-  NS_ENSURE_TRUE(vm, NS_ERROR_FAILURE);
-
-  nsIView *rootView;
-  vm->GetRootView(rootView);
-  NS_ENSURE_TRUE(rootView, NS_ERROR_FAILURE);
-
-  // We're holding a STRONG REF to the widget to ensure it doesn't go away
-  // during event processing
-  nsCOMPtr<nsIWidget> widget = rootView->GetWidget();
-  NS_ENSURE_TRUE(widget, NS_ERROR_FAILURE);
-
-  nsEventStatus status;
-
-  nsGUIEvent guiEvent(PR_TRUE, aMsg, widget);
-  guiEvent.time = PR_IntervalNow();
-
-  vm->DispatchEvent(&guiEvent, &status);
-
-  return NS_OK;
-}
-
-nsresult
-nsGlobalWindow::Activate()
-{
-  FORWARD_TO_OUTER(Activate, (), NS_ERROR_NOT_INITIALIZED);
-
-  nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
-  GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
-  if (treeOwnerAsWin) {
-    PRBool isEnabled = PR_TRUE;
-    if (NS_SUCCEEDED(treeOwnerAsWin->GetEnabled(&isEnabled)) && !isEnabled) {
-      NS_WARNING( "Should not try to activate a disabled window" );
-      return NS_ERROR_FAILURE;
+  // if the window is deactivated while in full screen mode,
+  // restore OS chrome, and hide it again upon re-activation
+  nsGlobalWindow* outer = GetOuterWindowInternal();
+  if (outer && outer->mFullScreen) {
+    nsCOMPtr<nsIFullScreen> fullScreen =
+      do_GetService("@mozilla.org/browser/fullscreen;1");
+    if (fullScreen) {
+      if (aActivate)
+        fullScreen->HideAllOSChrome();
+      else
+        fullScreen->ShowAllOSChrome();
     }
-
-    treeOwnerAsWin->SetVisibility(PR_TRUE);
   }
 
-  return FireWidgetEvent(mDocShell, NS_ACTIVATE);
-}
+  // Set / unset the "active" attribute on the documentElement
+  // of the top level window
+  nsCOMPtr<nsIWidget> mainWidget = GetMainWidget();
+  if (mainWidget) {
+    // Get the top level widget (if the main widget is a sheet, this will
+    // be the sheet's top (non-sheet) parent).
+    nsCOMPtr<nsIWidget> topLevelWidget = mainWidget->GetSheetWindowParent();
+    if (!topLevelWidget)
+      topLevelWidget = mainWidget;
 
-nsresult
-nsGlobalWindow::Deactivate()
-{
-  FORWARD_TO_OUTER(Deactivate, (), NS_ERROR_NOT_INITIALIZED);
+    // Get the top level widget's nsGlobalWindow
+    nsCOMPtr<nsIDOMWindowInternal> topLevelWindow;
+    if (topLevelWidget == mainWidget) {
+      topLevelWindow = static_cast<nsIDOMWindowInternal *>(this);
+    } else {
+      // This is a workaround for the following problem:
+      // When a window with an open sheet loses focus, only the sheet window
+      // receives the NS_DEACTIVATE event. However, it's not the sheet that
+      // should lose the "active" attribute, but the containing top level window.
+      void* clientData;
+      topLevelWidget->GetClientData(clientData); // clientData is nsXULWindow
+      nsISupports* data = static_cast<nsISupports*>(clientData);
+      nsCOMPtr<nsIInterfaceRequestor> req(do_QueryInterface(data));
+      topLevelWindow = do_GetInterface(req);
+    }
 
-  return FireWidgetEvent(mDocShell, NS_DEACTIVATE);
+    if (topLevelWindow) {
+      // Only set the attribute if the document is a XUL document and the
+      // window is a chrome window
+      nsCOMPtr<nsIDOMDocument> domDoc;
+      topLevelWindow->GetDocument(getter_AddRefs(domDoc));
+      nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
+      nsCOMPtr<nsIDOMXULDocument> xulDoc(do_QueryInterface(doc));
+      nsCOMPtr<nsIDOMChromeWindow> chromeWin = do_QueryInterface(topLevelWindow);
+      if (xulDoc && chromeWin) {
+        nsCOMPtr<nsIContent> rootElem = doc->GetRootContent();
+        if (aActivate)
+          rootElem->SetAttr(kNameSpaceID_None, nsGkAtoms::active,
+                            NS_LITERAL_STRING("true"), PR_TRUE);
+        else
+          rootElem->UnsetAttr(kNameSpaceID_None, nsGkAtoms::active, PR_TRUE);
+      }
+    }
+  }
 }
 
 void
@@ -6712,6 +6697,171 @@ nsGlobalWindow::GetRootFocusController()
   return fc;
 }
 
+nsIContent*
+nsGlobalWindow::GetFocusedNode()
+{
+  FORWARD_TO_INNER(GetFocusedNode, (), NS_OK);
+
+  return mFocusedNode;
+}
+
+void
+nsGlobalWindow::SetFocusedNode(nsIContent* aNode,
+                               PRUint32 aFocusMethod,
+                               PRBool aNeedsFocus)
+{
+  FORWARD_TO_INNER_VOID(SetFocusedNode, (aNode, aFocusMethod, aNeedsFocus));
+
+  NS_ASSERTION(!aNode || aNode->GetCurrentDoc() == mDoc,
+               "setting focus to a node from the wrong document");
+
+  if (mFocusedNode != aNode) {
+    UpdateCanvasFocus(PR_FALSE, aNode);
+    mFocusedNode = aNode;
+    mFocusMethod = aFocusMethod;
+  }
+
+  if (aNeedsFocus)
+    mNeedsFocus = aNeedsFocus;
+}
+
+PRUint32
+nsGlobalWindow::GetFocusMethod()
+{
+  FORWARD_TO_INNER(GetFocusMethod, (), 0);
+
+  return mFocusMethod;
+}
+
+PRBool
+nsGlobalWindow::TakeFocus(PRBool aFocus, PRUint32 aFocusMethod)
+{
+  FORWARD_TO_INNER(TakeFocus, (aFocus, aFocusMethod), PR_FALSE);
+
+  if (aFocus)
+    mFocusMethod = aFocusMethod;
+
+  if (mHasFocus != aFocus) {
+    mHasFocus = aFocus;
+    UpdateCanvasFocus(PR_TRUE, mFocusedNode);
+  }
+
+  // if mNeedsFocus is true, then the document has not yet received a
+  // document-level focus event. If there is a root content node, then return
+  // true to tell the calling focus manager that a focus event is expected. If
+  // there is no root content node, the document hasn't loaded enough yet, or
+  // there isn't one and there is no point in firing a focus event.
+  if (aFocus && mNeedsFocus && mDoc && mDoc->GetRootContent() != nsnull) {
+    mNeedsFocus = PR_FALSE;
+    return PR_TRUE;
+  }
+
+  mNeedsFocus = PR_FALSE;
+  return PR_FALSE;
+}
+
+void
+nsGlobalWindow::SetReadyForFocus()
+{
+  FORWARD_TO_INNER_VOID(SetReadyForFocus, ());
+
+  // if we don't need to be focused, then just return
+  if (!mNeedsFocus)
+    return;
+
+  mNeedsFocus = PR_FALSE;
+
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    fm->WindowShown(this);
+}
+
+void
+nsGlobalWindow::PageHidden()
+{
+  FORWARD_TO_INNER_VOID(PageHidden, ());
+
+  // the window is being hidden, so tell the focus manager that the frame is
+  // no longer valid. Use the persisted field to determine if the document
+  // is being destroyed.
+
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    fm->WindowHidden(this);
+
+  mNeedsFocus = PR_TRUE;
+}
+
+// Find an nsICanvasFrame under aFrame.  Only search the principal
+// child lists.  aFrame must be non-null.
+static nsICanvasFrame* FindCanvasFrame(nsIFrame* aFrame)
+{
+    nsICanvasFrame* canvasFrame = do_QueryFrame(aFrame);
+    if (canvasFrame) {
+        return canvasFrame;
+    }
+
+    nsIFrame* kid = aFrame->GetFirstChild(nsnull);
+    while (kid) {
+        canvasFrame = FindCanvasFrame(kid);
+        if (canvasFrame) {
+            return canvasFrame;
+        }
+        kid = kid->GetNextSibling();
+    }
+
+    return nsnull;
+}
+
+//-------------------------------------------------------
+// Tells the HTMLFrame/CanvasFrame that is now has focus
+void
+nsGlobalWindow::UpdateCanvasFocus(PRBool aFocusChanged, nsIContent* aNewContent)
+{
+  // this is called from the inner window so use GetDocShell
+  nsIDocShell* docShell = GetDocShell();
+  if (!docShell)
+    return;
+
+  nsCOMPtr<nsIEditorDocShell> editorDocShell = do_QueryInterface(docShell);
+  if (editorDocShell) {
+    PRBool editable;
+    editorDocShell->GetEditable(&editable);
+    if (editable)
+      return;
+  }
+
+  nsCOMPtr<nsIPresShell> presShell;
+  docShell->GetPresShell(getter_AddRefs(presShell));
+  if (!presShell || !mDocument)
+    return;
+
+  nsCOMPtr<nsIDocument> doc(do_QueryInterface(mDocument));
+  nsIContent *rootContent = doc->GetRootContent();
+  if (rootContent) {
+      if ((mHasFocus || aFocusChanged) &&
+          (mFocusedNode == rootContent || aNewContent == rootContent)) {
+          nsIFrame* frame = presShell->GetPrimaryFrameFor(rootContent);
+          if (frame) {
+              frame = frame->GetParent();
+              nsICanvasFrame* canvasFrame = do_QueryFrame(frame);
+              if (canvasFrame) {
+                  canvasFrame->SetHasFocus(mHasFocus && rootContent == aNewContent);
+              }
+          }
+      }
+  } else {
+      // Look for the frame the hard way
+      nsIFrame* frame = presShell->GetRootFrame();
+      if (frame) {
+          nsICanvasFrame* canvasFrame = FindCanvasFrame(frame);
+          if (canvasFrame) {
+              canvasFrame->SetHasFocus(PR_FALSE);
+          }
+      }      
+  }
+}
+
 //*****************************************************************************
 // nsGlobalWindow::nsIDOMViewCSS
 //*****************************************************************************
@@ -8381,49 +8531,13 @@ nsGlobalWindow::RestoreWindowState(nsISupports *aState)
 
   nsGlobalWindow *inner = GetCurrentInnerWindowInternal();
 
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
   nsIDOMElement *focusedElement = holder->GetFocusedElement();
   nsIDOMWindowInternal *focusedWindow = holder->GetFocusedWindow();
-
-  // If the toplevel window isn't focused, just update the focus controller.
-  nsIFocusController *fc = nsGlobalWindow::GetRootFocusController();
-  NS_ENSURE_TRUE(fc, NS_ERROR_UNEXPECTED);
-
-  PRBool active;
-  fc->GetActive(&active);
-  if (active) {
-    PRBool didFocusContent = PR_FALSE;
-    nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
-
-    if (focusedContent) {
-      // We don't bother checking whether the element or frame is focusable.
-      // If it was focusable when we stored the presentation, it must be
-      // focusable now.
-      nsIDocument *doc = focusedContent->GetCurrentDoc();
-      if (doc) {
-        nsIPresShell *shell = doc->GetPrimaryShell();
-        if (shell) {
-          nsPresContext *pc = shell->GetPresContext();
-          if (pc) {
-            pc->EventStateManager()->SetContentState(focusedContent,
-                                                     NS_EVENT_STATE_FOCUS);
-            didFocusContent = PR_TRUE;
-          }
-        }
-      }
-    }
-
-    if (!didFocusContent && focusedWindow) {
-      // Clear the focus controller's memory of any focused element so that
-      // the element does not get inadvertently focused again.
-      fc->ResetElementFocus();
-
-      focusedWindow->Focus();
-    }
-  } else if (focusedWindow) {
-    // Just update the saved focus memory.
-    fc->SetFocusedWindow(focusedWindow);
-    fc->SetFocusedElement(focusedElement);
-  }
+  if (fm && focusedElement)
+    fm->SetFocus(focusedElement, nsIFocusManager::FLAG_NOSCROLL);
+  else if (focusedWindow)
+    focusedWindow->Focus();
 
   // And we're ready to go!
   inner->Thaw();
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index d581af0c4e4e..789ef001b9d6 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -98,13 +98,13 @@
 #include "nsIDOMOfflineResourceList.h"
 #include "nsPIDOMEventTarget.h"
 #include "nsIArray.h"
+#include "nsIContent.h"
 
 #define DEFAULT_HOME_PAGE "www.mozilla.org"
 #define PREF_BROWSER_STARTUP_HOMEPAGE "browser.startup.homepage"
 
 class nsIDOMBarProp;
 class nsIDocument;
-class nsIContent;
 class nsPresContext;
 class nsIDOMEvent;
 class nsIScrollableView;
@@ -288,8 +288,7 @@ public:
 
   // nsPIDOMWindow
   virtual NS_HIDDEN_(nsPIDOMWindow*) GetPrivateRoot();
-  virtual NS_HIDDEN_(nsresult) Activate();
-  virtual NS_HIDDEN_(nsresult) Deactivate();
+  virtual NS_HIDDEN_(void) ActivateOrDeactivate(PRBool aActivate);
   virtual NS_HIDDEN_(void) SetChromeEventHandler(nsPIDOMEventTarget* aChromeEventHandler);
   virtual NS_HIDDEN_(nsIFocusController*) GetRootFocusController();
 
@@ -438,6 +437,10 @@ public:
     CacheXBLPrototypeHandler(nsXBLPrototypeHandler* aKey,
                              nsScriptObjectHolder& aHandler);
 
+  virtual PRBool TakeFocus(PRBool aFocus, PRUint32 aFocusMethod);
+  virtual void SetReadyForFocus();
+  virtual void PageHidden();
+
   static PRBool DOMWindowDumpEnabled();
 
 protected:
@@ -636,6 +639,15 @@ protected:
   nsIntSize DevToCSSIntPixels(nsIntSize px);
   nsIntSize CSSToDevIntPixels(nsIntSize px);
 
+  virtual nsIContent* GetFocusedNode();
+  virtual void SetFocusedNode(nsIContent* aNode,
+                              PRUint32 aFocusMethod = 0,
+                              PRBool aNeedsFocus = PR_FALSE);
+
+  virtual PRUint32 GetFocusMethod();
+
+  void UpdateCanvasFocus(PRBool aFocusChanged, nsIContent* aNewContent);
+
   static void NotifyDOMWindowDestroyed(nsGlobalWindow* aWindow);
 
   // When adding new member variables, be careful not to create cycles
@@ -682,6 +694,11 @@ protected:
   // Fast way to tell if this is a chrome window (without having to QI).
   PRPackedBool                  mIsChrome : 1;
 
+  // Indicates that the current document has never received a document focus
+  // event.
+  PRPackedBool           mNeedsFocus : 1;
+  PRPackedBool           mHasFocus : 1;
+
   nsCOMPtr<nsIScriptContext>    mContext;
   nsWeakPtr                     mOpener;
   nsCOMPtr<nsIControllers>      mControllers;
@@ -736,6 +753,13 @@ protected:
 
   PRUint32 mTimeoutsSuspendDepth;
 
+  // the element within the document that is currently focused when this
+  // window is active
+  nsCOMPtr<nsIContent>   mFocusedNode;
+
+  // the method that was used to focus mFocusedNode
+  PRUint32 mFocusMethod;
+
 #ifdef DEBUG
   PRBool mSetOpenerWindowCalled;
   PRUint32 mSerial;
diff --git a/dom/base/nsGlobalWindowCommands.cpp b/dom/base/nsGlobalWindowCommands.cpp
index 60ada03d7ebc..b8c020bcaee5 100644
--- a/dom/base/nsGlobalWindowCommands.cpp
+++ b/dom/base/nsGlobalWindowCommands.cpp
@@ -44,6 +44,7 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsCRT.h"
 #include "nsString.h"
+#include "nsContentUtils.h"
 
 #include "nsIControllerCommandTable.h"
 #include "nsICommandParams.h"
@@ -53,10 +54,10 @@
 #include "nsPresContext.h"
 #include "nsIDocShell.h"
 #include "nsISelectionController.h"
-#include "nsIEventStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsIContentViewerEdit.h"
 #include "nsIContentViewer.h"
+#include "nsFocusManager.h"
 
 #include "nsIClipboardDragDropHooks.h"
 #include "nsIClipboardDragDropHookList.h"
@@ -123,7 +124,6 @@ protected:
 
   static nsresult  GetPresShellFromWindow(nsIDOMWindow *aWindow, nsIPresShell **aPresShell);
   static nsresult  GetSelectionControllerFromWindow(nsIDOMWindow *aWindow, nsISelectionController **aSelCon);
-  static nsresult  GetEventStateManagerForWindow(nsIDOMWindow *aWindow, nsIEventStateManager **aEventStateManager);
 
   // no member variables, please, we're stateless!
 };
@@ -135,7 +135,9 @@ protected:
 
   virtual nsresult DoSelectCommand(const char *aCommandName, nsIDOMWindow *aWindow);
   
-  nsresult    DoCommandBrowseWithCaretOn(const char *aCommandName, nsISelectionController *aSelectionController, nsIEventStateManager* aESM);
+  nsresult    DoCommandBrowseWithCaretOn(const char *aCommandName,
+                                         nsIDOMWindow *aWindow,
+                                         nsISelectionController *aSelectionController);
   nsresult    DoCommandBrowseWithCaretOff(const char *aCommandName, nsISelectionController *aSelectionController);
 
   // no member variables, please, we're stateless!
@@ -225,25 +227,6 @@ nsSelectionCommandsBase::GetSelectionControllerFromWindow(nsIDOMWindow *aWindow,
   return NS_ERROR_FAILURE;
 }
 
-nsresult
-nsSelectionCommandsBase::GetEventStateManagerForWindow(nsIDOMWindow *aWindow,
-                              nsIEventStateManager **aEventStateManager)
-{
-  *aEventStateManager = nsnull;
-
-  nsCOMPtr<nsIPresShell> presShell;
-  GetPresShellFromWindow(aWindow, getter_AddRefs(presShell));
-  if (presShell)
-  {
-    nsPresContext *presContext = presShell->GetPresContext();
-    if (presContext) {
-      NS_ADDREF(*aEventStateManager = presContext->EventStateManager());
-      return NS_OK;
-    }
-  }
-  return NS_ERROR_FAILURE;
-}
-
 #if 0
 #pragma mark -
 #endif
@@ -258,24 +241,21 @@ nsSelectMoveScrollCommand::DoSelectCommand(const char *aCommandName, nsIDOMWindo
   PRBool caretOn = PR_FALSE;
   selCont->GetCaretEnabled(&caretOn);
 
-  nsCOMPtr<nsIEventStateManager> esm;
-  GetEventStateManagerForWindow(aWindow, getter_AddRefs(esm));
-
-  nsresult rv;
   // We allow the caret to be moved with arrow keys on any window for which
   // the caret is enabled. In particular, this includes caret-browsing mode,
   // but we refer to this mode again in the test condition for readability.
-  if (caretOn || (esm && esm->GetBrowseWithCaret()))
-    rv = DoCommandBrowseWithCaretOn(aCommandName, selCont, esm);
-  else
-    rv = DoCommandBrowseWithCaretOff(aCommandName, selCont);
+  if (caretOn) {
+    // XXXndeakin P3 perhaps this should be cached
+    if (nsContentUtils::GetBoolPref("accessibility.browsewithcaret"))
+      return DoCommandBrowseWithCaretOn(aCommandName, aWindow, selCont);
+  }
 
-  return rv;
+  return DoCommandBrowseWithCaretOff(aCommandName, selCont);
 }
 
 nsresult
 nsSelectMoveScrollCommand::DoCommandBrowseWithCaretOn(const char *aCommandName,
-                  nsISelectionController *aSelectionController, nsIEventStateManager* aESM)
+                  nsIDOMWindow *aWindow, nsISelectionController *aSelectionController)
 {
   nsresult rv = NS_ERROR_NOT_IMPLEMENTED;
 
@@ -312,10 +292,16 @@ nsSelectMoveScrollCommand::DoCommandBrowseWithCaretOn(const char *aCommandName,
   else if (!nsCRT::strcmp(aCommandName, sEndLineString))
     rv = aSelectionController->IntraLineMove(PR_TRUE, PR_FALSE);
 
-  if (NS_SUCCEEDED(rv) && aESM)
+  if (NS_SUCCEEDED(rv))
   {
-    PRBool dummy;
-    aESM->MoveFocusToCaret(PR_TRUE, &dummy);
+    // adjust the focus to the new caret position
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm) {
+      nsCOMPtr<nsIDOMElement> result;
+      fm->MoveFocus(aWindow, nsnull, nsIFocusManager::MOVEFOCUS_CARET,
+                    nsIFocusManager::FLAG_NOSCROLL,
+                    getter_AddRefs(result));
+    }
   }
 
   return rv;
diff --git a/dom/base/nsIFocusController.h b/dom/base/nsIFocusController.h
index 5a48725b1519..0cf27e94fbed 100644
--- a/dom/base/nsIFocusController.h
+++ b/dom/base/nsIFocusController.h
@@ -45,120 +45,26 @@
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 
-class nsIDOMElement;
 class nsIDOMNode;
-class nsIDOMWindowInternal;
 class nsIController;
 class nsIControllers;
-class nsAString;
 
-// 58be9aa6-edec-46be-a9f5-6d8b572418d5
+// 2879DB1C-47AA-46C4-B184-2590CC39F262
 #define NS_IFOCUSCONTROLLER_IID \
-{ 0x58be9aa6, 0xedec, 0x46be, \
-  { 0xa9, 0xf5, 0x6d, 0x8b, 0x57, 0x24, 0x18, 0xd5 } }
+{ 0x2879db1c, 0x47aa, 0x46c4, \
+  { 0xb1, 0x84, 0x25, 0x90, 0xcc, 0x39, 0xf2, 0x62 } }
 
 class nsIFocusController : public nsISupports {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFOCUSCONTROLLER_IID)
 
-  NS_IMETHOD GetFocusedElement(nsIDOMElement** aResult)=0;
-  NS_IMETHOD SetFocusedElement(nsIDOMElement* aElement)=0;
-
-  NS_IMETHOD GetFocusedWindow(nsIDOMWindowInternal** aResult)=0;
-  NS_IMETHOD SetFocusedWindow(nsIDOMWindowInternal* aResult)=0;
-
-  NS_IMETHOD GetSuppressFocus(PRBool* aSuppressFlag)=0;
-  NS_IMETHOD SetSuppressFocus(PRBool aSuppressFlag, const char* aReason)=0;
-
-  NS_IMETHOD GetSuppressFocusScroll(PRBool* aSuppressFlag)=0;
-  NS_IMETHOD SetSuppressFocusScroll(PRBool aSuppressFlag)=0;
-  
-  NS_IMETHOD GetActive(PRBool* aActive)=0;
-  NS_IMETHOD SetActive(PRBool aActive)=0;
-
   NS_IMETHOD GetPopupNode(nsIDOMNode** aNode)=0;
   NS_IMETHOD SetPopupNode(nsIDOMNode* aNode)=0;
 
   NS_IMETHOD GetControllerForCommand(const char * aCommand, nsIController** aResult)=0;
   NS_IMETHOD GetControllers(nsIControllers** aResult)=0;
-
-  NS_IMETHOD MoveFocus(PRBool aForward, nsIDOMElement* aElt)=0;
-  NS_IMETHOD RewindFocusState()=0;
-
-  NS_IMETHOD ResetElementFocus() = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIFocusController, NS_IFOCUSCONTROLLER_IID)
 
-class NS_STACK_CLASS nsFocusSuppressor {
-public:
-  ~nsFocusSuppressor()
-  {
-    Unsuppress();
-  }
-
-  // Note: We assume that aReason outlives the instance of this class.
-  void Suppress(nsIFocusController *aController, const char *aReason)
-  {
-    Unsuppress();
-
-    mController = aController;
-    mReason = aReason;
-    if (aController) {
-      mController->SetSuppressFocus(PR_TRUE, mReason);
-    }
-  }
-
-  void Unsuppress()
-  {
-    if (mController) {
-      mController->SetSuppressFocus(PR_FALSE, mReason);
-      mController = nsnull;
-      mReason = nsnull;
-    }
-  }
-
-  PRBool Suppressing()
-  {
-    return mController != nsnull;
-  }
-
-private:
-  nsCOMPtr<nsIFocusController> mController;
-  const char *mReason;
-};
-
-class NS_STACK_CLASS nsFocusScrollSuppressor
-{
-public:
-  nsFocusScrollSuppressor(nsIFocusController* aController = nsnull)
-  : mWasSuppressed(PR_FALSE)
-  {
-    Init(aController);
-  }
-
-  ~nsFocusScrollSuppressor()
-  {
-    Init(nsnull);
-  }
-
-  void Init(nsIFocusController* aController)
-  {
-    if (mController) {
-      mController->SetSuppressFocusScroll(mWasSuppressed);
-    }
-
-    mController = aController;
-    if (mController) {
-      mController->GetSuppressFocusScroll(&mWasSuppressed);
-      if (!mWasSuppressed) {
-        mController->SetSuppressFocusScroll(PR_TRUE);
-      }
-    }
-  }
-private:
-  nsCOMPtr<nsIFocusController> mController;
-  PRBool                       mWasSuppressed;
-};
-
 #endif // nsIFocusController_h__
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index eeb162159137..4de4b847b5df 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -68,6 +68,7 @@ enum PopupControlState {
 
 class nsIDocShell;
 class nsIFocusController;
+class nsIContent;
 class nsIDocument;
 class nsIScriptTimeoutHandler;
 class nsPresContext;
@@ -76,8 +77,8 @@ class nsScriptObjectHolder;
 class nsXBLPrototypeHandler;
 
 #define NS_PIDOMWINDOW_IID \
-{ 0x80dd53b6, 0x8c61, 0x4dd6, \
-  { 0xb4, 0x51, 0xf7, 0xd7, 0x5c, 0xfc, 0x51, 0x96 } }
+{ 0x601e5415, 0x613e, 0x4ce2, \
+  { 0xb4, 0xe1, 0x85, 0xac, 0x2a, 0x4a, 0xf2, 0x3d } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -86,10 +87,7 @@ public:
 
   virtual nsPIDOMWindow* GetPrivateRoot() = 0;
 
-  // This is private because activate/deactivate events are not part
-  // of the DOM spec.
-  virtual nsresult Activate() = 0;
-  virtual nsresult Deactivate() = 0;
+  virtual void ActivateOrDeactivate(PRBool aActivate) = 0;
 
   nsPIDOMEventTarget* GetChromeEventHandler() const
   {
@@ -413,6 +411,48 @@ public:
   virtual void CacheXBLPrototypeHandler(nsXBLPrototypeHandler* aKey,
                                         nsScriptObjectHolder& aHandler) = 0;
 
+  /*
+   * Get and set the currently focused element within the document. If
+   * aNeedsFocus is true, then set mNeedsFocus to true to indicate that a
+   * document focus event is needed.
+   *
+   * DO NOT CALL EITHER OF THESE METHODS DIRECTLY. USE THE FOCUS MANAGER
+   * INSTEAD.
+   */
+  virtual nsIContent* GetFocusedNode() = 0;
+  virtual void SetFocusedNode(nsIContent* aNode,
+                              PRUint32 aFocusMethod = 0,
+                              PRBool aNeedsFocus = PR_FALSE) = 0;
+
+  /**
+   * Retrieves the method that was used to focus the current node.
+   */
+  virtual PRUint32 GetFocusMethod() = 0;
+
+  /*
+   * Tells the window that it now has focus or has lost focus, based on the
+   * state of aFocus. If this method returns true, then the document loaded
+   * in the window has never received a focus event and expects to receive
+   * one. If false is returned, the document has received a focus event before
+   * and should only receive one if the window is being focused.
+   *
+   * aFocusMethod may be set to one of the focus method constants in
+   * nsIFocusManager to indicate how focus was set.
+   */
+  virtual PRBool TakeFocus(PRBool aFocus, PRUint32 aFocusMethod) = 0;
+
+  /**
+   * Indicates that the window may now accept a document focus event. This
+   * should be called once a document has been loaded into the window.
+   */
+  virtual void SetReadyForFocus() = 0;
+
+  /**
+   * Indicates that the page in the window has been hidden. This is used to
+   * reset the focus state.
+   */
+  virtual void PageHidden() = 0;
+
 protected:
   // The nsPIDOMWindow constructor. The aOuterWindow argument should
   // be null if and only if the created window itself is an outer
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 7ca6d5c3d6a2..3afc0e60e189 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -66,12 +66,6 @@ nsWindowRoot::nsWindowRoot(nsIDOMWindow* aWindow)
 
   // Create and init our focus controller.
   nsFocusController::Create(getter_AddRefs(mFocusController));
-
-  nsCOMPtr<nsIDOMFocusListener> focusListener(do_QueryInterface(mFocusController));
-  mRefCnt.incr(static_cast<nsIDOMEventTarget*>(this));
-  AddEventListener(NS_LITERAL_STRING("focus"), focusListener, PR_TRUE);
-  AddEventListener(NS_LITERAL_STRING("blur"), focusListener, PR_TRUE);
-  mRefCnt.decr(static_cast<nsIDOMEventTarget*>(this));
 }
 
 nsWindowRoot::~nsWindowRoot()
diff --git a/dom/dom-config.mk b/dom/dom-config.mk
index ca1a43722aa6..9076d038c322 100644
--- a/dom/dom-config.mk
+++ b/dom/dom-config.mk
@@ -60,8 +60,11 @@ DOM_SRCDIRS = \
   content/xul/document/src \
   content/events/src \
   content/base/src \
+  content/html/content/src \
   content/html/document/src \
+  layout/generic \
   layout/style \
+  layout/xul/base/src \
   layout/xul/base/src/tree/src \
   $(NULL)
 
diff --git a/dom/interfaces/base/Makefile.in b/dom/interfaces/base/Makefile.in
index 76309776cd10..c79f31727c4f 100644
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@@ -77,6 +77,7 @@ XPIDLSRCS =					\
 	nsIDOMNSFeatureFactory.idl		\
         nsIDOMClientRect.idl			\
         nsIDOMClientRectList.idl		\
+	nsIFocusManager.idl			\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
index 52d5dda19793..2d16abbb5a2c 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -226,6 +226,10 @@ interface nsIDOMWindowUtils : nsISupports {
    * privileges.
    *
    * @param aElement the element to focus
+   *
+   * Do not use this method. Just use element.focus if available or
+   * nsIFocusManager::SetFocus instead.
+   *
    */
   void focus(in nsIDOMElement aElement);
 
diff --git a/dom/interfaces/base/nsIFocusManager.idl b/dom/interfaces/base/nsIFocusManager.idl
new file mode 100644
index 000000000000..3840e0d4b5d4
--- /dev/null
+++ b/dom/interfaces/base/nsIFocusManager.idl
@@ -0,0 +1,253 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "domstubs.idl"
+
+interface nsIDocument;
+interface nsIContent;
+
+[scriptable, uuid(CD6040A8-243F-412A-8A16-0BF2AA1083B9)]
+/**
+ * The focus manager deals with all focus related behaviour. Only one element
+ * in the entire application may have the focus at a time; this element
+ * receives any keyboard events. While there is only one application-wide
+ * focused element, each nsIDOMWindow maintains a reference to the element
+ * that would be focused if the window was active.
+ *
+ * If the window's reference is to a frame element (iframe, browser,
+ * editor), then the child window contains the element that is currently
+ * focused. If the window's reference is to a root element, then the root is
+ * focused. If a window's reference is null, then no element is focused, yet
+ * the window is still focused.
+ *
+ * The blur event is fired on an element when it loses the application focus.
+ * After this blur event, if the focus is moving away from a document, two
+ * additional blur events are fired on the old document and window containing
+ * the focus respectively.
+ *
+ * When a new document is focused, two focus events are fired on the new
+ * document and window respectively. Then the focus event is fired on an
+ * element when it gains the application focus.
+ *
+ * A special case is that the root element may be focused, yet does not
+ * receive the element focus and blur events. Instead a focus outline may be
+ * drawn around the document.
+ *
+ * Blur and focus events do not bubble as per the W3C DOM Events spec.
+ */
+interface nsIFocusManager : nsISupports
+{
+  /**
+   * The most active (frontmost) window, or null if no window that is part of
+   * the application is active. Setting the activeWindow raises it, and
+   * focuses the current child window's current element, if any. Setting this
+   * to null or to a non-top-level window throws an NS_ERROR_INVALID_ARG
+   * exception.
+   */
+  attribute nsIDOMWindow activeWindow;
+
+  /**
+   * The child window within the activeWindow that is focused. This will
+   * always be activeWindow, a child window of activeWindow or null if no
+   * child window is focused. Setting the focusedWindow changes the focused
+   * window and raises the toplevel window it is in. If the current focus
+   * within the new focusedWindow is a frame element, then the focusedWindow
+   * will actually be set to the child window and the current element within
+   * that set as the focused element. This process repeats downwards until a
+   * non-frame element is found.
+   */
+  attribute nsIDOMWindow focusedWindow;
+
+  /**
+   * The element that is currently focused. This will always be an element
+   * within the document loaded in focusedWindow or null if no element in that
+   * document is focused.
+   */
+  readonly attribute nsIDOMElement focusedElement;
+
+  /**
+   * Returns the method that was used to focus the element in window. This
+   * will either be 0, FLAG_BYMOUSE or FLAG_BYKEY. If window is null, then
+   * the current focusedWindow will be used by default. This has the result
+   * of retrieving the method that was used to focus the currently focused
+   * element.
+   */
+  PRUint32 getLastFocusMethod(in nsIDOMWindow window);
+
+  /**
+   * Changes the focused element reference within the window containing
+   * aElement to aElement.
+   */
+  void setFocus(in nsIDOMElement aElement, in unsigned long aFlags);
+
+  /**
+   * Move the focus to another element. If aStartElement is specified, then
+   * movement is done relative to aStartElement. If aStartElement is null,
+   * then movement is done relative to the currently focused element. If no
+   * element is focused, focus the first focusable element within the
+   * document (or the last focusable element if aType is MOVEFOCUS_END). This
+   * method is equivalent to setting the focusedElement to the new element.
+   *
+   * Specifying aStartElement and using MOVEFOCUS_LAST is not currently
+   * implemented.
+   *
+   * If no element is found, and aType is either MOVEFOCUS_ROOT or
+   * MOVEFOCUS_CARET, then the focus is cleared. If aType is any other value,
+   * the focus is not changed.
+   *
+   * Returns the element that was focused.
+   */
+  nsIDOMElement moveFocus(in nsIDOMWindow aWindow, in nsIDOMElement aStartElement,
+                          in unsigned long aType, in unsigned long aFlags);
+
+  /**
+   * Clears the focused element within aWindow. If the current focusedWindow
+   * is a descendant of aWindow, sets the current focusedWindow to aWindow.
+   *
+   * @throws NS_ERROR_INVALID_ARG if aWindow is null
+   */
+  void clearFocus(in nsIDOMWindow aWindow);
+
+  /**
+   * Returns the currently focused element within aWindow. If aWindow is equal
+   * to the current value of focusedWindow, then the returned element will be
+   * the application-wide focused element (the value of focusedElement). The
+   * return value will be null if no element is focused.
+   *
+   * If aDeep is true, then child frames are traversed and the return value
+   * may be the element within a child descendant window that is focused. If
+   * aDeep if false, then the return value will be the frame element if the
+   * focus is in a child frame.
+   *
+   * aFocusedWindow will be set to the currently focused descendant window of
+   * aWindow, or to aWindow if aDeep is false. This will be set even if no
+   * element is focused.
+   *
+   * @throws NS_ERROR_INVALID_ARG if aWindow is null
+   */
+  nsIDOMElement getFocusedElementForWindow(in nsIDOMWindow aWindow, in PRBool aDeep,
+                                           out nsIDOMWindow aFocusedWindow);
+
+  /**
+   * Moves the selection caret within aWindow to the current focus.
+   */
+  void moveCaretToFocus(in nsIDOMWindow aWindow);
+
+  /*
+   * Raise the window when switching focus
+   */
+  const unsigned long FLAG_RAISE = 1;
+
+  /**
+   * Do not scroll the element to focus into view
+   */
+  const unsigned long FLAG_NOSCROLL = 2;
+
+  /**
+   * If attempting to change focus in a window that is not focused, do not
+   * switch focus to that window. Instead, just update the focus within that
+   * window and leave the application focus as is. This flag will have no
+   * effect if a child window is focused and an attempt is made to adjust the
+   * focus in an ancestor, as the frame must be switched in this case.
+   */
+  const unsigned long FLAG_NOSWITCHFRAME = 4;
+
+  /**
+   * Focus is changing due to a mouse operation, for instance the mouse was
+   * clicked on an element.
+   */
+  const unsigned long FLAG_BYMOUSE = 0x1000;
+
+  /**
+   * Focus is changing due to a key operation, for instance pressing the tab
+   * key. This flag would normally be passed when MOVEFOCUS_FORWARD or
+   * MOVEFOCUS_BACKWARD is used.
+   */
+  const unsigned long FLAG_BYKEY = 0x2000;
+
+  // these constants are used with the aType argument to MoveFocus
+
+  /** move focus forward one element, used when pressing TAB */
+  const unsigned long MOVEFOCUS_FORWARD = 1;
+  /** move focus backward one element, used when pressing Shift+TAB */
+  const unsigned long MOVEFOCUS_BACKWARD = 2;
+  /** move focus forward to the next frame document, used when pressing F6 */
+  const unsigned long MOVEFOCUS_FORWARDDOC = 3;
+  /** move focus forward to the previous frame document, used when pressing Shift+F6 */
+  const unsigned long MOVEFOCUS_BACKWARDDOC = 4;
+  /** move focus to the first focusable element */
+  const unsigned long MOVEFOCUS_FIRST = 5;
+  /** move focus to the last focusable element */
+  const unsigned long MOVEFOCUS_LAST = 6;
+  /** move focus to the root element in the document */
+  const unsigned long MOVEFOCUS_ROOT = 7;
+  /** move focus to a link at the position of the caret. This is a special value used to
+   *  focus links as the caret moves over them in caret browsing mode.
+   */
+  const unsigned long MOVEFOCUS_CARET = 8;
+
+  /**
+   * Called when a window has been raised.
+   */
+  [noscript] void windowRaised(in nsIDOMWindow aWindow);
+
+  /**
+   * Called when a window has been lowered.
+   */
+  [noscript] void windowLowered(in nsIDOMWindow aWindow);
+
+  /**
+   * Called when content has been removed.
+   */
+  [noscript] void contentRemoved(in nsIDocument aDocument,
+                                 in nsIContent aElement);
+
+  /**
+   * Called when a new document in a window is shown.
+   */
+  [noscript] void windowShown(in nsIDOMWindow aWindow);
+
+  /**
+   * Called when a document in a window has been hidden or otherwise can no
+   * longer accept focus.
+   */
+  [noscript] void windowHidden(in nsIDOMWindow aWindow);
+
+  /**
+   * Fire any events that have been delayed due to synchronized actions.
+   */
+  [noscript] void fireDelayedEvents(in nsIDocument aDocument);
+};
diff --git a/dom/locales/en-US/chrome/plugins.properties b/dom/locales/en-US/chrome/plugins.properties
index f3d4c7db7bd9..61d068fca6dd 100644
--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -7,7 +7,7 @@ installedplugins_label=Installed plugins
 nopluginsareinstalled_label=No plugins are installed
 findmore_label=Find more information about browser plugins at
 installhelp_label=Help for installing plugins is available from
-filename_label=File name:
+file_label=File:
 version_label=Version:
 mimetype_label=MIME Type
 description_label=Description
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index 2c66c1dfec4a..1d28404e7e96 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -85,11 +85,6 @@ ifdef WINCE_WINDOWS_MOBILE
 CPPSRCS         += WinMobileLocationProvider.cpp
 endif
 
-ifdef ENABLE_TESTS
-DIRS += test
-endif
-
-
 EXTRA_COMPONENTS = \
                  NetworkGeolocationProvider.js \
                  $(NULL)
diff --git a/dom/src/geolocation/test/Makefile.in b/dom/src/geolocation/test/Makefile.in
deleted file mode 100644
index 9f26942de36c..000000000000
--- a/dom/src/geolocation/test/Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org build system.
-#
-# The Initial Developer of the Original Code is Mozilla Corporation
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Doug Turner <dougt@meer.net>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE         = dom_geolocation_test
-
-ifdef ENABLE_TESTS
-EXTRA_COMPONENTS = TestGeolocationProvider.js
-endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/geolocation/test/TestGeolocationProvider.js b/dom/src/geolocation/test/TestGeolocationProvider.js
deleted file mode 100644
index 9167eaaa074b..000000000000
--- a/dom/src/geolocation/test/TestGeolocationProvider.js
+++ /dev/null
@@ -1,137 +0,0 @@
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-
-function GeoPositionCoordsObject() {
-};
-
-GeoPositionCoordsObject.prototype = {
-
-    QueryInterface:   XPCOMUtils.generateQI([Ci.nsIDOMGeoPositionCoords, Ci.nsIClassInfo]),
-
-    // Class Info is required to be able to pass objects back into the DOM.
-    getInterfaces: function(countRef) {
-        var interfaces = [Ci.nsIDOMGeoPositionCoords, Ci.nsIClassInfo, Ci.nsISupports];
-        countRef.value = interfaces.length;
-        return interfaces;
-    },
-
-    getHelperForLanguage: function(language) null,
-    contractID: "",
-    classDescription: "testing geolocation coords object",
-    classID: null,
-    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-    flags: Ci.nsIClassInfo.DOM_OBJECT,
-
-    latitude: 37.41857,
-    longitude: -122.08769,
-    
-    // some numbers that we can test against
-    altitude: 42,
-    accuracy: 42,
-    altitudeAccuracy: 42,
-    heading: 42,
-    speed: 42,
-};
-
-function GeoPositionObject() {
-};
-
-GeoPositionObject.prototype = {
-
-    QueryInterface:   XPCOMUtils.generateQI([Ci.nsIDOMGeoPosition, Ci.nsIClassInfo]),
-
-    // Class Info is required to be able to pass objects back into the DOM.
-    getInterfaces: function(countRef) {
-        var interfaces = [Ci.nsIDOMGeoPosition, Ci.nsIClassInfo, Ci.nsISupports];
-        countRef.value = interfaces.length;
-        return interfaces;
-    },
-
-    getHelperForLanguage: function(language) null,
-    contractID: "",
-    classDescription: "test geolocation object",
-    classID: null,
-    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-    flags: Ci.nsIClassInfo.DOM_OBJECT,
-
-    coords: new GeoPositionCoordsObject(),
-    timestamp: Date.now(),
-
-};
-
-function MyLocation() {};
-MyLocation.prototype = {
-    classDescription: "A component that returns a geolocation",
-    classID:          Components.ID("{10F622A4-6D7F-43A1-A938-5FFCBE2B1D1D}"),
-    contractID:       "@mozilla.org/geolocation/provider;1",
-    QueryInterface:   XPCOMUtils.generateQI([Ci.nsIGeolocationProvider]),
-  
-    geolocation:     null,
-    timer:           null,
-    timerInterval:   500,
-
-    startup:         function() { 
-
-        var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-        observerService.addObserver(this, "geolocation-test-control", false);
-    
-    },
-    
-    isReady:         function() {return true},
-  
-    watch:           function(c) {
-
-                        var watchCallback = 
-                        {
-                            notify: function(timer) { this.parent.currentLocation.timestamp = Date.now();
-                                                      c.update(this.parent.currentLocation); }
-                        };
-
-                        watchCallback.parent = this;
-
-                        if(!this.timer) 
-                           this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-
-                        this.timer.initWithCallback(watchCallback,
-                                                    this.timerInterval, 
-                                                    Ci.nsITimer.TYPE_REPEATING_SLACK);
-    },
-
-    currentLocation: new GeoPositionObject(),
-    shutdown:        function() { 
-                       if(this.timer)
-                           this.timer.cancel();
-
-                       var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-                       observerService.removeObserver(this, "geolocation-test-control");
-
-    },
-
-    observe: function (subject, topic, data) {
-
-        if (topic == "geolocation-test-control") {
-            if (data == "stop-responding")
-            {
-                if(this.timer) 
-                    this.timer.cancel();
-            }
-            else if (data == "start-responding")
-            {
-
-                if(!this.timer) 
-                    this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-
-                this.timer.initWithCallback(watchCallback,
-                                            this.timerInterval, 
-                                            Ci.nsITimer.TYPE_REPEATING_SLACK);
-            }
-        }
-    },
-};
-
-var components = [MyLocation];
-function NSGetModule(compMgr, fileSpec) {
-  return XPCOMUtils.generateModule(components);
-}
diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in
index 5e7acc239e17..9e8ed4c4be28 100644
--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -47,6 +47,11 @@ include $(topsrcdir)/config/rules.mk
 _TEST_FILES = test_domstorage.xul \
 		domstorage_global.xul \
 		domstorage_global.js \
+		test_focus.xul \
+		window_focus.xul \
+		focus_window2.xul \
+		focus_frameset.html \
+		child_focus_frame.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/dom/tests/mochitest/chrome/child_focus_frame.html b/dom/tests/mochitest/chrome/child_focus_frame.html
new file mode 100644
index 000000000000..9e345c1982a7
--- /dev/null
+++ b/dom/tests/mochitest/chrome/child_focus_frame.html
@@ -0,0 +1,56 @@
+<html id="t13">
+<body id="inner-document">
+
+<input id="t19" value="Input" accesskey="b">
+<input id="t14" tabindex="2" type="password" value="test">
+<button id="t20">Button</button>
+<div style="float: left; margin-top: 30px;">
+  <button id="t21">Button 2</button>
+</div>
+<div id="abs" style="position: absolute; top: 40px; left: 250px;">
+  <button id="t22" accesskey="c">Button 3</button>
+  <p><span>
+  <select id="t15" tabindex="2" accesskey="e">
+    <option>One
+  </select>
+  </span></p>
+</div>
+<div id="t16" tabindex="2" style="overflow: scroll; max-height: 20px;">
+  This is a scrollable area with some sufficiently long text contained within it.
+</div>
+<img id="n13" src="happy.png"/>
+<img id="t23" tabindex="0" src="happy.png"/>
+<a id="t17" tabindex="2" accesskey="f">1</a>
+<a id="t24" tabindex="0" href="#">2</a>
+<a id="t25" href="#">Link 3</a>
+<br>
+<input id="t26" tabindex="0" type="checkbox" accesskey="a">
+<input id="o11" tabindex="-1" type="checkbox">
+<div style="display: none;"><input/></div>
+<div id="t27" style="overflow: scroll; max-height: 20px;">
+  This is a scrollable area with some sufficiently long text contained within it.
+  This is a scrollable area with some sufficiently long text contained within it.
+  <button id="inscroll" tabindex="-1">Button 4</button>
+</div>
+<map name="map1">
+ <area id="t31" href="#" shape="rect" coords="0,0,5,5">
+ <area id="t32" href="#" shape="rect" coords="10,10,15,15">
+ <area id="t18" href="#" shape="circle" coords="0,8,4" tabindex="2">Button 5</area>
+ <area id="t33" href="#" shape="poly" coords="10,1,16,3,14,10,7,10,10,1">
+</map>
+<input type="hidden"/>
+<fieldset style="float: right;">
+<legend id="legend">Options</legend>
+  <input id="t28" type="radio" name="options" value="optionone">One
+  <label id="ad" accesskey="d">Label:<input id="t29" type="radio" name="options" value="optiontwo">Two</label>
+</fieldset>
+<div id="t30" tabindex="0">abc</div>
+<input id="o18" accesskey="u" disabled size="3"/>
+<label id="ag" accesskey="g" for="n14">L</label>
+<input id="n14" tabindex="-1" type="button"/>
+<span id="n15" accesskey="t">s</span>
+<img id="image" src="data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%18%00%00%00%18%02%03%00%00%00%9D%19%D5k%00%00%00%04gAMA%00%00%B1%8F%0B%FCa%05%00%00%00%0CPLTE%FF%FF%FF%FF%FF%FF%F7%DC%13%00%00%00%03%80%01X%00%00%00%01tRNS%08N%3DPT%00%00%00%01bKGD%00%88%05%1DH%00%00%00%09pHYs%00%00%0B%11%00%00%0B%11%01%7Fd_%91%00%00%00%07tIME%07%D2%05%0C%14%0C%0D%D8%3F%1FQ%00%00%00%5CIDATx%9C%7D%8E%CB%09%C0%20%10D%07r%B7%20%2F%E9wV0%15h%EA%D9%12D4%BB%C1x%CC%5C%1E%0C%CC%07%C0%9C0%9Dd7()%C0A%D3%8D%E0%B8%10%1DiCHM%D0%AC%D2d%C3M%F1%B4%E7%FF%10%0BY%AC%25%93%CD%CBF%B5%B2%C0%3Alh%CD%AE%13%DF%A5%F7%E0%03byW%09A%B4%F3%E2%00%00%00%00IEND%AEB%60%82"
+     usemap="#map1" ismap>
+
+</body>
+</html>
diff --git a/dom/tests/mochitest/chrome/focus_frameset.html b/dom/tests/mochitest/chrome/focus_frameset.html
new file mode 100644
index 000000000000..e59523069e60
--- /dev/null
+++ b/dom/tests/mochitest/chrome/focus_frameset.html
@@ -0,0 +1,16 @@
+<html id="outer">
+
+<frameset rows="30%, 70%" onfocus="opener.framesetWindowLoaded(window)">
+  <frame src="data:text/html,&lt;html id='f1' &gt;&lt;body id='framebody1'&gt;&lt;input id='f2'&gt;&lt;body&gt;&lt;/html&gt;">
+  <frameset cols="30%, 33%, 34%">
+    <frame src="data:text/html,&lt;html id='f3'&gt;&lt;body id='framebody2'&gt;&lt;input id='f4'&gt;&lt;body&gt;&lt;/html&gt;">
+    <frame src="data:text/html,&lt;html id='f5'&gt;&lt;body id='framebody3'&gt;&lt;input id='f6' tabindex='2'&gt;&lt;body&gt;&lt;/html&gt;">
+    <frame src="data:text/html,&lt;html id='f7'&gt;&lt;body id='framebody4'&gt;&lt;input id='f8'&gt;&lt;body&gt;&lt;/html&gt;">
+  </frameset>
+  <noframes>
+    <input id="unusued1"/>
+    <input id="unusued2" tabindex="1"/>
+  </noframes>
+</frameset>
+
+</html>
diff --git a/dom/tests/mochitest/chrome/focus_window2.xul b/dom/tests/mochitest/chrome/focus_window2.xul
new file mode 100644
index 000000000000..d027b08080a6
--- /dev/null
+++ b/dom/tests/mochitest/chrome/focus_window2.xul
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window id="other-document"
+        title="Focus Tests" onfocus="focused()"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script>
+<![CDATA[
+
+var gFocused = false;
+
+function focused()
+{
+  if (window.arguments && !gFocused)
+    setTimeout(function () window.arguments[0](window, window.arguments[1]), 0);
+  gFocused = true;
+}
+
+]]>
+</script>
+
+<button id="other" label="OK"/>
+<button id="other2" label="Cancel"/>
+
+</window>
diff --git a/dom/tests/mochitest/chrome/test_focus.xul b/dom/tests/mochitest/chrome/test_focus.xul
new file mode 100644
index 000000000000..eb039300c506
--- /dev/null
+++ b/dom/tests/mochitest/chrome/test_focus.xul
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+
+<window title="Focus Tests"
+  onload="setTimeout(runTest, 0);"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+<script>
+SimpleTest.waitForExplicitFinish();
+function runTest()
+{
+  window.open("window_focus.xul", "_blank", "chrome,width=600,height=550");
+}
+</script>
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+<p id="display">
+</p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+</pre>
+</body>
+
+</window>
diff --git a/dom/tests/mochitest/chrome/window_focus.xul b/dom/tests/mochitest/chrome/window_focus.xul
new file mode 100644
index 000000000000..e6502e341b2a
--- /dev/null
+++ b/dom/tests/mochitest/chrome/window_focus.xul
@@ -0,0 +1,1463 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+<!--
+ This test checks focus in various ways
+-->
+<window id="outer-document" title="Focus Test" width="600" height="550"
+        onfocus="setTimeout(startTest, 0)"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript"
+          src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+
+<body xmlns="http://www.w3.org/1999/xhtml"/>
+
+  <script type="application/javascript"><![CDATA[
+
+var fm = Components.classes["@mozilla.org/focus-manager;1"].
+           getService(Components.interfaces.nsIFocusManager);
+
+const kChildDocumentRootIndex = 13;
+const kBeforeTabboxIndex = 34;
+const kTabbableSteps = 38;
+const kFocusSteps = 18;
+const kNoFocusSteps = 15;
+const kOverflowElementIndex = 27;
+
+var gTestStarted = false;
+var gPartialTabbing = false;
+var gMoveToFocusFrame = false;
+var gLastFocus = null;
+var gLastFocusWindow = window;
+var gLastFocusMethod = -1;
+var gEvents = "";
+var gExpectedEvents = "";
+var gEventMatched = true;
+var gShowOutput = false;
+var gChildWindow = null;
+var gRefocusCallback = null;
+
+var gOldExpectedWindow = null;
+var gNewExpectedWindow = null;
+
+function is(l, r, n) { window.opener.wrappedJSObject.SimpleTest.is(l,r,n); }
+function ok(v, n) { window.opener.wrappedJSObject.SimpleTest.ok(v,n); }
+
+function initEvents(target)
+{
+  target.addEventListener("focus", eventOccured, true);
+  target.addEventListener("blur", eventOccured, true);
+}
+
+function eventOccured(event)
+{
+  // iframes should never receive focus or blur events directly
+  if (event.target instanceof Element && event.target.localName == "iframe")
+    ok(false, "iframe " + event.type + "occured");
+
+  var id;
+  if (gOldExpectedWindow && event.type == "blur") {
+    if (event.target instanceof Window)
+      id = "frame-" + gOldExpectedWindow.document.documentElement.id + "-window";
+    else if (event.target instanceof Document)
+      id = "frame-" + gOldExpectedWindow.document.documentElement.id + "-document";
+    else
+      id = event.originalTarget.id;
+  }
+  else if (gNewExpectedWindow && event.type == "focus") {
+    if (event.target instanceof Window)
+      id = "frame-" + gNewExpectedWindow.document.documentElement.id + "-window";
+    else if (event.target instanceof Document)
+      id = "frame-" + gNewExpectedWindow.document.documentElement.id + "-document";
+    else
+      id = event.originalTarget.id;
+  }
+  else if (event.target instanceof Window)
+    id = (event.target == window) ? "outer-window" : "child-window";
+  else if (event.target instanceof Document)
+    id = (event.target == document) ? "outer-document" : "child-document";
+  else
+    id = event.originalTarget.id;
+
+  if (gEvents)
+    gEvents += " ";
+  gEvents += event.type + ": " + id;
+}
+
+function expectFocusShift(callback, expectedWindow, expectedId, focusChanged, testid)
+{
+  var expectedElement;
+  if (expectedId)
+    expectedElement = getById(expectedId);
+
+  if (expectedWindow == null)
+    expectedWindow = expectedElement ?
+                     expectedElement.ownerDocument.defaultView :
+                     gLastFocusWindow;
+
+  var expectedEvents = "";
+  if (focusChanged) {
+    if (gLastFocus && gLastFocus.id != "t" + kChildDocumentRootIndex &&
+        (!gOldExpectedWindow || gOldExpectedWindow.document.documentElement != gLastFocus)) {
+      if (!gOldExpectedWindow)
+        expectedEvents += "commandupdate: cu ";
+      expectedEvents += "blur: " + gLastFocus.id;
+    }
+
+    var id;
+    if (gLastFocusWindow && gLastFocusWindow != expectedWindow) {
+      if (!gMoveToFocusFrame) {
+        if (gOldExpectedWindow)
+          id = "frame-" + gOldExpectedWindow.document.documentElement.id;
+        else
+          id = (gLastFocusWindow == window) ? "outer" : "child";
+        if (expectedEvents)
+          expectedEvents += " ";
+        expectedEvents += "blur: " + id + "-document " +
+                          "blur: " + id + "-window";
+      }
+    }
+
+    if (expectedWindow && gLastFocusWindow != expectedWindow) {
+      if (gNewExpectedWindow)
+        id = "frame-" + gNewExpectedWindow.document.documentElement.id;
+      else
+        id = (expectedWindow == window) ? "outer" : "child";
+      if (expectedEvents)
+        expectedEvents += " ";
+      expectedEvents += "focus: " + id + "-document " +
+                        "focus: " + id + "-window";
+    }
+
+    // for this test which fires a mouse event on a label, the document will
+    // be focused first and then the label code will focus the related
+    // control. This doesn't result in different focus events, but a command
+    // update will occur for the document and then a secon command update will
+    // occur when the control is focused.
+    if (testid == "mouse on html label with content inside")
+      expectedEvents += " commandupdate: cu";
+
+    if (expectedElement && expectedId != "t" + kChildDocumentRootIndex &&
+        (!gNewExpectedWindow || gNewExpectedWindow.document.documentElement != expectedElement)) {
+      if (expectedEvents)
+        expectedEvents += " ";
+      if (!gNewExpectedWindow)
+        expectedEvents += "commandupdate: cu ";
+      expectedEvents += "focus: " + expectedElement.id;
+    }
+    else if (expectedWindow && gLastFocusWindow != expectedWindow &&
+             !expectedElement) {
+      if (expectedEvents)
+        expectedEvents += " ";
+      expectedEvents += "commandupdate: cu";
+    }
+  }
+
+  gLastFocus = expectedElement;
+  gLastFocusWindow = expectedWindow;
+
+  callback();
+
+  compareEvents(expectedEvents, expectedWindow, expectedElement, testid);
+}
+
+function compareEvents(expectedEvents, expectedWindow, expectedElement, testid)
+{
+  if (!gShowOutput) {
+    gEvents = "";
+    return;
+  }
+
+  is(gEvents, expectedEvents, testid + " events");
+  gEvents = "";
+
+  var doc;
+  if (expectedWindow == window)
+    doc = "outer-document";
+  else if (expectedWindow == gChildWindow)
+    doc = "inner-document";
+  else if (gNewExpectedWindow)
+    doc = gNewExpectedWindow.document.body ? gNewExpectedWindow.document.body.id :
+                                             gNewExpectedWindow.document.documentElement.id;
+  else
+    doc = "other-document";
+
+  var focusedElement = fm.focusedElement;
+  is(focusedElement ? focusedElement.id : "none",
+     expectedElement ? expectedElement.id : "none", testid + " focusedElement");
+  is(fm.focusedWindow, expectedWindow, testid + " focusedWindow");
+  var focusedWindow = {};
+  is(fm.getFocusedElementForWindow(expectedWindow, false, focusedWindow),
+     expectedElement, testid + " getFocusedElementForWindow");
+  is(focusedWindow.value, expectedWindow, testid + " getFocusedElementForWindow frame");
+  is(expectedWindow.document.hasFocus(), true, testid + " hasFocus");
+  is(expectedWindow.document.activeElement ? expectedWindow.document.activeElement.id : "none",
+     expectedElement ? expectedElement.id : doc, testid + " activeElement");
+  var cdwindow = getTopWindow(expectedWindow);
+  if (cdwindow.document.commandDispatcher) {
+    is(cdwindow.document.commandDispatcher.focusedWindow, expectedWindow, testid + " commandDispatcher focusedWindow");
+    is(cdwindow.document.commandDispatcher.focusedElement, focusedElement, testid + " commandDispatcher focusedElement");
+  }
+
+  if (gLastFocusMethod != -1) {
+    is(fm.getLastFocusMethod(null), gLastFocusMethod, testid + " lastFocusMethod null");
+    is(fm.getLastFocusMethod(expectedWindow), gLastFocusMethod, testid + " lastFocusMethod window");
+  }
+
+  // the parent should have the iframe focused
+  if (doc == "inner-document") {
+    is(document.hasFocus(), true, testid + " hasFocus");
+    is(fm.getFocusedElementForWindow(window, false, focusedWindow),
+       $("childframe"), testid + " getFocusedElementForWindow for parent");
+    is(focusedWindow.value, window, testid + " getFocusedElementForWindow for parent frame");
+    is(fm.getFocusedElementForWindow(window, true, focusedWindow),
+       expectedElement, testid + " getFocusedElementForWindow deep for parent");
+    is(focusedWindow.value, gChildWindow, testid + " getFocusedElementForWindow deep for parent frame");
+    is(document.activeElement.id, "childframe", testid + " activeElement for parent");
+  }
+
+  // compare the selection for the child window. Skip mouse tests as the caret
+  // is adjusted by the selection code for mouse clicks, and not the focus code.
+  if (expectedWindow == window) {
+    var selection = window.getSelection();
+    ok(selection.focusNode == null && selection.focusOffset == 0 &&
+       selection.anchorNode == null && selection.anchorOffset == 0, testid + " selection");
+  }
+  else if ((expectedWindow == gChildWindow) && !testid.indexOf("mouse") == -1) {
+    checkSelection(expectedElement, testid);
+  }
+}
+
+function checkSelection(node, testid)
+{
+  var selection = gChildWindow.getSelection();
+
+  var range = gChildWindow.document.createRange();
+  range.selectNodeContents(node);
+  if (!node.firstChild || node.localName == "input" ||
+       node.localName == "select" || node.localName == "button") {
+    range.setStartBefore(node);
+    range.setEndBefore(node);
+  }
+
+  if (node.firstChild)
+    range.setEnd(range.startContainer, range.startOffset);
+
+  is(selection.focusNode, range.startContainer, testid + " selection focusNode");
+  is(selection.focusOffset, range.startOffset, testid + " selection focusOffset");
+  is(selection.anchorNode, range.endContainer, testid + " selection anchorNode");
+  is(selection.anchorOffset, range.endOffset, testid + " selection anchorOffset");
+}
+
+function getTopWindow(win)
+{
+  return win.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+             getInterface(Components.interfaces.nsIWebNavigation).
+             QueryInterface(Components.interfaces.nsIDocShellTreeItem).rootTreeItem.
+             QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+             getInterface(Components.interfaces.nsIDOMWindow);
+}
+
+function done()
+{
+  var opener = window.opener;
+  window.close();
+  opener.wrappedJSObject.SimpleTest.finish();
+}
+
+var pressTab = function () synthesizeKey("VK_TAB", { });
+
+function setFocusTo(id, fwindow)
+{
+  gLastFocus = getById(id);
+  gLastFocusWindow = fwindow;
+  gLastFocus.focus();
+  gEvents = "";
+}
+
+function getById(id)
+{
+  if (gNewExpectedWindow)
+    return gNewExpectedWindow.document.getElementById(id);
+  var element = $(id);
+  if (!element)
+    element = $("childframe").contentDocument.getElementById(id);
+  return element;
+}
+
+function startTest()
+{
+  if (gRefocusCallback) {
+    gRefocusCallback();
+    return;
+  }
+
+  if (gTestStarted)
+    return;
+  gTestStarted = true;
+
+  gChildWindow = $("childframe").contentWindow;
+  gShowOutput = true;
+
+  // synthesize a mousemove over the image to ensure that the imagemap data is
+  // created. Otherwise, the special imagemap frames might not exist, and
+  // won't be focusable.
+  synthesizeMouse(getById("image"), 4, 4, { type: "mousemove" }, gChildWindow);
+
+  initEvents(window);
+
+  is(fm.activeWindow, window, "activeWindow");
+  is(gChildWindow.document.hasFocus(), false, " child document hasFocus");
+
+  // test to see if the Mac Full Keyboard Access setting is set. If t3 is
+  // focused after tab is pressed, then it is set to textboxes and lists only.
+  // Otherwise, all elements are in the tab order.
+  pressTab();
+
+  if (fm.focusedElement.id == "t3")
+    gPartialTabbing = true;
+  else
+    is(fm.focusedElement.id, "t1", "initial tab key");
+
+  is(fm.getLastFocusMethod(null), fm.FLAG_BYKEY, "last focus method null start");
+  is(fm.getLastFocusMethod(window), fm.FLAG_BYKEY, "last focus method window start");
+
+  fm.clearFocus(window);
+  gEvents = "";
+
+  gLastFocusMethod = fm.FLAG_BYKEY;
+  if (gPartialTabbing) {
+    var partialTabList = ["t3", "t5", "t9", "t10", "t11", "t12", "t13", "t14",
+                          "t16", "t19", "t27", "t30"];
+    for (var idx = 0; idx < partialTabList.length; idx++) {
+      expectFocusShift(pressTab, null, partialTabList[idx], true, "partial tab key " + partialTabList[idx]);
+    }
+    setFocusTo("last", window);
+    expectFocusShift(pressTab, null, partialTabList[0], true, "partial tab key wrap to start");
+    expectFocusShift(function () synthesizeKey("VK_TAB", { shiftKey: true }),
+                     null, "last", true, "partial shift tab key wrap to end");
+    for (var idx = partialTabList.length - 1; idx >= 0; idx--) {
+      expectFocusShift(function () synthesizeKey("VK_TAB", { shiftKey: true }),
+                       null, partialTabList[idx], true, "partial tab key " + partialTabList[idx]);
+    }
+  }
+  else {
+    // TAB key
+    for (var idx = 1; idx <= kTabbableSteps; idx++) {
+      // skip the tab element, as tab elements are not focusable on Mac
+      if ((navigator.platform.indexOf("Mac") == 0) && (idx == kBeforeTabboxIndex + 1))
+        continue;
+
+      expectFocusShift(pressTab, null, "t" + idx, true, "tab key t" + idx);
+    }
+
+    // wrapping around at end with TAB key
+    setFocusTo("last", window);
+    expectFocusShift(pressTab, null, "t1", true, "tab key wrap to start");
+    expectFocusShift(function () synthesizeKey("VK_TAB", { shiftKey: true }),
+                     null, "last", true, "shift tab key wrap to end");
+
+    // Shift+TAB key
+    setFocusTo("o5", window);
+    for (idx = kTabbableSteps; idx > 0; idx--) {
+      // skip the tab element, as tab elements are not focusable on Mac
+      if (navigator.platform.indexOf("Mac") == 0 && (idx == kBeforeTabboxIndex + 1)) {
+        continue; }
+
+      expectFocusShift(function () synthesizeKey("VK_TAB", { shiftKey: true }),
+                       null, "t" + idx, true, "shift tab key t" + idx);
+    }
+  }
+
+  var t19 = getById("t19");
+  is(t19.selectionStart, 0, "input focused from tab key selectionStart");
+  is(t19.selectionEnd, 5, "input focused from tab key selectionEnd");
+  t19.setSelectionRange(0, 0);
+
+  // mouse clicking
+  gLastFocusMethod = fm.FLAG_BYMOUSE;
+  for (idx = kTabbableSteps; idx >= 1; idx--) {
+    // skip the document root and the overflow element
+    if (idx == kChildDocumentRootIndex || idx == kOverflowElementIndex)
+      continue;
+    if ((navigator.platform.indexOf("Mac") == 0) && (idx == kBeforeTabboxIndex + 1))
+      continue;
+
+    var element = getById("t" + idx);
+    // skip area elements, as getBoundingClientRect doesn't return their actual coordinates
+    if (element.localName == "area")
+      continue;
+
+    expectFocusShift(function () synthesizeMouse(element, 4, 4, { }, element.ownerDocument.defaultView),
+                     null, "t" + idx, true, "mouse on element t" + idx);
+  }
+
+  is(t19.selectionStart, 0, "input focused from mouse selectionStart");
+  is(t19.selectionEnd, 0, "input focused from mouse selectionEnd");
+
+  // mouse clicking on elements that are not tabbable 
+  for (idx = 1; idx <= kFocusSteps; idx++) {
+    var element = getById("o" + (idx % 2 ? idx : idx - 1));
+    expectFocusShift(function () synthesizeMouse(element, 4, 4, { }, element.ownerDocument.defaultView),
+                     element.ownerDocument.defaultView,
+                     element.id, idx % 2, "mouse on non-tabbable element o" + idx);
+  }
+
+  // mouse clicking on elements that are not tabbable and have user-focus: none
+  // or are not focusable for other reasons (for instance, being disabled)
+  // These elements will clear the focus when clicked.
+  for (idx = 1; idx <= kNoFocusSteps; idx++) {
+    var element = getById("n" + idx);
+    gLastFocusMethod = idx % 2 ? 0 : fm.FLAG_BYMOUSE;
+    expectFocusShift(function () synthesizeMouse(element, 4, 4, { }, element.ownerDocument.defaultView),
+                     element.ownerDocument.defaultView,
+                     idx % 2 ? "" : element.id, true, "mouse on unfocusable element n" + idx);
+  }
+
+  if (idx == kOverflowElementIndex) {
+    gLastFocusMethod = fm.FLAG_BYMOUSE;
+    var element = getById("t" + idx);
+    expectFocusShift(function () synthesizeMouse(element, 4, 4, { }, element.ownerDocument.defaultView),
+                     window, null, true, "mouse on scrollable element");
+  }
+
+  // focus() method
+  gLastFocusMethod = 0;
+  for (idx = kTabbableSteps; idx >= 1; idx--) {
+    if ((navigator.platform.indexOf("Mac") == 0) && (idx == kBeforeTabboxIndex + 1))
+      continue;
+    expectFocusShift(function () getById("t" + idx).focus(),
+                     null, "t" + idx, true, "focus method on element t" + idx);
+  }
+
+  $("t1").focus();
+  ok(gEvents === "", "focusing element that is already focused");
+
+  $("t2").blur();
+  ok(gEvents === "", "blurring element that is not focused");
+
+  // focus() method on elements that are not tabbable 
+  for (idx = 1; idx <= kFocusSteps; idx++) {
+    var expectedId = "o" + (idx % 2 ? idx : idx - 1);
+    expectFocusShift(function () getById("o" + idx).focus(),
+                     getById(expectedId).ownerDocument.defaultView,
+                     expectedId, idx % 2, "focus method on non-tabbable element o" + idx);
+  }
+
+  // focus() method on elements that are not tabbable and have user-focus: none
+  // or are not focusable for other reasons (for instance, being disabled)
+  for (idx = 1; idx <= kNoFocusSteps; idx++) {
+    var expectedId = "o" + (idx % 2 ? idx : idx - 1);
+    expectFocusShift(function () getById("o" + idx).focus(),
+                     getById(expectedId).ownerDocument.defaultView,
+                     expectedId, idx % 2, "focus method on unfocusable element n" + idx);
+  }
+
+  // the focus() method on the legend element should focus the legend if it is
+  // focusable, or the first element after the legend if it is not focusable.
+  if (!gPartialTabbing) {
+    var legend = getById("legend");
+    expectFocusShift(function () legend.focus(),
+                     null, "t28", true, "focus method on unfocusable legend");
+    legend.tabIndex = "0";
+    expectFocusShift(function () legend.focus(),
+                     null, "legend", true, "focus method on focusable legend");
+    legend.tabIndex = "-1";
+  }
+
+  var accessKeyDetails = (navigator.platform.indexOf("Mac") >= 0) ?
+                         { ctrlKey : true } : { altKey : true };
+
+  // test accesskeys
+  var keys = ["t26", "t19", "t22", "t29", "t15", "t17", "n14",
+              "t4", "o1", "o9", "n6"];
+  for (var k = 0; k < keys.length; k++) {
+    var key = String.fromCharCode(65 + k);
+
+    gLastFocusMethod = fm.FLAG_BYKEY;
+
+    // on Windows and Linux, the shift key must be pressed for content area access keys
+    if (navigator.platform.indexOf("Mac") == -1)
+      accessKeyDetails.shiftKey = (getById(keys[k]).ownerDocument.defaultView == gChildWindow);
+
+    expectFocusShift(function () synthesizeKey(key, accessKeyDetails),
+                     null, keys[k], true, "accesskey " + key);
+  }
+
+  // clicking on the labels
+  gLastFocusMethod = -1;
+  expectFocusShift(function () synthesizeMouse(getById("ad"), 2, 2, { }, gChildWindow),
+                   null, "t29", true, "mouse on html label with content inside");
+  expectFocusShift(function () synthesizeMouse(getById("ag"), 2, 2, { }, gChildWindow),
+                   null, "n14", true, "mouse on html label with for attribute");
+  expectFocusShift(function () synthesizeMouse(getById("aj"), 2, 2, { }),
+                   null, "o9", true, "mouse on xul label with content inside");
+  expectFocusShift(function () synthesizeMouse(getById("ak"), 2, 2, { }),
+                   null, "n6", true, "mouse on xul label with control attribute");
+
+  // test accesskeys that shouldn't work
+  gLastFocusMethod = 0;
+  k = "o".charCodeAt(0);
+  while (k++ < "v".charCodeAt(0)) {
+    var key = String.fromCharCode(k);
+    expectFocusShift(function () synthesizeKey(key, accessKeyDetails),
+                     window, "n6", false, "non accesskey " + key);
+  }
+  gLastFocusMethod = -1;
+
+  // should focus the for element when using the focus method on a label as well
+  expectFocusShift(function () getById("ad").focus(),
+                   null, "t29", true, "mouse on html label using focus method");
+
+  // make sure that the text is selected when clicking a label associated with an input
+  getById("ag").htmlFor = "t19";
+  expectFocusShift(function () synthesizeMouse(getById("ag"), 2, 2, { }, gChildWindow),
+                   null, "t19", true, "mouse on html label with for attribute changed");
+  is(t19.selectionStart, 0, "input focused from label, selectionStart");
+  is(t19.selectionEnd, 5, "input focused from label, selectionEnd");
+
+  // switch to another panel in a tabbox and ensure that tabbing moves between
+  // elements on the new panel.
+  $("tabbox").selectedIndex = 1;
+  expectFocusShift(function () getById("t" + kBeforeTabboxIndex).focus(),
+                   null, "t" + kBeforeTabboxIndex, true, "focus method on element before tabbox");
+
+  if (!gPartialTabbing) {
+    if (navigator.platform.indexOf("Mac") == -1)
+      expectFocusShift(pressTab, null, "tab2", true, "focus method on tab");
+    expectFocusShift(pressTab, null, "htab1", true, "tab key switch tabpanel 1");
+    expectFocusShift(pressTab, null, "htab2", true, "tab key switch tabpanel 2");
+    expectFocusShift(pressTab, null, "t" + (kBeforeTabboxIndex + 4), true, "tab key switch tabpanel 3");
+  }
+  $("tabbox").selectedIndex = 0;
+
+  // ---- the following checks when the focus changes during a blur or focus event ----
+
+  var o5 = $("o5");
+  var o7 = $("o7");
+  var o9 = $("o9");
+  var t17 = getById("t17");
+  var t19 = getById("t19");
+  var shiftFocusParentDocument = function() o9.focus();
+  var shiftFocusChildDocument = function() t17.focus();
+
+  var trapBlur = function (element, eventListener, blurFunction)
+  {
+    element.focus();
+    gEvents = "";
+    element.addEventListener("blur", eventListener, false);
+    blurFunction();
+    element.removeEventListener("blur", eventListener, false);
+  }
+
+  var functions = [
+    function(element) element.focus(),
+    function(element) synthesizeMouse(element, 4, 4, { }, element.ownerDocument.defaultView)
+  ];
+
+  // first, check cases where the focus is adjusted during the blur event. Iterate twice,
+  // once with the focus method and then focusing by mouse clicking
+  for  (var l = 0; l < 2; l++) {
+    var adjustFocus = functions[l];
+    var mod = (l == 1) ? " with mouse" : "";
+
+    // an attempt is made to switch the focus from one element (o5) to another
+    // element (o7) within the same document, yet the focus is shifted to a
+    // third element (o9) in the same document during the blur event for the
+    // first element.
+    trapBlur(o5, shiftFocusParentDocument, function () adjustFocus(o7));
+    compareEvents("commandupdate: cu blur: o5 commandupdate: cu focus: o9",
+                  window, o9, "change focus to sibling during element blur, attempted sibling" + mod);
+
+    // similar, but the third element (t17) is in a child document
+    trapBlur(o9, shiftFocusChildDocument, function () adjustFocus(o7));
+    compareEvents("commandupdate: cu blur: o9 blur: outer-document blur: outer-window " +
+                  "focus: child-document focus: child-window commandupdate: cu focus: t17",
+                  gChildWindow, t17, "change focus to child document during element blur, attempted sibling" + mod);
+
+    // similar, but an attempt to switch focus within the same document, but the
+    // third element (t17) is in a parent document
+    trapBlur(t17, shiftFocusParentDocument, function () adjustFocus(t19));
+    compareEvents("commandupdate: cu blur: t17 blur: child-document blur: child-window " +
+                  "focus: outer-document focus: outer-window commandupdate: cu focus: o9",
+                  window, o9, "change focus to parent document during element blur, attempted sibling" + mod);
+
+    // similar, but blur is called instead of switching focus
+    trapBlur(o7, shiftFocusParentDocument, function () o7.blur());
+    compareEvents("commandupdate: cu blur: o7 commandupdate: cu focus: o9",
+                  window, o9, "change focus to same document during clear focus" + mod);
+
+    // check when an element in the same document is focused during the
+    // element's blur event, but an attempt was made to focus an element in the
+    // child document. In this case, the focus in the parent document should be
+    // what was set during the blur event, but the actual focus should still
+    // move to the child document.
+    trapBlur(o7, shiftFocusParentDocument, function () adjustFocus(t17));
+    compareEvents("commandupdate: cu blur: o7 commandupdate: cu focus: o9 " +
+                  "blur: outer-document blur: outer-window " +
+                  "focus: child-document focus: child-window commandupdate: cu focus: t17",
+                  gChildWindow, t17, "change focus to sibling during element blur, attempted child" + mod);
+    is(fm.getFocusedElementForWindow(window, false, {}), $("childframe"),
+       "change focus to sibling during element blur, attempted child, focused in parent" + mod);
+
+    // similar, but with a parent
+    trapBlur(t19, shiftFocusChildDocument, function () adjustFocus(o7));
+    compareEvents("commandupdate: cu blur: t19 commandupdate: cu focus: t17 " +
+                  "blur: child-document blur: child-window " +
+                  "focus: outer-document focus: outer-window commandupdate: cu focus: o7",
+                  window, o7, "change focus to sibling during element blur, attempted parent" + mod);
+    is(fm.getFocusedElementForWindow(gChildWindow, false, {}), t17,
+       "change focus to sibling during element blur, attempted child, focused in child" + mod);
+
+    // similar, with a child, but the blur event focuses a child element also
+    trapBlur(o7, shiftFocusChildDocument, function () adjustFocus(t19));
+    compareEvents("commandupdate: cu blur: o7 blur: outer-document blur: outer-window " +
+                  "focus: child-document focus: child-window commandupdate: cu focus: t17",
+                  gChildWindow, t17, "change focus to child during element blur, attempted child" + mod);
+
+    // similar, with a parent, where the blur event focuses a parent element also
+    trapBlur(t17, shiftFocusParentDocument, function () adjustFocus(o7));
+    compareEvents("commandupdate: cu blur: t17 blur: child-document blur: child-window " +
+                  "focus: outer-document focus: outer-window commandupdate: cu focus: o9",
+                  window, o9, "change focus to parent during element blur, attempted parent" + mod);
+  }
+
+  var trapFocus = function (element, eventListener)
+  {
+    element.addEventListener("focus", eventListener, false);
+    element.focus();
+    element.removeEventListener("focus", eventListener, false);
+  }
+
+  fm.clearFocus(window);
+  gEvents = "";
+
+  // next, check cases where the focus is adjusted during the focus event
+
+  // switch focus to an element in the same document  
+  trapFocus(o5, shiftFocusParentDocument);
+  compareEvents("commandupdate: cu focus: o5 commandupdate: cu blur: o5 commandupdate: cu focus: o9",
+                window, o9, "change focus to sibling during element focus");
+
+  // similar, but the new element (t17) is in a child document
+  trapFocus(o5, shiftFocusChildDocument);
+  compareEvents("commandupdate: cu blur: o9 " +
+                "commandupdate: cu focus: o5 commandupdate: cu blur: o5 " +
+                "blur: outer-document blur: outer-window " +
+                "focus: child-document focus: child-window commandupdate: cu focus: t17",
+                gChildWindow, t17, "change focus to child document during element focus");
+
+  // similar, but the new element (o9) is in a parent document.
+  trapFocus(t19, shiftFocusParentDocument);
+  compareEvents("commandupdate: cu blur: t17 " +
+                "commandupdate: cu focus: t19 commandupdate: cu blur: t19 " +
+                "blur: child-document blur: child-window " +
+                "focus: outer-document focus: outer-window commandupdate: cu focus: o9",
+                window, o9, "change focus to parent document during element focus");
+
+  // clear the focus during the focus event
+  trapFocus(o7, function () fm.clearFocus(window));
+  compareEvents("commandupdate: cu blur: o9 commandupdate: cu focus: o7 commandupdate: cu blur: o7",
+                window, null, "clear focus during focus event");
+
+  if (!gPartialTabbing)
+    doCommandDispatcherTests();
+
+  doRemoveTests()
+
+  testMoveFocus();
+
+  // tests various focus manager apis for null checks
+  var exh = false;
+  try {
+    fm.clearFocus(null);
+  }
+  catch (ex) { exh = true; }
+  is(exh, true, "clearFocus with null window causes exception");
+
+  var exh = false;
+  try {
+    fm.getFocusedElementForWindow(null, false, focusedWindow);
+  }
+  catch (ex) { exh = true; }
+  is(exh, true, "getFocusedElementForWindow with null window causes exception");
+
+  // just make sure that this doesn't crash
+  fm.moveCaretToFocus(null);
+
+  // ---- tests for the FLAG_NOSWITCHFRAME flag
+  getById("o5").focus();
+  gEvents = "";
+  // focus is being shifted in a child, so the focus should not change
+  expectFocusShift(function () fm.setFocus(getById("t20"), fm.FLAG_NOSWITCHFRAME),
+                   window, "o5", false, "no switch frame focus to child");
+  setFocusTo("t20", gChildWindow);
+
+  // here, however, focus is being shifted in a parent, which will have to blur
+  // the child, so the focus will always change
+  expectFocusShift(function () fm.setFocus(getById("o5"), fm.FLAG_NOSWITCHFRAME),
+                   window, "o5", true, "no switch frame focus to parent");
+
+  expectFocusShift(function () fm.setFocus(getById("t1"), fm.FLAG_NOSWITCHFRAME),
+                   window, "t1", true, "no switch frame focus to same window");
+
+  // ---- tests for focus and scrolling into view ----
+  var inscroll = getById("inscroll");
+  inscroll.tabIndex = 0;
+  is(inscroll.parentNode.scrollTop, 0, "scroll position before focus");
+  inscroll.focus();
+  ok(inscroll.parentNode.scrollTop > 5, "scroll position after focus");
+  inscroll.parentNode.scrollTop = 0;
+  fm.setFocus(inscroll, fm.FLAG_NOSCROLL);
+  is(inscroll.parentNode.scrollTop, 0, "scroll position after noscroll focus");
+
+  getById("t9").focus();
+  getById("inpopup1").focus();
+  is(fm.focusedElement, getById("t9"), "focus in closed popup");
+
+  gEvents = "";
+  window.openDialog("focus_window2.xul", "_blank", "chrome", otherWindowFocused, null);
+}
+
+function doCommandDispatcherTests()
+{
+  var t19 = getById("t19");
+  t19.focus();
+  gLastFocusWindow = gChildWindow;
+  gLastFocus = t19;
+  gEvents = "";
+
+  expectFocusShift(function () document.commandDispatcher.focusedElement = getById("o9"),
+                   null, "o9", true, "command dispatcher set focusedElement");
+  expectFocusShift(function () document.commandDispatcher.advanceFocus(),
+                   null, "o13", true, "command dispatcher advanceFocus");
+  expectFocusShift(function () document.commandDispatcher.rewindFocus(),
+                   null, "o9", true, "command dispatcher rewindFocus");
+  expectFocusShift(function () document.commandDispatcher.focusedElement = null,
+                   null, null, true, "command dispatcher set focusedElement to null");
+  expectFocusShift(function () document.commandDispatcher.focusedWindow = gChildWindow,
+                   null, "t19", true, "command dispatcher set focusedElement to null");
+  expectFocusShift(function () document.commandDispatcher.focusedElement = null,
+                   gChildWindow, null, true, "command dispatcher set focusedElement to null in child");
+  expectFocusShift(function () document.commandDispatcher.advanceFocusIntoSubtree(getById("t19")),
+                   null, "t20", true, "command dispatcher advanceFocusIntoSubtree child");
+  expectFocusShift(function () document.commandDispatcher.advanceFocusIntoSubtree(null),
+                   null, "t21", true, "command dispatcher advanceFocusIntoSubtree null child");
+  expectFocusShift(function () document.commandDispatcher.advanceFocusIntoSubtree(getById("o9").parentNode),
+                   null, "o9", true, "command dispatcher advanceFocusIntoSubtree parent");
+}
+
+function doRemoveTests()
+{
+  // next, some tests which remove elements
+  var t19 = getById("t19");
+  t19.focus();
+  t19.parentNode.removeChild(t19);
+
+  is(fm.focusedElement, null, "removed element focusedElement");
+  is(fm.focusedWindow, gChildWindow, "removed element focusedWindow");
+  is(gChildWindow.document.hasFocus(), true, "removed element hasFocus");
+  is(gChildWindow.document.activeElement, getById("inner-document"), "removed element activeElement");
+
+  getById("t15").focus();
+  var abs = getById("abs");
+  abs.parentNode.removeChild(abs);
+
+  is(fm.focusedElement, null, "removed ancestor focusedElement");
+  is(fm.focusedWindow, gChildWindow, "removed ancestor focusedWindow");
+  is(gChildWindow.document.hasFocus(), true, "removed ancestor hasFocus");
+  is(gChildWindow.document.activeElement, getById("inner-document"), "removed ancestor activeElement");
+}
+
+// tests for the FocusManager moveFocus method
+function testMoveFocus()
+{
+  setFocusTo("t6", window);
+
+  // moving focus while an element is already focused
+  var newFocus;
+  var expectedFirst = gPartialTabbing ? "t3" : "t1";
+  expectFocusShift(function () newFocus = fm.moveFocus(null, null, fm.MOVEFOCUS_FIRST, 0),
+                   window, expectedFirst, true, "moveFocus to first null window null content");
+  is(newFocus, fm.focusedElement, "moveFocus to first null window null content return value");
+
+  expectFocusShift(function () newFocus = fm.moveFocus(null, null, fm.MOVEFOCUS_LAST, 0),
+                   window, "last", true, "moveFocus to last null window null content");
+  is(newFocus, fm.focusedElement, "moveFocus to last null window null content return value");
+
+  newFocus = fm.moveFocus(null, null, fm.MOVEFOCUS_ROOT, 0);
+  is(newFocus, null, "moveFocus to root null window null content return value");
+  is(fm.focusedWindow, window, "moveFocus to root null window null content focusedWindow");
+  is(fm.focusedElement, null, "moveFocus to root null window null content focusedElement");
+
+  // moving focus while no element is focused
+  fm.clearFocus(window);
+  gEvents = "";
+  gLastFocus = null;
+  expectFocusShift(function () newFocus = fm.moveFocus(null, null, fm.MOVEFOCUS_FIRST, 0),
+                   window, expectedFirst, true, "moveFocus to first null window null content no focus");
+  is(newFocus, fm.focusedElement, "moveFocus to first null window null content no focus return value");
+  fm.clearFocus(window);
+  gEvents = "";
+  gLastFocus = null;
+  expectFocusShift(function () newFocus = fm.moveFocus(null, null, fm.MOVEFOCUS_LAST, 0),
+                   window, "last", true, "moveFocus to last null window null content no focus");
+  is(newFocus, fm.focusedElement, "moveFocus to last null window null content no focus return value");
+  fm.clearFocus(window);
+  gEvents = "";
+  newFocus = fm.moveFocus(null, null, fm.MOVEFOCUS_ROOT, 0);
+  is(newFocus, null, "moveFocus to root null window null content no focus return value");
+  is(fm.focusedWindow, window, "moveFocus to root null window null content no focus focusedWindow");
+  is(fm.focusedElement, null, "moveFocus to root null window null content no focus focusedElement");
+
+  // moving focus from a specified element
+  setFocusTo("t6", window);
+  expectFocusShift(function () newFocus = fm.moveFocus(null, getById("specialroot"), fm.MOVEFOCUS_FIRST, 0),
+                   window, "t3", true, "moveFocus to first null window with content");
+// XXXndeakin P3 this doesn't work
+//  expectFocusShift(function () newFocus = fm.moveFocus(null, getById("specialroot"), fm.MOVEFOCUS_LAST, 0),
+//                   window, "o3", true, "moveFocus to last null window with content");
+
+  // move focus to first in child window
+  expectFocusShift(function () newFocus = fm.moveFocus(gChildWindow, null, fm.MOVEFOCUS_FIRST, 0),
+                   gChildWindow, "t" + (kChildDocumentRootIndex + 1), true,
+                   "moveFocus to first child window null content");
+  is(newFocus, getById("t" + (kChildDocumentRootIndex + 1)),
+     "moveFocus to first child window null content return value");
+
+  // move focus to last in child window
+  setFocusTo("t6", window);
+  var expectedLast = gPartialTabbing ? "t30" : "t" + (kBeforeTabboxIndex - 1);
+  expectFocusShift(function () newFocus = fm.moveFocus(gChildWindow, null, fm.MOVEFOCUS_LAST, 0),
+                   gChildWindow, expectedLast, true,
+                   "moveFocus to last child window null content");
+  is(newFocus, getById(expectedLast),
+     "moveFocus to last child window null content return value");
+
+  // move focus to root in child window
+  setFocusTo("t6", window);
+  var childroot = getById("t" + kChildDocumentRootIndex);
+  newFocus = fm.moveFocus(gChildWindow, null, fm.MOVEFOCUS_ROOT, 0),
+  is(newFocus, childroot, "moveFocus to root child window null content return value");
+  is(fm.focusedWindow, gChildWindow, "moveFocus to root child window null content focusedWindow");
+  is(fm.focusedElement, childroot, "moveFocus to root child window null content focusedElement");
+
+  // MOVEFOCUS_CARET tests
+  getById("t20").focus();
+  gEvents = "";
+
+  var selection = gChildWindow.getSelection();
+  selection.removeAllRanges();
+
+  var node = getById("t16").firstChild;
+  var range = gChildWindow.document.createRange();
+  range.setStart(node, 3);
+  range.setEnd(node, 3);
+  selection.addRange(range);
+
+  newFocus = fm.moveFocus(gChildWindow, null, fm.MOVEFOCUS_CARET, 0);
+  is(newFocus, null, "move caret to non-link return value");
+  is(fm.focusedElement, null, "move caret to non-link");
+
+  var t25 = getById("t25")
+  var node = t25.firstChild;
+  range.setStart(node, 1);
+  range.setEnd(node, 1);
+  var newFocus = fm.moveFocus(gChildWindow, null, fm.MOVEFOCUS_CARET, 0);
+
+  is(newFocus, t25, "move caret to link return value");
+  is(fm.focusedElement, t25, "move caret to link focusedElement");
+
+  // enable caret browsing temporarily to test caret movement
+  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
+                getService(Components.interfaces.nsIPrefBranch);
+  prefs.setBoolPref("accessibility.browsewithcaret", true);
+
+  synthesizeKey("VK_LEFT", { }, gChildWindow);
+  synthesizeKey("VK_LEFT", { }, gChildWindow);
+  is(fm.focusedElement, null, "move caret away from link");
+
+  synthesizeKey("VK_LEFT", { }, gChildWindow);
+  is(fm.focusedElement, getById("t24"), "move caret away onto link");
+
+  prefs.setBoolPref("accessibility.browsewithcaret", false);
+}
+
+function otherWindowFocused(otherWindow)
+{
+  var expectedElement = getById("t9");
+
+  is(fm.activeWindow, otherWindow, "other activeWindow");
+  is(fm.focusedWindow, otherWindow, "other focusedWindow");
+  is(window.document.hasFocus(), false, "when lowered document hasFocus");
+  var focusedWindow = {};
+  is(fm.getFocusedElementForWindow(window, false, focusedWindow),
+     expectedElement, "when lowered getFocusedElementForWindow");
+  is(focusedWindow.value, window, "when lowered getFocusedElementForWindow frame");
+  is(document.activeElement.id, expectedElement.id, "when lowered activeElement");
+  is(window.document.commandDispatcher.focusedWindow, window, " commandDispatcher in other window focusedWindow");
+  is(window.document.commandDispatcher.focusedElement, expectedElement, " commandDispatcher in other window focusedElement");
+
+  compareEvents("blur: t9 blur: outer-document blur: outer-window",
+                otherWindow, null, "other window opened");
+
+  otherWindow.document.getElementById("other").focus();
+
+  for (var idx = kTabbableSteps; idx >= 1; idx--) {
+    expectedElement = getById("t" + idx);
+    if (!expectedElement) // skip elements that were removed in doRemoveTests()
+      continue;
+    if ((navigator.platform.indexOf("Mac") == 0) && (idx == kBeforeTabboxIndex + 1))
+      continue;
+
+    expectedElement.focus();
+
+    is(fm.focusedElement.id, "other", "when lowered focusedElement t" + idx);
+    is(fm.focusedWindow, otherWindow, "when lowered focusedWindow t" + idx);
+
+    var checkWindow = expectedElement.ownerDocument.defaultView;
+    is(fm.getFocusedElementForWindow(checkWindow, false, {}).id, expectedElement.id,
+       "when lowered getFocusedElementForWindow t" + idx);
+    is(checkWindow.document.activeElement.id, expectedElement.id, "when lowered activeElement t" + idx);
+    if (checkWindow != window) {
+      is(fm.getFocusedElementForWindow(window, false, {}), $("childframe"),
+         "when lowered parent getFocusedElementForWindow t" + idx);
+      is(document.activeElement.id, "childframe",
+         "when lowered parent activeElement t" + idx);
+    }
+  }
+
+  gEvents = gEvents.replace(/commandupdate: cu\s?/g, "");
+  is(gEvents, "", "when lowered no events fired");
+
+  var other = otherWindow.document.getElementById("other");
+  other.focus();
+  is(fm.focusedElement, other, "focus method in second window");
+
+  otherWindow.close();
+
+  // next, check modal dialogs
+  getById("n2").focus();
+  window.openDialog("focus_window2.xul", "_blank", "chrome,modal", modalWindowOpened, null);
+}
+
+function modalWindowOpened(modalWindow)
+{
+  var elem = modalWindow.document.getElementById("other");
+  if (gPartialTabbing)
+     synthesizeMouse(elem, 4, 4, { }, modalWindow)
+  else
+    pressTab();
+  is(fm.activeWindow, modalWindow, "modal activeWindow");
+  is(fm.focusedElement, elem, "modal focusedElement");
+
+  gRefocusCallback = modalWindowClosed;
+  modalWindow.close();
+}
+
+function modalWindowClosed()
+{
+  gRefocusCallback = null;
+  is(fm.activeWindow, window, "modal window closed activeWindow");
+  is(fm.focusedElement, getById("n2"), "modal window closed focusedElement");
+
+  var framewin = window.open("focus_frameset.html", "_blank", "width=400,height=400,toolbar=no");
+}
+
+function framesetWindowLoaded(framesetWindow)
+{
+  gLastFocus = null;
+  gEvents = "";
+
+  is(fm.activeWindow, getTopWindow(framesetWindow), "frameset window active");
+  gOldExpectedWindow = getTopWindow(framesetWindow);
+
+  gMoveToFocusFrame = true;
+  for (var idx = 1; idx <= 8; idx++) {
+    gNewExpectedWindow = framesetWindow.frames[(idx - 1) >> 1];
+    if (idx % 2)
+      initEvents(gNewExpectedWindow);
+    expectFocusShift(function () synthesizeKey("VK_TAB", { }, framesetWindow),
+                     gNewExpectedWindow, "f" + idx, true, "frameset tab key f" + idx);
+    gMoveToFocusFrame = false;
+    gOldExpectedWindow = gNewExpectedWindow;
+  }
+
+  gNewExpectedWindow = framesetWindow.frames[0];
+  expectFocusShift(function () synthesizeKey("VK_TAB", { }, framesetWindow),
+                   gNewExpectedWindow, "f1", true, "frameset tab key wrap to start");
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[3];
+  expectFocusShift(function () synthesizeKey("VK_TAB", { shiftKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f8", true, "frameset shift tab key wrap to end");
+
+  for (idx = 7; idx >= 1; idx--) {
+    gOldExpectedWindow = gNewExpectedWindow;
+    gNewExpectedWindow = framesetWindow.frames[(idx - 1) >> 1];
+    expectFocusShift(function () synthesizeKey("VK_TAB", { shiftKey: true }, framesetWindow),
+                     gNewExpectedWindow, "f" + idx, true, "frameset shift tab key f" + idx);
+  }
+
+  // document shifting
+  // XXXndeakin P3 ctrl+tab doesn't seem to be testable currently for some reason
+  gNewExpectedWindow = framesetWindow.frames[1];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f3", true, "switch document forward with f6");
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[2];
+  expectFocusShift(function () synthesizeKey("VK_F6", { }, framesetWindow),
+                   gNewExpectedWindow, "f5", true, "switch document forward with ctrl+tab");
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[3];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f7", true, "switch document forward with ctrl+f6");
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[0];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f1", true, "switch document forward and wrap");
+
+// going backwards by document and wrapping doesn't currently work, but didn't work
+// before the focus reworking either
+
+/*
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[3];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true, shiftKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f7", true, "switch document backward and wrap");
+ */
+
+  fm.moveFocus(framesetWindow.frames[3], null, fm.MOVEFOCUS_ROOT, 0);
+  gEvents = "";
+
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[2];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true, shiftKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f5", true, "switch document backward with f6");
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[1];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true, shiftKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f3", true, "switch document backward with ctrl+tab");
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = framesetWindow.frames[0];
+  expectFocusShift(function () synthesizeKey("VK_F6", { ctrlKey: true, shiftKey: true }, framesetWindow),
+                   gNewExpectedWindow, "f1", true, "switch document backward with ctrl+f6");
+
+  // skip the window switching tests for now on Linux, as opening and closing
+  // a window is asynchronous there
+  if (navigator.platform.indexOf("Linux") == -1) {
+    window.openDialog("focus_window2.xul", "_blank", "chrome", switchWindowTest, framesetWindow);
+  }
+  else {
+    gNewExpectedWindow = null;
+    gRefocusCallback = doFrameSwitchingTests;
+    framesetWindow.close();
+  }
+}
+
+// test switching between two windows
+function switchWindowTest(otherWindow, framesetWindow)
+{
+  initEvents(otherWindow);
+  var otherElement = otherWindow.document.getElementById("other");
+  otherElement.focus();
+
+  framesetWindow.frames[1].document.getElementById("f4").focus();
+
+  is(fm.focusedElement, otherElement, "focus after inactive window focus");
+
+  gLastFocus = otherElement;
+  gEvents = "";
+  gOldExpectedWindow = otherWindow;
+  gNewExpectedWindow = framesetWindow.frames[1];
+
+  expectFocusShift(function () gNewExpectedWindow.focus(),
+                   gNewExpectedWindow, "f4", true, "switch to frame in another window");
+  is(fm.getFocusedElementForWindow(otherWindow, false, {}).id, "other", "inactive window has focused element");
+
+  gOldExpectedWindow = framesetWindow.frames[1];
+  gNewExpectedWindow = otherWindow;
+  expectFocusShift(function () otherWindow.focus(),
+                   gNewExpectedWindow, "other", true, "switch to another window");
+
+  var exh = false;
+  try {
+    fm.activeWindow = framesetWindow.frames[0];
+  }
+  catch (ex) { exh = true; }
+  is(exh, true, "activeWindow set to non top-level window");
+
+  exh = false;
+  try {
+    fm.activeWindow = null;
+  }
+  catch (ex) { exh = true; }
+  is(exh, true, "activeWindow set to null");
+  is(fm.activeWindow, otherWindow, "window not changed when activeWindow set to null");
+
+  var topwindow = getTopWindow(framesetWindow);
+  gOldExpectedWindow = otherWindow;
+  gNewExpectedWindow = framesetWindow.frames[1];
+  expectFocusShift(function () fm.activeWindow = topwindow,
+                   gNewExpectedWindow, "f4", true, "switch to frame activeWindow");
+
+  fm.clearFocus(otherWindow);
+  gOldExpectedWindow = gNewExpectedWindow;
+  gNewExpectedWindow = otherWindow;
+  expectFocusShift(function () fm.setFocus(otherElement, fm.FLAG_RAISE),
+                   gNewExpectedWindow, "other", true, "switch to window with raise");
+
+  getTopWindow(framesetWindow).document.commandDispatcher.focusedWindow = gOldExpectedWindow;
+  is(fm.activeWindow, gNewExpectedWindow, "setting commandDispatcher focusedWindow doesn't raise window");
+
+  gOldExpectedWindow = null;
+  gNewExpectedWindow = null;
+  otherWindow.close();
+  framesetWindow.close();
+
+  gRefocusCallback = doFrameSwitchingTests;
+}
+
+// these tests check when focus is moved between a tree of frames to ensure
+// that the focus is in the right place at each event step.
+function doFrameSwitchingTests()
+{
+  gRefocusCallback = null;
+
+  var framea = document.getElementById("ifa");
+  var frameb = document.getElementById("ifb");
+  framea.style.MozUserFocus = "";
+  frameb.style.MozUserFocus = "";
+
+  window.removeEventListener("focus", eventOccured, true);
+  window.removeEventListener("blur", eventOccured, true);
+
+  var inputa = framea.contentDocument.body.firstChild;
+  inputa.focus();
+
+  addFrameSwitchingListeners(framea);
+  addFrameSwitchingListeners(frameb);
+  var framec = framea.contentDocument.body.lastChild;
+  addFrameSwitchingListeners(framec);
+
+  var framed = framec.contentDocument.body.lastChild;
+  addFrameSwitchingListeners(framed);
+
+  var inputc = framec.contentDocument.body.firstChild;
+
+  var expectedMainWindowFocus = framea;
+
+  // An element in the immediate parent frame is focused. Focus an element in
+  // the child. The child should be focused and the parent's current focus should
+  // be the child iframe.
+  gEventMatched = true;
+  is(fm.getFocusedElementForWindow(window, false, {}), expectedMainWindowFocus,
+     "parent of framea has iframe focused");
+  gExpectedEvents = [[inputa, "blur", null, framea.contentWindow, window, framea],
+                     [framea.contentDocument, "blur", null, null, window, framea],
+                     [framea.contentWindow, "blur", null, null, window, framea],
+                     [framec.contentDocument, "focus", null, framec.contentWindow, window, framea],
+                     [framec.contentWindow, "focus", null, framec.contentWindow, window, framea],
+                     [inputc, "focus", inputc, framec.contentWindow, window, framea]];
+  inputc.focus();
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch from parent input to child input" + gExpectedEvents);
+
+  // An element in a child is focused. Focus an element in the immediate
+  // parent.
+  gEventMatched = true;
+  gExpectedEvents = [[inputc, "blur", null, framec.contentWindow, window, framea],
+                     [framec.contentDocument, "blur", null, null, window, framea],
+                     [framec.contentWindow, "blur", null, null, window, framea],
+                     [framea.contentDocument, "focus", null, framea.contentWindow, window, framea],
+                     [framea.contentWindow, "focus", null, framea.contentWindow, window, framea],
+                     [inputa, "focus", inputa, framea.contentWindow, window, framea]];
+  inputa.focus();
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch from child input to parent input");
+
+  // An element in a frame is focused. Focus an element in a sibling frame.
+  // The common ancestor of the two frames should have its focused node
+  // cleared after the element is blurred.
+  var inputb = frameb.contentDocument.body.firstChild;
+
+  gEventMatched = true;
+  gExpectedEvents = [[inputa, "blur", null, framea.contentWindow, window, framea],
+                     [framea.contentDocument, "blur", null, null, window, null],
+                     [framea.contentWindow, "blur", null, null, window, null],
+                     [frameb.contentDocument, "focus", null, frameb.contentWindow, window, frameb],
+                     [frameb.contentWindow, "focus", null, frameb.contentWindow, window, frameb],
+                     [inputb, "focus", inputb, frameb.contentWindow, window, frameb]];
+  inputb.focus();
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch from input to sibling frame");
+  is(fm.getFocusedElementForWindow(framea.contentWindow, false, {}), inputa, 
+     "blurred frame still has input as focus");
+
+  // focus a descendant in a sibling
+  var inputd = framed.contentDocument.body.firstChild;
+  gEventMatched = true;
+  gExpectedEvents = [[inputb, "blur", null, frameb.contentWindow, window, frameb],
+                     [frameb.contentDocument, "blur", null, null, window, null],
+                     [frameb.contentWindow, "blur", null, null, window, null],
+                     [framed.contentDocument, "focus", null, framed.contentWindow, window, framea],
+                     [framed.contentWindow, "focus", null, framed.contentWindow, window, framea],
+                     [inputd, "focus", inputd, framed.contentWindow, window, framea]];
+  inputd.focus();
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch from input to sibling descendant");
+  is(fm.getFocusedElementForWindow(framea.contentWindow, false, {}), framec,
+     "sibling parent focus has shifted to frame");
+
+  // focus an ancestor
+  gEventMatched = true;
+  gExpectedEvents = [[inputd, "blur", null, framed.contentWindow, window, framea],
+                     [framed.contentDocument, "blur", null, null, window, framea],
+                     [framed.contentWindow, "blur", null, null, window, framea],
+                     [framea.contentDocument, "focus", null, framea.contentWindow, window, framea],
+                     [framea.contentWindow, "focus", null, framea.contentWindow, window, framea],
+                     [inputa, "focus", inputa, framea.contentWindow, window, framea]];
+  inputa.focus();
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch from child input to ancestor");
+
+  // focus a descendant
+  gEventMatched = true;
+  gExpectedEvents = [[inputa, "blur", null, framea.contentWindow, window, framea],
+                     [framea.contentDocument, "blur", null, null, window, framea],
+                     [framea.contentWindow, "blur", null, null, window, framea],
+                     [framed.contentDocument, "focus", null, framed.contentWindow, window, framea],
+                     [framed.contentWindow, "focus", null, framed.contentWindow, window, framea],
+                     [inputd, "focus", inputd, framed.contentWindow, window, framea]];
+  inputd.focus();
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch from child input to ancestor");
+  is(fm.getFocusedElementForWindow(framea.contentWindow, false, {}), framec,
+     "parent focus has shifted to frame");
+
+  // focus a sibling frame by setting focusedWindow
+  gEventMatched = true;
+  gExpectedEvents = [[inputd, "blur", null, framed.contentWindow, window, framea],
+                     [framed.contentDocument, "blur", null, null, window, null],
+                     [framed.contentWindow, "blur", null, null, window, null],
+                     [frameb.contentDocument, "focus", null, frameb.contentWindow, window, frameb],
+                     [frameb.contentWindow, "focus", null, frameb.contentWindow, window, frameb],
+                     [inputb, "focus", inputb, frameb.contentWindow, window, frameb]];
+  fm.focusedWindow = frameb.contentWindow;
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch using focusedWindow");
+
+  // clear the focus in an unfocused frame
+  gEventMatched = true;
+  gExpectedEvents = [];
+  fm.clearFocus(framec.contentWindow);
+  ok(gEventMatched && gExpectedEvents.length == 0, "clearFocus in unfocused frame");
+
+  // focus a sibling frame by setting focusedWindow when no element is focused in that frame
+  gEventMatched = true;
+  gExpectedEvents = [[inputb, "blur", null, frameb.contentWindow, window, frameb],
+                     [frameb.contentDocument, "blur", null, null, window, null],
+                     [frameb.contentWindow, "blur", null, null, window, null],
+                     [framec.contentDocument, "focus", null, framec.contentWindow, window, framea],
+                     [framec.contentWindow, "focus", null, framec.contentWindow, window, framea]];
+  fm.focusedWindow = framec.contentWindow;
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch using focusedWindow with no element focused");
+  is(fm.getFocusedElementForWindow(framea.contentWindow, false, {}), framec,
+     "parent focus has shifted to frame using focusedWindow");
+
+  // focus the parent frame by setting focusedWindow. This should have no effect.
+  gEventMatched = true;
+  gExpectedEvents = [];
+  fm.focusedWindow = framea.contentWindow;
+  ok(gEventMatched && gExpectedEvents.length == 0, "frame switch to parent using focusedWindow");
+
+  // clear the focus in the parent frame
+  gEventMatched = true;
+  gExpectedEvents = [[framec.contentDocument, "blur", null, null, window, framea],
+                     [framec.contentWindow, "blur", null, null, window, framea],
+                     [framea.contentDocument, "focus", null, framea.contentWindow, window, framea],
+                     [framea.contentWindow, "focus", null, framea.contentWindow, window, framea]];
+  fm.clearFocus(framea.contentWindow);
+  ok(gEventMatched && gExpectedEvents.length == 0, "clearFocus in parent frame");
+
+  // clear the focus in an unfocused child frame
+  gEventMatched = true;
+  gExpectedEvents = [];
+  fm.clearFocus(framed.contentWindow);
+  ok(gEventMatched && gExpectedEvents.length == 0, "clearFocus in unfocused child frame");
+
+  var exh = false;
+  try {
+    fm.focusedWindow = null;
+  }
+  catch (ex) { exh = true; }
+  is(exh, true, "focusedWindow set to null");
+  is(fm.focusedWindow, framea.contentWindow, "window not changed when focusedWindow set to null");
+
+  doFrameHistoryTests()
+}
+
+function doFrameHistoryTests()
+{
+  var t20 = getById("t20");
+  t20.focus();
+
+  addEventListener("message", function() { $("childframe").goBack(); }, true);
+  gChildWindow.addEventListener("focus",
+    function(event) {
+      if (event.target == t20) {
+        is(fm.focusedElement, t20, "focus restored after history back"); done();
+    }
+  }, true);
+
+  // make sure that loading a new page and then going back maintains the focus
+  gChildWindow.location = "data:text/html,<html><body onload='window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)." +
+                          "getInterface(Components.interfaces.nsIWebNavigation)." +
+                          "QueryInterface(Components.interfaces.nsIDocShellTreeItem).rootTreeItem." +
+                          "QueryInterface(Components.interfaces.nsIInterfaceRequestor)." +
+                          "getInterface(Components.interfaces.nsIDOMWindow).postMessage(\"content loaded\", \"*\");'>Next</body></html>";
+}
+
+function addFrameSwitchingListeners(frame)
+{
+  frame.contentWindow.addEventListener("focus", frameSwitchingEventOccured, false);
+  frame.contentWindow.addEventListener("blur", frameSwitchingEventOccured, false);
+  frame.contentDocument.addEventListener("focus", frameSwitchingEventOccured, false);
+  frame.contentDocument.addEventListener("blur", frameSwitchingEventOccured, false);
+
+  var node = frame.contentDocument.body.firstChild;
+  node.addEventListener("focus", frameSwitchingEventOccured, false);
+  node.addEventListener("blur", frameSwitchingEventOccured, false);
+}
+
+function frameSwitchingEventOccured(event)
+{
+  if (!gExpectedEvents.length) {
+    gEventMatched = false;
+    return;
+  }
+
+  try {
+    var events = gExpectedEvents.shift();
+    is(event.target, events[0], "event target");
+    is(event.type, events[1], "event type");
+    is(fm.focusedElement, events[2], "focused element");
+    is(fm.focusedWindow, events[3], "focused frame");
+    if (events[4])
+      is(fm.getFocusedElementForWindow(events[4], false, {}), events[5], "focused element in frame");
+
+    if (gEventMatched && event.target == events[0] && event.type == events[1] &&
+        fm.focusedElement == events[2] && fm.focusedWindow == events[3]) {
+      if (!events[4] || fm.getFocusedElementForWindow(events[4], false, {}) == events[5])
+        return;
+    }
+  } catch (ex) { ok(ex, "exception"); }
+
+  gEventMatched = false;
+}
+
+SimpleTest.waitForExplicitFinish();
+
+]]>
+</script>
+
+<commandset id="cu"
+            commandupdater="true"
+            events="focus"
+            oncommandupdate="eventOccured(event)"/>
+
+<!--
+ The elements with ids starting with t are focusable and in the taborder.
+ The elements with ids starting with o are:
+   odd numbered ids - focusable but not part of the tab order
+   even numbered ids - not focusable with -moz-user-focus: ignore
+ The elements with ids starting with n are:
+   odd numbered ids - not focusable with -moz-user-focus: none
+   even numbered ids - focusable but not part of the tab order
+ -->
+<vbox id="buttonbox">
+<hbox>
+  <button id="t4" accesskey="h" label="no tabindex"/>
+  <button id="o1" accesskey="i" label="tabindex = -1" tabindex="-1"/>
+  <listbox id="t5" label="tabindex = 0" tabindex="0" rows="1">
+    <listitem/>
+  </listbox>
+  <button id="t1" label="tabindex = 2" tabindex="2"/>
+</hbox>
+<hbox>
+  <button id="o2" accesskey="o" style="-moz-user-focus: ignore;" label="no tabindex"/>
+  <button id="o4" style="-moz-user-focus: ignore;" label="tabindex = -1" tabindex="-1"/>
+  <button id="t6" style="-moz-user-focus: ignore;" label="tabindex = 0" tabindex="0"/>
+  <button id="t2" style="-moz-user-focus: ignore;" label="tabindex = 2" tabindex="2"/>
+</hbox>
+<hbox id="specialroot">
+  <button id="t7" style="-moz-user-focus: normal;" label="no tabindex"/>
+  <button id="o3" style="-moz-user-focus: normal;" label="tabindex = -1" tabindex="-1"/>
+  <button id="t8" style="-moz-user-focus: normal;" label="tabindex = 0" tabindex="0"/>
+  <listbox id="t3" style="-moz-user-focus: normal;" label="tabindex = 2" tabindex="2" rows="1">
+    <listitem/>
+  </listbox>
+</hbox>
+<hbox>
+  <button accesskey="p" style="display: none;"/> <button accesskey="q" style="visibility: collapse;"/>
+  <button style="display: none;" tabindex="2"/> <button style="visibility: collapse;" tabindex="2"/>
+</hbox>
+<hbox>
+  <button id="n5" accesskey="s" label="no tabindex" disabled="true"/>
+  <button id="n7" label="tabindex = -1" tabindex="-1" disabled="true"/>
+  <button id="n9" label="tabindex = 0" tabindex="0" disabled="true"/>
+  <button id="n11" label="tabindex = 2" tabindex="2" disabled="true"/>
+</hbox>
+</vbox>
+<vbox>
+<hbox>
+  <dropmarker id="o6" value="no tabindex"/>
+  <dropmarker id="o8" value="tabindex = -1" tabindex="-1"/>
+  <dropmarker id="o10" value="tabindex = 0" tabindex="0"/>
+  <dropmarker id="o12" value="tabindex = 2" tabindex="2"/>
+  <dropmarker id="t9" accesskey="r" style="-moz-user-focus: normal;" value="no tabindex" />
+  <dropmarker id="t10" style="-moz-user-focus: normal;" value="tabindex = -1" tabindex="-1" />
+  <dropmarker id="t11" style="-moz-user-focus: normal;" value="tabindex = 0" tabindex="0" />
+  <dropmarker id="t12" style="-moz-user-focus: normal;" value="tabindex = 2" tabindex="2" />
+  <dropmarker id="o14" style="-moz-user-focus: ignore;" value="no tabindex"/>
+  <dropmarker id="o16" style="-moz-user-focus: ignore;" value="tabindex = -1" tabindex="-1"/>
+  <dropmarker id="n1" style="-moz-user-focus: none;" value="tabindex = 0" tabindex="0"/>
+  <dropmarker id="n3" style="-moz-user-focus: none;" value="tabindex = 2" tabindex="2"/>
+</hbox>
+</vbox>
+<browser id="childframe" type="content" src="child_focus_frame.html" width="300" height="195"/>
+<button id="t34"/>
+<tabbox id="tabbox">
+  <tabs><tab id="t35" label="One"/><tab id="tab2" label="Two"/></tabs>
+  <tabpanels>
+    <tabpanel>
+      <checkbox id="t36"/>
+      <button id="t37"/>
+    </tabpanel>
+    <tabpanel>
+      <checkbox id="htab1"/>
+      <button id="nohtab2" tabindex="7"/>
+      <checkbox id="htab2" tabindex="0"/>
+    </tabpanel>
+  </tabpanels>
+</tabbox>
+<hbox>
+<panel>
+  <button id="inpopup1" label="One"/>
+  <textbox label="Two"/>
+</panel>
+<description label="o" accesskey="v"/>
+<button id="t38"/>
+<!-- The 't' element tests end here so it doesn't matter that these elements are tabbable -->
+<label id="aj" value="j" accesskey="j" control="o9"/>
+<label id="ak" accesskey="k" control="n6">k</label>
+<checkbox id="o5"/><checkbox id="o7"/><hbox><checkbox id="o9"/></hbox>
+<checkbox id="o13"/><checkbox id="o15"/><checkbox id="o17"/>
+<checkbox id="n2"/><checkbox id="n4"/><checkbox id="n6"/><checkbox id="n8"/><checkbox id="n10"/><checkbox id="n12"/>
+<listbox id="last" width="20" rows="1"/>
+
+<iframe id="ifa" width="20" height="20" style="-moz-user-focus: ignore;"
+        src="data:text/html,&lt;input id=fra&gt;
+        &lt;iframe src='data:text/html,&lt;input id=frc&gt;&lt;iframe src=&quot;data:text/html,&lt;input id=frd&gt;&quot;&gt;&lt;/iframe&gt;'&gt;&lt;/iframe&gt;"/>
+<iframe id="ifb" width="20" height="20" style="-moz-user-focus: ignore;"
+        src="data:text/html,&lt;input id=frd&gt;&lt;/iframe&gt;"/>
+
+</hbox>
+</window>
diff --git a/dom/tests/mochitest/geolocation/Makefile.in b/dom/tests/mochitest/geolocation/Makefile.in
index 5db422c310c4..2e7bec010e70 100644
--- a/dom/tests/mochitest/geolocation/Makefile.in
+++ b/dom/tests/mochitest/geolocation/Makefile.in
@@ -56,6 +56,7 @@ _TEST_FILES	= \
 		geolocation_common.js  \
 		geolocation.html \
 		test_optional_api_params.html \
+                network_geolocation.sjs \
 		$(NULL)
 
 
diff --git a/dom/tests/mochitest/geolocation/geolocation_common.js b/dom/tests/mochitest/geolocation/geolocation_common.js
index 1d4a6d105095..d340bd33cd09 100644
--- a/dom/tests/mochitest/geolocation/geolocation_common.js
+++ b/dom/tests/mochitest/geolocation/geolocation_common.js
@@ -1,19 +1,5 @@
 
 
-function ensure_geolocationProvider()
-{
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    
-    const testing_provider_cid = Components.ID("{10F622A4-6D7F-43A1-A938-5FFCBE2B1D1D}");
-    
-    var testing_factory = Components.manager.getClassObject(testing_provider_cid, Components.interfaces.nsIFactory);
-    
-    Components.manager.nsIComponentRegistrar.registerFactory(testing_provider_cid,
-                                                             "Test Geolocation Provider",
-                                                             "@mozilla.org/geolocation/provider;1",
-                                                             testing_factory);
-}
-
 function stop_geolocationProvider()
 {
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
diff --git a/dom/tests/mochitest/geolocation/network_geolocation.sjs b/dom/tests/mochitest/geolocation/network_geolocation.sjs
new file mode 100644
index 000000000000..a81fd020f182
--- /dev/null
+++ b/dom/tests/mochitest/geolocation/network_geolocation.sjs
@@ -0,0 +1,24 @@
+
+function handleRequest(request, response)
+{
+
+  var coords = {
+    latitude: 37.41857,
+    longitude: -122.08769,
+
+    altitude: 42,
+    accuracy: 42,
+    altitudeAccuracy: 42,
+    heading: 42,
+    speed: 42,
+  };
+
+  var geoposition = {
+    location: coords,
+  };
+
+  response.setStatusLine("1.0", 200, "OK");
+  response.setHeader("Content-Type", "aplication/x-javascript", false);
+  response.write(JSON.stringify(geoposition));
+}
+
diff --git a/dom/tests/mochitest/geolocation/test_allowCurrent.html b/dom/tests/mochitest/geolocation/test_allowCurrent.html
index 1f948d8f0a38..efb2aca386c0 100644
--- a/dom/tests/mochitest/geolocation/test_allowCurrent.html
+++ b/dom/tests/mochitest/geolocation/test_allowCurrent.html
@@ -33,7 +33,6 @@ function accept() {
   clickNotificationButton(kAcceptButton);
 }
 
-ensure_geolocationProvider();
 SimpleTest.waitForExplicitFinish();
 
 // one-shot position requests
diff --git a/dom/tests/mochitest/geolocation/test_allowWatch.html b/dom/tests/mochitest/geolocation/test_allowWatch.html
index 6f16c57a4aa4..5bd42a80af5a 100644
--- a/dom/tests/mochitest/geolocation/test_allowWatch.html
+++ b/dom/tests/mochitest/geolocation/test_allowWatch.html
@@ -39,7 +39,6 @@ function accept() {
 
 /** Test for Bug  **/
 
-ensure_geolocationProvider();
 SimpleTest.waitForExplicitFinish();
 
 watchID = navigator.geolocation.watchPosition(successCallback, null, null);
diff --git a/dom/tests/mochitest/geolocation/test_cancelCurrent.html b/dom/tests/mochitest/geolocation/test_cancelCurrent.html
index bbfc6f517418..4aee3925b51a 100644
--- a/dom/tests/mochitest/geolocation/test_cancelCurrent.html
+++ b/dom/tests/mochitest/geolocation/test_cancelCurrent.html
@@ -32,7 +32,6 @@ function successCallback(position){
 
 /** Test for Bug  **/
 
-ensure_geolocationProvider();
 SimpleTest.waitForExplicitFinish();
 
 navigator.geolocation.getCurrentPosition(successCallback, failureCallback, null);
diff --git a/dom/tests/mochitest/geolocation/test_cancelWatch.html b/dom/tests/mochitest/geolocation/test_cancelWatch.html
index 23bde43daa68..2a1fc1367ccb 100644
--- a/dom/tests/mochitest/geolocation/test_cancelWatch.html
+++ b/dom/tests/mochitest/geolocation/test_cancelWatch.html
@@ -34,7 +34,6 @@ function successCallback(position){
 
 /** Test for Bug  **/
 
-ensure_geolocationProvider();
 SimpleTest.waitForExplicitFinish();
 
 watchID = navigator.geolocation.getCurrentPosition(successCallback, failureCallback, null);
diff --git a/dom/tests/mochitest/geolocation/test_clearWatch.html b/dom/tests/mochitest/geolocation/test_clearWatch.html
index 42c26f5826d2..3863aef282e4 100644
--- a/dom/tests/mochitest/geolocation/test_clearWatch.html
+++ b/dom/tests/mochitest/geolocation/test_clearWatch.html
@@ -46,7 +46,6 @@ function testAccepted() {
 
 /** Test for Bug  **/
 
-ensure_geolocationProvider();
 SimpleTest.waitForExplicitFinish();
 
 watchID = navigator.geolocation.watchPosition(successCallback, failureCallback, null);
diff --git a/dom/tests/mochitest/geolocation/test_optional_api_params.html b/dom/tests/mochitest/geolocation/test_optional_api_params.html
index 4141b9d2e88c..99b030fa682c 100644
--- a/dom/tests/mochitest/geolocation/test_optional_api_params.html
+++ b/dom/tests/mochitest/geolocation/test_optional_api_params.html
@@ -23,7 +23,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=452566
 
 const NOT_ENOUGH_ARGS = 2153185281;
 
-ensure_geolocationProvider();
 ok(navigator.geolocation, "Should have geolocation");
 
 var exception = null;
diff --git a/dom/tests/mochitest/geolocation/test_timeoutWatch.html b/dom/tests/mochitest/geolocation/test_timeoutWatch.html
index e887a7075482..aeaf94084faa 100644
--- a/dom/tests/mochitest/geolocation/test_timeoutWatch.html
+++ b/dom/tests/mochitest/geolocation/test_timeoutWatch.html
@@ -21,7 +21,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=455327
 <script class="testbody" type="text/javascript">
 /** Test for Bug  **/
 
-ensure_geolocationProvider();
 SimpleTest.waitForExplicitFinish();
 
 stop_geolocationProvider();
diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
index 748b6181b9e0..5180186afd60 100644
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -5185,12 +5185,6 @@ nsEditor::CreateHTMLContent(const nsAString& aTag, nsIContent** aContent)
   if (!tag)
     return NS_ERROR_OUT_OF_MEMORY;
 
-  nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(tempDoc);
-  if (htmlDoc) {
-      return doc->CreateElem(tag, nsnull, doc->GetDefaultNamespaceID(),
-                             PR_TRUE, aContent);
-  }
-
   return doc->CreateElem(tag, nsnull, kNameSpaceID_XHTML, PR_FALSE, aContent);
 }
 
diff --git a/editor/libeditor/text/nsEditorEventListeners.cpp b/editor/libeditor/text/nsEditorEventListeners.cpp
index 399f68e87fa7..b51b67f5017e 100644
--- a/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -56,6 +56,7 @@
 #include "nsIPrefService.h"
 #include "nsILookAndFeel.h"
 #include "nsPresContext.h"
+#include "nsFocusManager.h"
 
 // Drag & Drop, Clipboard
 #include "nsIServiceManager.h"
@@ -70,6 +71,8 @@
 #include "nsIEventStateManager.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMDragEvent.h"
+#include "nsIFocusManager.h"
+#include "nsIDOMWindow.h"
 
 //#define DEBUG_IME
 
@@ -976,8 +979,7 @@ NS_IMPL_ISUPPORTS2(nsTextEditorFocusListener, nsIDOMEventListener, nsIDOMFocusLi
 nsTextEditorFocusListener::nsTextEditorFocusListener(nsIEditor *aEditor,
                                                      nsIPresShell *aShell) 
   : mEditor(aEditor),
-    mPresShell(do_GetWeakReference(aShell)),
-    mIsFocused(PR_FALSE)
+    mPresShell(do_GetWeakReference(aShell))
 {
 }
 
@@ -991,38 +993,6 @@ nsTextEditorFocusListener::HandleEvent(nsIDOMEvent* aEvent)
   return NS_OK;
 }
 
-static PRBool
-IsTargetFocused(nsIDOMEventTarget* aTarget)
-{
-  // The event target could be either a content node or a document.
-  nsCOMPtr<nsIDocument> doc;
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aTarget);
-  if (content)
-    doc = content->GetDocument();
-  else
-    doc = do_QueryInterface(aTarget);
-
-  if (!doc)
-    return PR_FALSE;
-
-  nsIPresShell *shell = doc->GetPrimaryShell();
-  if (!shell)
-    return PR_FALSE;
-
-  nsPresContext *presContext = shell->GetPresContext();
-  if (!presContext)
-    return PR_FALSE;
-
-  nsCOMPtr<nsIContent> focusedContent;
-  presContext->EventStateManager()->
-    GetFocusedContent(getter_AddRefs(focusedContent));
-
-  // focusedContent will be null in the case where the document has focus,
-  // and so will content.
-
-  return (focusedContent == content);
-}
-
 static already_AddRefed<nsIContent>
 FindSelectionRoot(nsIEditor *aEditor, nsIContent *aContent)
 {
@@ -1074,21 +1044,9 @@ nsresult
 nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
 {
   NS_ENSURE_ARG(aEvent);
-  // It's possible for us to receive a focus when we're really not focused.
-  // This happens, for example, when an onfocus handler that's hooked up
-  // before this listener focuses something else.  In that case, all of the
-  // onblur handlers will be fired synchronously, then the remaining focus
-  // handlers will be fired from the original event.  So, check to see that
-  // we're really focused.  (Note that the analogous situation does not
-  // happen for blurs, due to the ordering in
-  // nsEventStateManager::SendFocuBlur().
 
   nsCOMPtr<nsIDOMEventTarget> target;
   aEvent->GetTarget(getter_AddRefs(target));
-  if (!IsTargetFocused(target))
-    return NS_OK;
-
-  mIsFocused = PR_TRUE;
 
   // turn on selection and caret
   if (mEditor)
@@ -1103,6 +1061,18 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
       nsCOMPtr<nsIContent> editableRoot;
       if (content) {
         editableRoot = FindSelectionRoot(mEditor, content);
+
+        // make sure that the element is really focused in case an earlier
+        // listener in the chain changed the focus.
+        if (editableRoot) {
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          NS_ENSURE_TRUE(fm, NS_OK);
+
+          nsCOMPtr<nsIDOMElement> element;
+          fm->GetFocusedElement(getter_AddRefs(element));
+          if (!SameCOMIdentity(element, target))
+            return NS_OK;
+        }
       }
       else {
         nsCOMPtr<nsIDocument> document = do_QueryInterface(target);
@@ -1158,9 +1128,19 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
 nsresult
 nsTextEditorFocusListener::Blur(nsIDOMEvent* aEvent)
 {
+  // check if something else is focused. If another element is focused, then
+  // we should not change the selection.
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  NS_ENSURE_TRUE(fm, NS_OK);
+
+  nsCOMPtr<nsIDOMElement> element;
+  fm->GetFocusedElement(getter_AddRefs(element));
+  if (element)
+    return NS_OK;
+
   NS_ENSURE_ARG(aEvent);
   // turn off selection and caret
-  if (mEditor && mIsFocused)
+  if (mEditor)
   {
     nsCOMPtr<nsIEditor>editor = do_QueryInterface(mEditor);
     if (editor)
@@ -1210,8 +1190,6 @@ nsTextEditorFocusListener::Blur(nsIDOMEvent* aEvent)
     }
   }
 
-  mIsFocused = PR_FALSE;
-
   return NS_OK;
 }
 
diff --git a/editor/libeditor/text/nsEditorEventListeners.h b/editor/libeditor/text/nsEditorEventListeners.h
index 3c44beb7b800..74ac4bf22169 100644
--- a/editor/libeditor/text/nsEditorEventListeners.h
+++ b/editor/libeditor/text/nsEditorEventListeners.h
@@ -257,7 +257,6 @@ public:
 protected:
   nsIEditor*     mEditor;		// weak reference
   nsWeakPtr mPresShell;
-  PRBool mIsFocused;
 };
 
 
diff --git a/editor/txmgr/tests/TestTXMgr.cpp b/editor/txmgr/tests/TestTXMgr.cpp
index 536437b1b84b..233358487421 100644
--- a/editor/txmgr/tests/TestTXMgr.cpp
+++ b/editor/txmgr/tests/TestTXMgr.cpp
@@ -449,7 +449,7 @@ NS_IMPL_ISUPPORTS1(TestTransaction, nsITransaction)
 
 class SimpleTransaction : public TestTransaction
 {
-public:
+protected:
 
 #define NONE_FLAG               0
 #define THROWS_DO_ERROR_FLAG    1
@@ -463,6 +463,8 @@ public:
   PRInt32 mVal;
   PRInt32 mFlags;
 
+public:
+
   SimpleTransaction(PRInt32 aFlags=NONE_FLAG)
                     : mVal(++sConstructorCount), mFlags(aFlags)
   {}
@@ -595,8 +597,6 @@ private:
     mNumChildrenPerNode = aNumChildrenPerNode;
   }
 
-
-public:
   nsITransactionManager *mTXMgr;
 
   PRInt32 mLevel;
@@ -606,6 +606,8 @@ public:
   PRInt32 mMaxLevel;
   PRInt32 mNumChildrenPerNode;
 
+public:
+
   AggregateTransaction(nsITransactionManager *aTXMgr,
                        PRInt32 aMaxLevel, PRInt32 aNumChildrenPerNode,
                        PRInt32 aFlags=NONE_FLAG)
@@ -735,12 +737,14 @@ public:
 
 class AggregateTransactionFactory : public TestTransactionFactory
 {
-public:
+private:
 
   PRInt32 mMaxLevel;
   PRInt32 mNumChildrenPerNode;
   PRInt32 mFixedFlags;
 
+public:
+
   AggregateTransactionFactory(PRInt32 aMaxLevel, PRInt32 aNumChildrenPerNode,
                               PRInt32 aFixedFlags=NONE_FLAG)
       : mMaxLevel(aMaxLevel), mNumChildrenPerNode(aNumChildrenPerNode),
@@ -774,6 +778,9 @@ reset_globals()
   sRedoOrderArr       = 0;
 }
 
+/**
+ * Test behaviors in non-batch mode.
+ **/
 nsresult
 quick_test(TestTransactionFactory *factory)
 {
@@ -810,8 +817,7 @@ quick_test(TestTransactionFactory *factory)
   printf("Call DoTransaction() with null transaction ... ");
   result = mgr->DoTransaction(0);
 
-  if (NS_FAILED(result)
-      && result != NS_ERROR_NULL_POINTER) {
+  if (result != NS_ERROR_NULL_POINTER) {
     printf("ERROR: DoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -1022,8 +1028,7 @@ quick_test(TestTransactionFactory *factory)
 
   result = mgr->AddListener(0);
 
-  if (NS_FAILED(result)
-      && result != NS_ERROR_NULL_POINTER) {
+  if (result != NS_ERROR_NULL_POINTER) {
     printf("ERROR: AddListener() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -1040,8 +1045,7 @@ quick_test(TestTransactionFactory *factory)
 
   result = mgr->RemoveListener(0);
 
-  if (NS_FAILED(result)
-      && result != NS_ERROR_NULL_POINTER) {
+  if (result != NS_ERROR_NULL_POINTER) {
     printf("ERROR: RemoveListener() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -1053,7 +1057,7 @@ quick_test(TestTransactionFactory *factory)
    * Test coalescing by executing a transaction that can merge any
    * command into itself. Then execute 20 transaction. Afterwards,
    * we should still have the first transaction sitting on the undo
-   * stack.
+   * stack. Then clear the undo and redo stacks.
    *
    *******************************************************************/
 
@@ -1729,7 +1733,7 @@ quick_test(TestTransactionFactory *factory)
 
   result = mgr->DoTransaction(tx);
 
-  if (NS_FAILED(result) && result != NS_ERROR_FAILURE) {
+  if (result != NS_ERROR_FAILURE) {
     printf("ERROR: DoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -1849,7 +1853,7 @@ quick_test(TestTransactionFactory *factory)
 
   result = mgr->UndoTransaction();
 
-  if (NS_FAILED(result) && result != NS_ERROR_FAILURE) {
+  if (result != NS_ERROR_FAILURE) {
     printf("ERROR: UndoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -2013,7 +2017,7 @@ quick_test(TestTransactionFactory *factory)
 
   result = mgr->RedoTransaction();
 
-  if (NS_FAILED(result) && result != NS_ERROR_FAILURE) {
+  if (result != NS_ERROR_FAILURE) {
     printf("ERROR: RedoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -2510,7 +2514,7 @@ quick_test(TestTransactionFactory *factory)
     return result;
   }
 
-  if (u1 == u2 || u2) {
+  if (u2) {
     printf("ERROR: Unexpected item at top of undo stack. (%d)\n", result);
     return NS_ERROR_FAILURE;
   }
@@ -2689,11 +2693,6 @@ quick_test(TestTransactionFactory *factory)
     return NS_ERROR_FAILURE;
   }
 
-  if (NS_FAILED(result)) {
-    printf("ERROR: nsITransactionManager Release() failed. (%d)\n", result);
-    return result;
-  }
-
   printf("passed\n");
   printf("%d transactions processed during quick test.\n", sConstructorCount);
 
@@ -2759,6 +2758,9 @@ aggregation_test()
   return quick_test(&factory);
 }
 
+/**
+ * Test behaviors in batch mode.
+ **/
 nsresult
 quick_batch_test(TestTransactionFactory *factory)
 {
@@ -3757,7 +3759,7 @@ quick_batch_test(TestTransactionFactory *factory)
 
   result = mgr->DoTransaction(tx);
 
-  if (NS_FAILED(result) && result != NS_ERROR_FAILURE) {
+  if (result != NS_ERROR_FAILURE) {
     printf("ERROR: DoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -3898,7 +3900,7 @@ quick_batch_test(TestTransactionFactory *factory)
 
   result = mgr->UndoTransaction();
 
-  if (NS_FAILED(result) && result != NS_ERROR_FAILURE) {
+  if (result != NS_ERROR_FAILURE) {
     printf("ERROR: UndoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -4076,7 +4078,7 @@ quick_batch_test(TestTransactionFactory *factory)
 
   result = mgr->RedoTransaction();
 
-  if (NS_FAILED(result) && result != NS_ERROR_FAILURE) {
+  if (result != NS_ERROR_FAILURE) {
     printf("ERROR: RedoTransaction() returned unexpected error. (%d)\n", result);
     return result;
   }
@@ -4397,11 +4399,6 @@ quick_batch_test(TestTransactionFactory *factory)
     return NS_ERROR_FAILURE;
   }
 
-  if (NS_FAILED(result)) {
-    printf("ERROR: nsITransactionManager Release() failed. (%d)\n", result);
-    return result;
-  }
-
   printf("passed\n");
   printf("%d transactions processed during quick batch test.\n",
          sConstructorCount);
@@ -4468,6 +4465,10 @@ aggregation_batch_test()
   return quick_batch_test(&factory);
 }
 
+/**
+ * Create 'iterations * (iterations + 1) / 2' transactions;
+ * do/undo/redo/undo them.
+ **/
 nsresult
 stress_test(TestTransactionFactory *factory, PRInt32 iterations)
 {
@@ -4494,7 +4495,7 @@ stress_test(TestTransactionFactory *factory, PRInt32 iterations)
   for (i = 1; i <= iterations; i++) {
     /*******************************************************************
      *
-     * Execute a bunch of transactions:
+     * Create and execute a bunch of transactions:
      *
      *******************************************************************/
 
@@ -4683,40 +4684,39 @@ main (int argc, char *argv[])
 
   nsresult result;
 
+  //
+  // quick_test() part:
+  //
+
   result = simple_test();
-
-  if (NS_FAILED(result))
-    return result;
-
-  result = simple_batch_test();
-
-  if (NS_FAILED(result))
-    return result;
+  NS_ENSURE_SUCCESS(result, result);
 
   result = aggregation_test();
+  NS_ENSURE_SUCCESS(result, result);
 
-  if (NS_FAILED(result))
-    return result;
+  //
+  // quick_batch_test() part:
+  //
+
+  result = simple_batch_test();
+  NS_ENSURE_SUCCESS(result, result);
 
   result = aggregation_batch_test();
+  NS_ENSURE_SUCCESS(result, result);
 
-  if (NS_FAILED(result))
-    return result;
+  //
+  // stress_test() part:
+  //
 
   result = simple_stress_test();
-
-  if (NS_FAILED(result))
-    return result;
+  NS_ENSURE_SUCCESS(result, result);
 
   result = aggregation_stress_test();
-
-  if (NS_FAILED(result))
-    return result;
+  NS_ENSURE_SUCCESS(result, result);
 
   result = aggregation_batch_stress_test();
+  NS_ENSURE_SUCCESS(result, result);
 
-  if (NS_FAILED(result))
-    return result;
 
   return NS_OK;
 }
diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp
index 33c600f732e3..c3cca6f3bf2d 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -56,7 +56,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsPIDOMWindow.h"
-#include "nsIFocusController.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
@@ -73,6 +72,7 @@
 #include "nsCWebBrowserPersist.h"
 #include "nsIServiceManager.h"
 #include "nsAutoPtr.h"
+#include "nsFocusManager.h"
 
 // for painting the background window
 #include "nsIRenderingContext.h"
@@ -1463,12 +1463,11 @@ NS_IMETHODIMP nsWebBrowser::GetMainWidget(nsIWidget** mainWidget)
 
 NS_IMETHODIMP nsWebBrowser::SetFocus()
 {
-   NS_ENSURE_STATE(mDocShell);
+  nsCOMPtr<nsIDOMWindow> window = do_GetInterface(mDocShell);
+  NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
 
-   if (NS_FAILED(mDocShellAsWin->SetFocus()))
-     return NS_ERROR_FAILURE;
-
-   return NS_OK;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  return fm ? fm->SetFocusedWindow(window) : NS_OK;
 }
 
 NS_IMETHODIMP nsWebBrowser::GetTitle(PRUnichar** aTitle)
@@ -1749,91 +1748,20 @@ NS_IMETHODIMP nsWebBrowser::GetPrimaryContentWindow(nsIDOMWindowInternal **aDOMW
 /* void activate (); */
 NS_IMETHODIMP nsWebBrowser::Activate(void)
 {
-  // stop infinite recursion from windows with onfocus handlers that
-  // reactivate the window
-  if (mActivating)
-    return NS_OK;
-
-  mActivating = PR_TRUE;
-
-  // try to set focus on the last focused window as stored in the
-  // focus controller object.
-  nsCOMPtr<nsIDOMWindow> domWindowExternal;
-  GetContentDOMWindow(getter_AddRefs(domWindowExternal));
-  nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindowExternal));
-  PRBool needToFocus = PR_TRUE;
-  if (piWin) {
-    nsIFocusController *focusController = piWin->GetRootFocusController();
-    if (focusController) {
-      // Go ahead and mark the focus controller as being active.  We have
-      // to do this even before the activate message comes in.
-      focusController->SetActive(PR_TRUE);
-
-      nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-      focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-      if (focusedWindow) {
-        needToFocus = PR_FALSE;
-        focusController->SetSuppressFocus(PR_TRUE, "Activation Suppression");
-        piWin->Focus(); // This sets focus, but we'll ignore it.  
-                        // A subsequent activate will cause us to stop suppressing.
-      }
-    }
-  }
-
-  // If there wasn't a focus controller and focused window just set
-  // focus on the primary content shell.  If that wasn't focused,
-  // try and just set it on the toplevel DOM window.
-  if (needToFocus) {
-    nsCOMPtr<nsIDOMWindowInternal> contentDomWindow;
-    GetPrimaryContentWindow(getter_AddRefs(contentDomWindow));
-    if (contentDomWindow)
-      contentDomWindow->Focus();
-    else if (piWin)
-      piWin->Focus();
-  }
-
-  nsCOMPtr<nsIDOMWindow> win;
-  GetContentDOMWindow(getter_AddRefs(win));
-  if (win) {
-    // tell windowwatcher about the new active window
-    if (mWWatch)
-      mWWatch->SetActiveWindow(win);
-
-    /* Activate the window itself. Note that this method can be called during
-       window creation before the PresShell exists (for ex, Windows apps
-       responding to WM_ACTIVATE), which case nsGlobalWindow::Activate()
-       will return early.
-    */
-    nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(win);
-    if (privateDOMWindow)
-      privateDOMWindow->Activate();
-  }
-
-  mActivating = PR_FALSE;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  nsCOMPtr<nsIDOMWindow> window = do_GetInterface(mDocShell);
+  if (fm && window)
+    return fm->WindowRaised(window);
   return NS_OK;
 }
 
 /* void deactivate (); */
 NS_IMETHODIMP nsWebBrowser::Deactivate(void)
 {
-  /* At this time we don't clear mWWatch's ActiveWindow; we just allow
-     the presumed other newly active window to set it when it comes in.
-     This seems harmless and maybe safer, but we have no real evidence
-     either way just yet. */
-
-  nsCOMPtr<nsIDOMWindow> domWindow;
-  GetContentDOMWindow(getter_AddRefs(domWindow));
-  if (domWindow) {
-    nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(domWindow);
-    if(privateDOMWindow) {
-      nsIFocusController *focusController =
-          privateDOMWindow->GetRootFocusController();
-      if (focusController)
-        focusController->SetActive(PR_FALSE);
-      privateDOMWindow->Deactivate();
-    }
-  }
-
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  nsCOMPtr<nsIDOMWindow> window = do_GetInterface(mDocShell);
+  if (fm && window)
+    return fm->WindowLowered(window);
   return NS_OK;
 }
 
@@ -1852,59 +1780,40 @@ NS_IMETHODIMP nsWebBrowser::SetFocusAtLastElement(void)
 /* attribute nsIDOMWindow focusedWindow; */
 NS_IMETHODIMP nsWebBrowser::GetFocusedWindow(nsIDOMWindow * *aFocusedWindow)
 {
-    NS_ENSURE_ARG_POINTER(aFocusedWindow);
-    *aFocusedWindow = nsnull;
+  NS_ENSURE_ARG_POINTER(aFocusedWindow);
+  *aFocusedWindow = nsnull;
 
-    nsresult rv;
-    nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
+  nsCOMPtr<nsIDOMWindow> window = do_GetInterface(mDocShell);
+  NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
 
-    nsCOMPtr<nsIDOMWindow> domWindowExternal;
-    rv = GetContentDOMWindow(getter_AddRefs(domWindowExternal));
-    if (NS_FAILED(rv)) return rv;
-    nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindowExternal /*domWindow*/, &rv));
-    if (NS_FAILED(rv)) return rv;
-    
-    nsIFocusController *focusController = piWin->GetRootFocusController();
-    if (focusController)
-      rv = focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-    
-    *aFocusedWindow = focusedWindow;
-    NS_IF_ADDREF(*aFocusedWindow);
-    
-    return *aFocusedWindow ? NS_OK : NS_ERROR_FAILURE;
+  nsCOMPtr<nsIDOMElement> focusedElement;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  return fm ? fm->GetFocusedElementForWindow(window, PR_TRUE, aFocusedWindow,
+                                             getter_AddRefs(focusedElement)) : NS_OK;
 }
+
 NS_IMETHODIMP nsWebBrowser::SetFocusedWindow(nsIDOMWindow * aFocusedWindow)
 {
-  return NS_OK;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  return fm ? fm->SetFocusedWindow(aFocusedWindow) : NS_OK;
 }
 
 /* attribute nsIDOMElement focusedElement; */
 NS_IMETHODIMP nsWebBrowser::GetFocusedElement(nsIDOMElement * *aFocusedElement)
 {
   NS_ENSURE_ARG_POINTER(aFocusedElement);
-  *aFocusedElement = nsnull;
-  
-  nsresult rv;
-  nsCOMPtr<nsIDOMElement> focusedElement;
 
-  nsCOMPtr<nsIDOMWindow> domWindowExternal;
-  rv = GetContentDOMWindow(getter_AddRefs(domWindowExternal));
-  if (NS_FAILED(rv)) return rv;
-  nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindowExternal, &rv));
-  if (NS_FAILED(rv)) return rv;
+  nsCOMPtr<nsIDOMWindow> window = do_GetInterface(mDocShell);
+  NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
 
-  nsIFocusController *focusController = piWin->GetRootFocusController();
-  if (focusController)
-  rv = focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-
-  *aFocusedElement = focusedElement;
-  NS_IF_ADDREF(*aFocusedElement);
-  return *aFocusedElement ? NS_OK : NS_ERROR_FAILURE;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  return fm ? fm->GetFocusedElementForWindow(window, PR_TRUE, nsnull, aFocusedElement) : NS_OK;
 }
 
 NS_IMETHODIMP nsWebBrowser::SetFocusedElement(nsIDOMElement * aFocusedElement)
 {
-  return NS_OK;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  return fm ? fm->SetFocus(aFocusedElement, 0) : NS_OK;
 }
 
 //*****************************************************************************
diff --git a/embedding/components/commandhandler/src/nsCommandManager.cpp b/embedding/components/commandhandler/src/nsCommandManager.cpp
index 97a2dd41bb2f..066fb4a841cd 100644
--- a/embedding/components/commandhandler/src/nsCommandManager.cpp
+++ b/embedding/components/commandhandler/src/nsCommandManager.cpp
@@ -52,6 +52,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIFocusController.h"
+#include "nsIFocusManager.h"
 
 #include "nsCOMArray.h"
 
@@ -345,16 +346,6 @@ nsCommandManager::GetControllerForCommand(const char *aCommand,
   if (!focusController)
     return NS_ERROR_FAILURE;
 
-  nsCOMPtr<nsIDOMWindowInternal> focusWindowInternal;
-  rv = focusController->GetFocusedWindow(getter_AddRefs(focusWindowInternal));
-  if (NS_FAILED(rv))
-    return rv;
-
-  // get the destination window so we can check if it's in content or chrome
-  nsCOMPtr<nsIDOMWindow> destWindow = do_QueryInterface(focusWindowInternal);
-  if (!destWindow)
-    return NS_ERROR_FAILURE;
-
   // no target window; send command to focus controller
   return focusController->GetControllerForCommand(aCommand, outController);
 }
diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp
index f917b377e35f..d899fbd9a3b6 100644
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@@ -75,6 +75,7 @@
 #include "nsITimelineService.h"
 #include "nsFind.h"
 #include "nsDOMError.h"
+#include "nsFocusManager.h"
 
 #if DEBUG
 #include "nsIWebNavigation.h"
@@ -371,44 +372,19 @@ NS_IMETHODIMP nsWebBrowserFind::SetMatchCase(PRBool aMatchCase)
     return NS_OK;
 }
 
-// Same as the tail-end of nsEventStateManager::FocusElementButNotDocument.
-// Used here because nsEventStateManager::MoveFocusToCaret() doesn't
-// support text input controls.
-static void
-FocusElementButNotDocument(nsIDocument* aDocument, nsIContent* aContent)
+static PRBool
+IsInNativeAnonymousSubtree(nsIContent* aContent)
 {
-  nsIFocusController *focusController = nsnull;
-  nsPIDOMWindow *ourWindow = aDocument->GetWindow();
-  if (ourWindow)
-    focusController = ourWindow->GetRootFocusController();
-  if (!focusController)
-    return;
+    while (aContent) {
+        nsIContent* bindingParent = aContent->GetBindingParent();
+        if (bindingParent == aContent) {
+            return PR_TRUE;
+        }
 
-  // Get previous focus
-  nsCOMPtr<nsIDOMElement> oldFocusedElement;
-  focusController->GetFocusedElement(getter_AddRefs(oldFocusedElement));
-  nsCOMPtr<nsIContent> oldFocusedContent =
-    do_QueryInterface(oldFocusedElement);
+        aContent = bindingParent;
+    }
 
-  // Notify focus controller of new focus for this document
-  nsCOMPtr<nsIDOMElement> newFocusedElement(do_QueryInterface(aContent));
-  focusController->SetFocusedElement(newFocusedElement);
-
-  nsIPresShell* presShell = aDocument->GetPrimaryShell();
-  nsIEventStateManager* esm = presShell->GetPresContext()->EventStateManager();
-
-  // Temporarily set esm::mCurrentFocus so that esm::GetContentState() tells 
-  // layout system to show focus on this element. 
-  esm->SetFocusedContent(aContent);  // Reset back to null at the end.
-  aDocument->BeginUpdate(UPDATE_CONTENT_STATE);
-  aDocument->ContentStatesChanged(oldFocusedContent, aContent, 
-                                  NS_EVENT_STATE_FOCUS);
-  aDocument->EndUpdate(UPDATE_CONTENT_STATE);
-
-  // Reset esm::mCurrentFocus = nsnull for this doc, so when this document
-  // does get focus next time via preHandleEvent() NS_GOTFOCUS,
-  // the old document gets blurred
-  esm->SetFocusedContent(nsnull);
+    return PR_FALSE;
 }
 
 void nsWebBrowserFind::SetSelectionAndScroll(nsIDOMWindow* aWindow,
@@ -436,7 +412,7 @@ void nsWebBrowserFind::SetSelectionAndScroll(nsIDOMWindow* aWindow,
   // <textarea> or text <input>, we need to get the outer frame
   nsITextControlFrame *tcFrame = nsnull;
   for ( ; content; content = content->GetParent()) {
-    if (!content->IsInNativeAnonymousSubtree()) {
+    if (!IsInNativeAnonymousSubtree(content)) {
       nsIFrame* f = presShell->GetPrimaryFrameFor(content);
       if (!f)
         return;
@@ -454,14 +430,18 @@ void nsWebBrowserFind::SetSelectionAndScroll(nsIDOMWindow* aWindow,
     selection->RemoveAllRanges();
     selection->AddRange(aRange);
 
-    if (tcFrame) {
-      FocusElementButNotDocument(doc, content);
-    }
-    else {
-      nsCOMPtr<nsPresContext> presContext = presShell->GetPresContext();
-      PRBool isSelectionWithFocus;
-      presContext->EventStateManager()->
-        MoveFocusToCaret(PR_TRUE, &isSelectionWithFocus);
+    nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+    if (fm) {
+      if (tcFrame) {
+        nsCOMPtr<nsIDOMElement> newFocusedElement(do_QueryInterface(content));
+        fm->SetFocus(newFocusedElement, nsIFocusManager::FLAG_NOSCROLL);
+      }
+      else  {
+        nsCOMPtr<nsIDOMElement> result;
+        fm->MoveFocus(aWindow, nsnull, nsIFocusManager::MOVEFOCUS_CARET,
+                      nsIFocusManager::FLAG_NOSCROLL,
+                      getter_AddRefs(result));
+      }
     }
 
     // Scroll if necessary to make the selection visible:
@@ -862,21 +842,16 @@ nsWebBrowserFind::GetFrameSelection(nsIDOMWindow* aWindow,
     nsPresContext *presContext = presShell->GetPresContext();
 
     nsIFrame *frame = nsnull;
-    presContext->EventStateManager()->GetFocusedFrame(&frame);
-    if (!frame) {
-        nsPIDOMWindow *ourWindow = doc->GetWindow();
-        if (ourWindow) {
-            nsIFocusController *focusController =
-                ourWindow->GetRootFocusController();
-            if (focusController) {
-                nsCOMPtr<nsIDOMElement> focusedElement;
-                focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-                if (focusedElement) {
-                    nsCOMPtr<nsIContent> content(do_QueryInterface(focusedElement));
-                    frame = presShell->GetPrimaryFrameFor(content);
-                }
-            }
-        }
+    nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+    if (fm) {
+      nsCOMPtr<nsIDOMElement> focusedElement;
+      fm->GetFocusedElement(getter_AddRefs(focusedElement));
+      nsCOMPtr<nsIContent> focusedContent(do_QueryInterface(focusedElement));
+      if (focusedContent) {
+        frame = presShell->GetPrimaryFrameFor(focusedContent);
+        if (frame && frame->PresContext() != presContext)
+          frame = nsnull;
+      }
     }
 
     nsCOMPtr<nsISelectionController> selCon;
@@ -917,16 +892,18 @@ nsresult nsWebBrowserFind::OnFind(nsIDOMWindow *aFoundWindow)
     if (lastFocusedWindow && lastFocusedWindow != aFoundWindow)
         ClearFrameSelection(lastFocusedWindow);
 
-    // focus the frame we found in
-    nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(aFoundWindow);
-    nsIFocusController *focusController = nsnull;
-    if (ourWindow)
-        focusController = ourWindow->GetRootFocusController();
-    if (focusController)
-    {
-        nsCOMPtr<nsIDOMWindowInternal> windowInt = do_QueryInterface(aFoundWindow);
-        focusController->SetFocusedWindow(windowInt);
-        mLastFocusedWindow = do_GetWeakReference(aFoundWindow);
+    nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+    if (fm) {
+      // get the containing frame and focus it. For top-level windows,
+      // the right window should already be focused.
+      nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aFoundWindow));
+      NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
+
+      nsCOMPtr<nsIDOMElement> frameElement = window->GetFrameElementInternal();
+      if (frameElement)
+        fm->SetFocus(frameElement, 0);
+
+      mLastFocusedWindow = do_GetWeakReference(aFoundWindow);
     }
 
     return NS_OK;
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index 37292311d7c9..4631be3956b4 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -89,6 +89,7 @@
 #include "nsIDOMStorage.h"
 #include "nsPIDOMStorage.h"
 #include "nsIWidget.h"
+#include "nsFocusManager.h"
 
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
@@ -337,7 +338,6 @@ NS_IMPL_QUERY_INTERFACE4(nsWindowWatcher,
 nsWindowWatcher::nsWindowWatcher() :
         mEnumeratorList(),
         mOldestWindow(0),
-        mActiveWindow(0),
         mListLock(0)
 {
 }
@@ -1106,32 +1106,20 @@ nsWindowWatcher::SetWindowCreator(nsIWindowCreator *creator)
 NS_IMETHODIMP
 nsWindowWatcher::GetActiveWindow(nsIDOMWindow **aActiveWindow)
 {
-  if (!aActiveWindow)
-    return NS_ERROR_INVALID_ARG;
-
-  *aActiveWindow = mActiveWindow;
-  NS_IF_ADDREF(mActiveWindow);
+  *aActiveWindow = nsnull;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  if (fm)
+    return fm->GetActiveWindow(aActiveWindow);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsWindowWatcher::SetActiveWindow(nsIDOMWindow *aActiveWindow)
 {
-#ifdef DEBUG
-  {
-    nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(aActiveWindow));
-
-    NS_ASSERTION(!win || win->IsOuterWindow(),
-                 "Uh, the active window must be an outer window!");
-  }
-#endif
-
-  if (FindWindowEntry(aActiveWindow)) {
-    mActiveWindow = aActiveWindow;
-    return NS_OK;
-  }
-  NS_ERROR("invalid active window");
-  return NS_ERROR_FAILURE;
+  nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+  if (fm)
+    return fm->SetActiveWindow(aActiveWindow);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -1263,10 +1251,6 @@ nsresult nsWindowWatcher::RemoveWindow(nsWatcherWindowEntry *inInfo)
     if (inInfo == mOldestWindow)
       mOldestWindow = inInfo->mYounger == mOldestWindow ? 0 : inInfo->mYounger;
     inInfo->Unlink();
-
-    // clear the active window, if they're the same
-    if (mActiveWindow == inInfo->mWindow)
-      mActiveWindow = 0;
   }
 
   // a window being removed from us signifies a newly closed window.
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.h b/embedding/components/windowwatcher/src/nsWindowWatcher.h
index e8f8707f0bec..50eef22a2379 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.h
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.h
@@ -146,7 +146,6 @@ private:
 
   nsTArray<nsWatcherWindowEnumerator*> mEnumeratorList;
   nsWatcherWindowEntry *mOldestWindow;
-  nsIDOMWindow         *mActiveWindow;
   PRLock               *mListLock;
 
   nsCOMPtr<nsIWindowCreator> mWindowCreator;
diff --git a/js/src/imacros.c.out b/js/src/imacros.c.out
index 168d706a7979..6f350f38871b 100644
--- a/js/src/imacros.c.out
+++ b/js/src/imacros.c.out
@@ -949,6 +949,11 @@ uint8 js_opcode2extra[JSOP_LIMIT] = {
     0,  /* JSOP_LAMBDA_FC */
     0,  /* JSOP_OBJTOP */
     0,  /* JSOP_LOOP */
+    0,  /* JSOP_GETUPVAR_DBG */
+    0,  /* JSOP_CALLUPVAR_DBG */
+    0,  /* JSOP_DEFFUN_DBGFC */
+    0,  /* JSOP_DEFLOCALFUN_DBGFC */
+    0,  /* JSOP_LAMBDA_DBGFC */
 };
 #define JSOP_IS_IMACOP(x) (0 \
  || x == JSOP_BITOR \
diff --git a/js/src/js.msg b/js/src/js.msg
index 7b995d2a5dec..6a564531cc00 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -192,7 +192,7 @@ MSG_DEF(JSMSG_SEMI_BEFORE_STMNT,      109, 0, JSEXN_SYNTAXERR, "missing ; before
 MSG_DEF(JSMSG_NO_RETURN_VALUE,        110, 1, JSEXN_TYPEERR, "function {0} does not always return a value")
 MSG_DEF(JSMSG_DUPLICATE_FORMAL,       111, 1, JSEXN_TYPEERR, "duplicate formal argument {0}")
 MSG_DEF(JSMSG_EQUAL_AS_ASSIGN,        112, 1, JSEXN_SYNTAXERR, "test for equality (==) mistyped as assignment (=)?{0}")
-MSG_DEF(JSMSG_UNUSED113,              113, 0, JSEXN_NONE, "unused113")
+MSG_DEF(JSMSG_OPTIMIZED_CLOSURE_LEAK, 113, 0, JSEXN_INTERNALERR, "cannot access optimized closure")
 MSG_DEF(JSMSG_TOO_MANY_DEFAULTS,      114, 0, JSEXN_SYNTAXERR, "more than one switch default")
 MSG_DEF(JSMSG_TOO_MANY_CASES,         115, 0, JSEXN_INTERNALERR, "too many switch cases")
 MSG_DEF(JSMSG_BAD_SWITCH,             116, 0, JSEXN_SYNTAXERR, "invalid switch statement")
@@ -309,6 +309,4 @@ MSG_DEF(JSMSG_EVAL_ARITY,             226, 0, JSEXN_TYPEERR, "eval accepts only
 MSG_DEF(JSMSG_MISSING_FUN_ARG,        227, 2, JSEXN_TYPEERR, "missing argument {0} when calling function {1}")
 MSG_DEF(JSMSG_JSON_BAD_PARSE,         228, 0, JSEXN_SYNTAXERR, "JSON.parse")
 MSG_DEF(JSMSG_JSON_BAD_STRINGIFY,     229, 0, JSEXN_ERR, "JSON.stringify")
-
-
-
+MSG_DEF(JSMSG_XDR_CLOSURE_WRAPPER,    230, 1, JSEXN_INTERNALERR, "can't XDR closure wrapper for function {0}")
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 88ff6e2b036a..28d309f3fb5d 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -646,11 +646,7 @@ JS_TypeOfValue(JSContext *cx, jsval v)
         type = JSTYPE_OBJECT;           /* XXXbe JSTYPE_NULL for JS2 */
         obj = JSVAL_TO_OBJECT(v);
         if (obj) {
-            JSObject *wrapped;
-
-            wrapped = js_GetWrappedObject(cx, obj);
-            if (wrapped)
-                obj = wrapped;
+            obj = js_GetWrappedObject(cx, obj);
 
             ops = obj->map->ops;
 #if JS_HAS_XML_SUPPORT
@@ -1362,11 +1358,11 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
 }
 
 #define CLASP(name)                 (&js_##name##Class)
-#define EXT_CLASP(name)             (&js_##name##Class.base)
+#define XCLASP(name)                (&js_##name##Class.base)
 #define EAGER_ATOM(name)            ATOM_OFFSET(name), NULL
 #define EAGER_CLASS_ATOM(name)      CLASS_ATOM_OFFSET(name), NULL
 #define EAGER_ATOM_AND_CLASP(name)  EAGER_CLASS_ATOM(name), CLASP(name)
-#define EAGER_ATOM_AND_EXT_CLASP(name) EAGER_CLASS_ATOM(name), EXT_CLASP(name)
+#define EAGER_ATOM_AND_XCLASP(name) EAGER_CLASS_ATOM(name), XCLASP(name)
 #define LAZY_ATOM(name)             ATOM_OFFSET(lazy.name), js_##name##_str
 
 typedef struct JSStdName {
@@ -1415,8 +1411,8 @@ static JSStdName standard_class_atoms[] = {
 #endif
 #if JS_HAS_XML_SUPPORT
     {js_InitXMLClass,                   EAGER_ATOM_AND_CLASP(XML)},
-    {js_InitNamespaceClass,             EAGER_ATOM_AND_EXT_CLASP(Namespace)},
-    {js_InitQNameClass,                 EAGER_ATOM_AND_EXT_CLASP(QName)},
+    {js_InitNamespaceClass,             EAGER_ATOM_AND_XCLASP(Namespace)},
+    {js_InitQNameClass,                 EAGER_ATOM_AND_XCLASP(QName)},
 #endif
 #if JS_HAS_FILE_OBJECT
     {js_InitFileClass,                  EAGER_ATOM_AND_CLASP(File)},
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index 5e1ffd6064ef..e9e8123e12b4 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -60,6 +60,7 @@
 #include "jsparse.h"
 #include "jsscope.h"
 #include "jsscript.h"
+#include "jsstaticcheck.h"
 #include "jsstr.h"
 
 #include "jsautooplen.h"
@@ -684,7 +685,6 @@ js_watch_set_wrapper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
     jsval userid;
 
     funobj = JSVAL_TO_OBJECT(argv[-2]);
-    JS_ASSERT(OBJ_GET_CLASS(cx, funobj) == &js_FunctionClass);
     wrapper = GET_FUNCTION_PRIVATE(cx, funobj);
     userid = ATOM_KEY(wrapper->atom);
     *rval = argv[0];
@@ -1156,7 +1156,7 @@ JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fp)
     if (!fp->fun)
         return NULL;
 
-    JS_ASSERT(OBJ_GET_CLASS(cx, fp->callee) == &js_FunctionClass);
+    JS_ASSERT(HAS_FUNCTION_CLASS(fp->callee));
     JS_ASSERT(OBJ_GET_PRIVATE(cx, fp->callee) == fp->fun);
     return fp->callee;
 }
@@ -1242,6 +1242,9 @@ JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
                           const char *filename, uintN lineno,
                           jsval *rval)
 {
+    JS_ASSERT_NOT_ON_TRACE(cx);
+    JS_ASSERT(cx->fp);
+
     JSObject *scobj;
     JSScript *script;
     JSBool ok;
@@ -1261,11 +1264,28 @@ JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
                                        TCF_PUT_STATIC_LEVEL(JS_DISPLAY_SIZE),
                                        chars, length, NULL,
                                        filename, lineno);
+
     if (!script)
         return JS_FALSE;
 
+    JSStackFrame *displayCopy[JS_DISPLAY_SIZE];
+    if (cx->fp != fp) {
+        memcpy(displayCopy, cx->display, sizeof displayCopy);
+
+        /* This API requires an active fp on cx, so fp2 can't go null here. */
+        for (JSStackFrame *fp2 = cx->fp; fp2 != fp; fp2 = fp2->down) {
+            if (fp2->displaySave) {
+                JS_ASSERT(fp2->script->staticLevel < JS_DISPLAY_SIZE);
+                cx->display[fp2->script->staticLevel] = fp2->displaySave;
+            }
+        }
+    }
+
     ok = js_Execute(cx, scobj, script, fp, JSFRAME_DEBUGGER | JSFRAME_EVAL,
                     rval);
+
+    if (cx->fp != fp)
+        memcpy(cx->display, displayCopy, sizeof cx->display);
     js_DestroyScript(cx, script);
     return ok;
 }
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index a8525a5816c7..764ee150f041 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -1987,13 +1987,29 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
      * pre-increment and pre-decrement ops, our caller will have to emit
      * JSOP_POS, JSOP_ONE, and JSOP_ADD as well).
      *
-     * Leave JSOP_DELNAME as is so it can be turned into JSOP_FALSE as
-     * appropriate, further below.
+     * Turn JSOP_DELNAME into JSOP_FALSE if dn is known, as all declared
+     * bindings visible to the compiler are permanent in JS unless the
+     * declaration originates in eval code. We detect eval code by testing
+     * cg->compiler->callerFrame, which is set only by eval or a debugger
+     * equivalent.
+     *
+     * Note that this callerFrame non-null test must be qualified by testing
+     * !cg->funbox to exclude function code nested in eval code, which is not
+     * subject to the deletable binding exception.
      */
     switch (op) {
       case JSOP_NAME:
       case JSOP_SETCONST:
+        break;
       case JSOP_DELNAME:
+        if (dn_kind != JSDefinition::UNKNOWN) {
+            if (cg->compiler->callerFrame && !cg->funbox)
+                JS_ASSERT(cg->flags & TCF_COMPILE_N_GO);
+            else
+                pn->pn_op = JSOP_FALSE;
+            pn->pn_dflags |= PND_BOUND;
+            return JS_TRUE;
+        }
         break;
       default:
         if (pn->isConst())
@@ -2127,6 +2143,7 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
         JS_ASSERT(cg->flags & TCF_IN_FUNCTION);
         JS_ASSERT(cg->lexdeps.lookup(atom));
         JS_ASSERT(JOF_OPTYPE(op) == JOF_ATOM);
+        JS_ASSERT(cg->fun->u.i.skipmin <= skip);
 
         /*
          * If op is a mutating opcode, this upvar's static level is too big to
@@ -2227,7 +2244,6 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
           case JSOP_DECNAME:  op = JSOP_DECLOCAL; break;
           case JSOP_NAMEDEC:  op = JSOP_LOCALDEC; break;
           case JSOP_FORNAME:  op = JSOP_FORLOCAL; break;
-          case JSOP_DELNAME:  op = JSOP_FALSE; break;
           default: JS_NOT_REACHED("let");
         }
         break;
@@ -2241,7 +2257,6 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
           case JSOP_DECNAME:  op = JSOP_DECARG; break;
           case JSOP_NAMEDEC:  op = JSOP_ARGDEC; break;
           case JSOP_FORNAME:  op = JSOP_FORARG; break;
-          case JSOP_DELNAME:  op = JSOP_FALSE; break;
           default: JS_NOT_REACHED("arg");
         }
         JS_ASSERT(!pn->isConst());
@@ -2253,10 +2268,6 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
             JS_ASSERT((cg->fun->flags & JSFUN_LAMBDA) && atom == cg->fun->atom);
 
             switch (op) {
-              case JSOP_DELNAME:
-                if (!(cg->flags & TCF_FUN_HEAVYWEIGHT))
-                    op = JSOP_FALSE;
-                break;
               default:
                 /*
                  * Leave pn->pn_op == JSOP_NAME if cg->fun is heavyweight, as
@@ -2269,6 +2280,7 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
                  * lexically bound in an outer declarative environment from the
                  * function's activation. See jsfun.cpp:call_resolve.
                  */
+                JS_ASSERT(op != JSOP_DELNAME);
                 if (!(cg->flags & TCF_FUN_HEAVYWEIGHT)) {
                     op = JSOP_CALLEE;
                     pn->pn_dflags |= PND_CONST;
@@ -2294,7 +2306,6 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
           case JSOP_DECNAME:  op = JSOP_DECLOCAL; break;
           case JSOP_NAMEDEC:  op = JSOP_LOCALDEC; break;
           case JSOP_FORNAME:  op = JSOP_FORLOCAL; break;
-          case JSOP_DELNAME:  op = JSOP_FALSE; break;
           default: JS_NOT_REACHED("local");
         }
         JS_ASSERT_IF(dn_kind == JSDefinition::CONST, pn->pn_dflags & PND_CONST);
@@ -6749,6 +6760,10 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
         if (pn->pn_arity == PN_LIST) {
             JS_ASSERT(pn->pn_count != 0);
             for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
+                if (pn2->pn_type == TOK_LC &&
+                    js_Emit1(cx, cg, JSOP_STARTXMLEXPR) < 0) {
+                    return JS_FALSE;
+                }
                 if (!js_EmitTree(cx, cg, pn2))
                     return JS_FALSE;
                 if (pn2 != pn->pn_head && js_Emit1(cx, cg, JSOP_ADD) < 0)
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 392f2fd1f279..40e1f1974591 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -365,6 +365,174 @@ args_delProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
     return JS_TRUE;
 }
 
+static JS_REQUIRES_STACK JSObject *
+WrapEscapingClosure(JSContext *cx, JSStackFrame *fp, JSObject *funobj, JSFunction *fun)
+{
+    JS_ASSERT(GET_FUNCTION_PRIVATE(cx, funobj) == fun);
+    JS_ASSERT(fun->optimizedClosure());
+    JS_ASSERT(!fun->u.i.wrapper);
+
+    /*
+     * We do not attempt to reify Call and Block objects on demand for outer
+     * scopes. This could be done (see the "v8" patch in bug 494235) but it is
+     * fragile in the face of ongoing compile-time optimization. Instead, the
+     * _DBG* opcodes used by wrappers created here must cope with unresolved
+     * upvars and throw them as reference errors. Caveat debuggers!
+     */
+    JSObject *scopeChain = js_GetScopeChain(cx, fp);
+    if (!scopeChain)
+        return NULL;
+
+    JSObject *wfunobj = js_NewObjectWithGivenProto(cx, &js_FunctionClass,
+                                                   funobj, scopeChain, 0);
+    if (!wfunobj)
+        return NULL;
+    JSAutoTempValueRooter tvr(cx, wfunobj);
+
+    JSFunction *wfun = (JSFunction *) wfunobj;
+    wfunobj->fslots[JSSLOT_PRIVATE] = PRIVATE_TO_JSVAL(wfun);
+    wfun->nargs = 0;
+    wfun->flags = fun->flags | JSFUN_HEAVYWEIGHT;
+    wfun->u.i.nvars = 0;
+    wfun->u.i.nupvars = 0;
+    wfun->u.i.skipmin = fun->u.i.skipmin;
+    wfun->u.i.wrapper = true;
+    wfun->u.i.script = NULL;
+    wfun->u.i.names.taggedAtom = NULL;
+    wfun->atom = fun->atom;
+
+    if (fun->hasLocalNames()) {
+        void *mark = JS_ARENA_MARK(&cx->tempPool);
+        jsuword *names = js_GetLocalNameArray(cx, fun, &cx->tempPool);
+        if (!names)
+            return NULL;
+
+        JSBool ok = true;
+        for (uintN i = 0, n = fun->countLocalNames(); i != n; i++) {
+            jsuword name = names[i];
+            JSAtom *atom = JS_LOCAL_NAME_TO_ATOM(name);
+            JSLocalKind localKind = (i < fun->nargs)
+                                    ? JSLOCAL_ARG
+                                    : (i < fun->countArgsAndVars())
+                                    ? (JS_LOCAL_NAME_IS_CONST(name)
+                                       ? JSLOCAL_CONST
+                                       : JSLOCAL_VAR)
+                                    : JSLOCAL_UPVAR;
+
+            ok = js_AddLocal(cx, wfun, atom, localKind);
+            if (!ok)
+                break;
+        }
+
+        JS_ARENA_RELEASE(&cx->tempPool, mark);
+        if (!ok)
+            return NULL;
+        JS_ASSERT(wfun->nargs == fun->nargs);
+        JS_ASSERT(wfun->u.i.nvars == fun->u.i.nvars);
+        JS_ASSERT(wfun->u.i.nupvars == fun->u.i.nupvars);
+        js_FreezeLocalNames(cx, wfun);
+    }
+
+    JSScript *script = fun->u.i.script;
+    jssrcnote *snbase = SCRIPT_NOTES(script);
+    jssrcnote *sn = snbase;
+    while (!SN_IS_TERMINATOR(sn))
+        sn = SN_NEXT(sn);
+    uintN nsrcnotes = (sn - snbase) + 1;
+
+    /* NB: GC must not occur before wscript is homed in wfun->u.i.script. */
+    JSScript *wscript = js_NewScript(cx, script->length, nsrcnotes,
+                                     script->atomMap.length,
+                                     (script->objectsOffset != 0)
+                                     ? JS_SCRIPT_OBJECTS(script)->length
+                                     : 0,
+                                     fun->u.i.nupvars,
+                                     (script->regexpsOffset != 0)
+                                     ? JS_SCRIPT_REGEXPS(script)->length
+                                     : 0,
+                                     (script->trynotesOffset != 0)
+                                     ? JS_SCRIPT_TRYNOTES(script)->length
+                                     : 0);
+    if (!wscript)
+        return NULL;
+
+    memcpy(wscript->code, script->code, script->length);
+    wscript->main = wscript->code + (script->main - script->code);
+
+    memcpy(SCRIPT_NOTES(wscript), snbase, nsrcnotes);
+    memcpy(wscript->atomMap.vector, script->atomMap.vector,
+           wscript->atomMap.length * sizeof(JSAtom *));
+    if (script->objectsOffset != 0) {
+        memcpy(JS_SCRIPT_OBJECTS(wscript)->vector, JS_SCRIPT_OBJECTS(script)->vector,
+               JS_SCRIPT_OBJECTS(wscript)->length * sizeof(JSObject *));
+    }
+    if (script->regexpsOffset != 0) {
+        memcpy(JS_SCRIPT_REGEXPS(wscript)->vector, JS_SCRIPT_REGEXPS(script)->vector,
+               JS_SCRIPT_REGEXPS(wscript)->length * sizeof(JSObject *));
+    }
+    if (script->trynotesOffset != 0) {
+        memcpy(JS_SCRIPT_TRYNOTES(wscript)->vector, JS_SCRIPT_TRYNOTES(script)->vector,
+               JS_SCRIPT_TRYNOTES(wscript)->length * sizeof(JSTryNote));
+    }
+
+    if (wfun->u.i.nupvars != 0) {
+        JS_ASSERT(wfun->u.i.nupvars == JS_SCRIPT_UPVARS(wscript)->length);
+        memcpy(JS_SCRIPT_UPVARS(wscript)->vector, JS_SCRIPT_UPVARS(script)->vector,
+               wfun->u.i.nupvars * sizeof(uint32));
+    }
+
+    jsbytecode *pc = wscript->code;
+    while (*pc != JSOP_STOP) {
+        /* XYZZYbe should copy JSOP_TRAP? */
+        JSOp op = js_GetOpcode(cx, wscript, pc);
+        const JSCodeSpec *cs = &js_CodeSpec[op];
+        ptrdiff_t oplen = cs->length;
+        if (oplen < 0)
+            oplen = js_GetVariableBytecodeLength(pc);
+
+        /*
+         * Rewrite JSOP_{GET,CALL}DSLOT as JSOP_{GET,CALL}UPVAR_DBG for the
+         * case where fun is an escaping flat closure. This works because the
+         * UPVAR and DSLOT ops by design have the same format: an upvar index
+         * immediate operand.
+         */
+        switch (op) {
+          case JSOP_GETUPVAR:       *pc = JSOP_GETUPVAR_DBG; break;
+          case JSOP_CALLUPVAR:      *pc = JSOP_CALLUPVAR_DBG; break;
+          case JSOP_GETDSLOT:       *pc = JSOP_GETUPVAR_DBG; break;
+          case JSOP_CALLDSLOT:      *pc = JSOP_CALLUPVAR_DBG; break;
+          case JSOP_DEFFUN_FC:      *pc = JSOP_DEFFUN_DBGFC; break;
+          case JSOP_DEFLOCALFUN_FC: *pc = JSOP_DEFLOCALFUN_DBGFC; break;
+          case JSOP_LAMBDA_FC:      *pc = JSOP_LAMBDA_DBGFC; break;
+          default:;
+        }
+        pc += oplen;
+    }
+
+    /*
+     * Fill in the rest of wscript. This means if you add members to JSScript
+     * you must update this code. FIXME: factor into JSScript::clone method.
+     */
+    wscript->flags = script->flags;
+    wscript->version = script->version;
+    wscript->nfixed = script->nfixed;
+    wscript->filename = script->filename;
+    wscript->lineno = script->lineno;
+    wscript->nslots = script->nslots;
+    wscript->staticLevel = script->staticLevel;
+    wscript->principals = script->principals;
+    if (wscript->principals)
+        JSPRINCIPALS_HOLD(cx, wscript->principals);
+#ifdef CHECK_SCRIPT_OWNER
+    wscript->owner = script->owner;
+#endif
+
+    /* Deoptimize wfun from FUN_{FLAT,NULL}_CLOSURE to FUN_INTERPRETED. */
+    FUN_SET_KIND(wfun, JSFUN_INTERPRETED);
+    wfun->u.i.script = wscript;
+    return wfunobj;
+}
+
 static JSBool
 args_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 {
@@ -382,8 +550,22 @@ args_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
     slot = JSVAL_TO_INT(id);
     switch (slot) {
       case ARGS_CALLEE:
-        if (!TEST_OVERRIDE_BIT(fp, slot))
+        if (!TEST_OVERRIDE_BIT(fp, slot)) {
+            /*
+             * If this function or one in it needs upvars that reach above it
+             * in the scope chain, it must not be a null closure (it could be a
+             * flat closure, or an unoptimized closure -- the latter itself not
+             * necessarily heavyweight). Rather than wrap here, we simply throw
+             * to reduce code size and tell debugger users the truth instead of
+             * passing off a fibbing wrapper.
+             */
+            if (fp->fun->needsWrapper()) {
+                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+                                     JSMSG_OPTIMIZED_CLOSURE_LEAK);
+                return JS_FALSE;
+            }
             *vp = OBJECT_TO_JSVAL(fp->callee);
+        }
         break;
 
       case ARGS_LENGTH:
@@ -590,14 +772,60 @@ JSClass js_ArgumentsClass = {
 #define JSSLOT_CALL_ARGUMENTS            (JSSLOT_PRIVATE + 2)
 #define CALL_CLASS_FIXED_RESERVED_SLOTS  2
 
+/*
+ * A Declarative Environment object stores its active JSStackFrame pointer in
+ * its private slot, just as Call and Arguments objects do.
+ */
 JSClass js_DeclEnvClass = {
     js_Object_str,
-    JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
+    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
     JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
     JSCLASS_NO_OPTIONAL_MEMBERS
 };
 
+static JS_REQUIRES_STACK JSBool
+CheckForEscapingClosure(JSContext *cx, JSObject *obj, jsval *vp)
+{
+    JS_ASSERT(STOBJ_GET_CLASS(obj) == &js_CallClass ||
+              STOBJ_GET_CLASS(obj) == &js_DeclEnvClass);
+
+    jsval v = *vp;
+
+    if (VALUE_IS_FUNCTION(cx, v)) {
+        JSObject *funobj = JSVAL_TO_OBJECT(v);
+        JSFunction *fun = GET_FUNCTION_PRIVATE(cx, funobj);
+
+        /*
+         * Any escaping null or flat closure that reaches above itself or
+         * contains nested functions that reach above it must be wrapped.
+         * We can wrap only when this Call or Declarative Environment obj
+         * still has an active stack frame associated with it.
+         */
+        if (fun->needsWrapper()) {
+            JSStackFrame *fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
+            if (fp) {
+                JSObject *wrapper = WrapEscapingClosure(cx, fp, funobj, fun);
+                if (!wrapper)
+                    return false;
+                *vp = OBJECT_TO_JSVAL(wrapper);
+                return true;
+            }
+
+            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+                                 JSMSG_OPTIMIZED_CLOSURE_LEAK);
+            return false;
+        }
+    }
+    return true;
+}
+
+static JS_REQUIRES_STACK JSBool
+CalleeGetter(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    return CheckForEscapingClosure(cx, obj, vp);
+}
+
 JSObject *
 js_GetCallObject(JSContext *cx, JSStackFrame *fp)
 {
@@ -628,11 +856,13 @@ js_GetCallObject(JSContext *cx, JSStackFrame *fp)
                                                    fp->scopeChain, 0);
         if (!env)
             return NULL;
+        env->fslots[JSSLOT_PRIVATE] = PRIVATE_TO_JSVAL(fp);
 
         /* Root env before js_DefineNativeProperty (-> JSClass.addProperty). */
         fp->scopeChain = env;
         if (!js_DefineNativeProperty(cx, fp->scopeChain, ATOM_TO_JSID(lambdaName),
-                                     OBJECT_TO_JSVAL(fp->callee), NULL, NULL,
+                                     OBJECT_TO_JSVAL(fp->callee),
+                                     CalleeGetter, NULL,
                                      JSPROP_PERMANENT | JSPROP_READONLY,
                                      0, 0, NULL)) {
             return NULL;
@@ -725,10 +955,18 @@ js_PutCallObject(JSContext *cx, JSStackFrame *fp)
     }
 
     /*
-     * Clear the private pointer to fp, which is about to go away (js_Invoke).
+     * Clear private pointers to fp, which is about to go away (js_Invoke).
      * Do this last because js_GetProperty calls above need to follow the
-     * private slot to find fp.
+     * call object's private slot to find fp.
      */
+    if ((fun->flags & JSFUN_LAMBDA) && fun->atom) {
+        JSObject *env = STOBJ_GET_PARENT(callobj);
+
+        JS_ASSERT(STOBJ_GET_CLASS(env) == &js_DeclEnvClass);
+        JS_ASSERT(STOBJ_GET_PRIVATE(env) == fp);
+        JS_SetPrivate(cx, env, NULL);
+    }
+
     JS_SetPrivate(cx, callobj, NULL);
     fp->callobj = NULL;
     return ok;
@@ -891,6 +1129,15 @@ js_GetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
     return CallPropertyOp(cx, obj, id, vp, JSCPK_VAR, JS_FALSE);
 }
 
+JSBool
+js_GetCallVarChecked(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    if (!CallPropertyOp(cx, obj, id, vp, JSCPK_VAR, JS_FALSE))
+        return JS_FALSE;
+
+    return CheckForEscapingClosure(cx, obj, vp);
+}
+
 static JSBool
 SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
 {
@@ -953,6 +1200,19 @@ call_resolve(JSContext *cx, JSObject *obj, jsval idval, uintN flags,
             setter = SetCallVar;
             if (localKind == JSLOCAL_CONST)
                 attrs |= JSPROP_READONLY;
+
+            /*
+             * Use js_GetCallVarChecked if the local's value is a null closure.
+             * This way we penalize performance only slightly on first use of a
+             * null closure, not on every use.
+             */
+            jsval v;
+            if (!CallPropertyOp(cx, obj, INT_TO_JSID((int16)slot), &v, JSCPK_VAR, JS_FALSE))
+                return JS_FALSE;
+            if (VALUE_IS_FUNCTION(cx, v) &&
+                GET_FUNCTION_PRIVATE(cx, JSVAL_TO_OBJECT(v))->needsWrapper()) {
+                getter = js_GetCallVarChecked;
+            }
         }
         if (!js_DefineNativeProperty(cx, obj, id, JSVAL_VOID, getter, setter,
                                      attrs, SPROP_HAS_SHORTID, (int16) slot,
@@ -1099,10 +1359,26 @@ fun_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         break;
 
       case FUN_CALLER:
-        if (fp && fp->down && fp->down->fun)
+        if (fp && fp->down && fp->down->fun) {
+            JSFunction *caller = fp->down->fun;
+            /*
+             * See equivalent condition in args_getProperty for ARGS_CALLEE,
+             * but here we do not want to throw, since this escape can happen
+             * via foo.caller alone, without any debugger or indirect eval. And
+             * it seems foo.caller is still used on the Web.
+             */
+            if (caller->needsWrapper()) {
+                JSObject *wrapper = WrapEscapingClosure(cx, fp->down, FUN_OBJECT(caller), caller);
+                if (!wrapper)
+                    return JS_FALSE;
+                *vp = OBJECT_TO_JSVAL(wrapper);
+                return JS_TRUE;
+            }
+
             *vp = OBJECT_TO_JSVAL(fp->down->callee);
-        else
+        } else {
             *vp = JSVAL_NULL;
+        }
         if (!JSVAL_IS_PRIMITIVE(*vp)) {
             callbacks = JS_GetSecurityCallbacks(cx);
             if (callbacks && callbacks->checkObjectAccess) {
@@ -1272,10 +1548,12 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
 {
     JSContext *cx;
     JSFunction *fun;
-    uint32 nullAtom;            /* flag to indicate if fun->atom is NULL */
+    uint32 firstword;           /* flag telling whether fun->atom is non-null,
+                                   plus for fun->u.i.skipmin, fun->u.i.wrapper,
+                                   and 14 bits reserved for future use */
     uintN nargs, nvars, nupvars, n;
-    uint32 localsword;          /* word to xdr argument and variable counts */
-    uint32 flagsword;           /* word to xdr upvars count and fun->flags */
+    uint32 localsword;          /* word for argument and variable counts */
+    uint32 flagsword;           /* word for fun->u.i.nupvars and fun->flags */
     JSTempValueRooter tvr;
     JSBool ok;
 
@@ -1288,7 +1566,14 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
                                  JS_GetFunctionName(fun));
             return JS_FALSE;
         }
-        nullAtom = !fun->atom;
+        if (fun->u.i.wrapper) {
+            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+                                 JSMSG_XDR_CLOSURE_WRAPPER,
+                                 JS_GetFunctionName(fun));
+            return JS_FALSE;
+        }
+        JS_ASSERT((fun->u.i.wrapper & ~1U) == 0);
+        firstword = (fun->u.i.skipmin << 2) | (fun->u.i.wrapper << 1) | !!fun->atom;
         nargs = fun->nargs;
         nvars = fun->u.i.nvars;
         nupvars = fun->u.i.nupvars;
@@ -1310,9 +1595,9 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
     JS_PUSH_TEMP_ROOT_OBJECT(cx, FUN_OBJECT(fun), &tvr);
     ok = JS_TRUE;
 
-    if (!JS_XDRUint32(xdr, &nullAtom))
+    if (!JS_XDRUint32(xdr, &firstword))
         goto bad;
-    if (!nullAtom && !js_XDRStringAtom(xdr, &fun->atom))
+    if ((firstword & 1U) && !js_XDRStringAtom(xdr, &fun->atom))
         goto bad;
     if (!JS_XDRUint32(xdr, &localsword) ||
         !JS_XDRUint32(xdr, &flagsword)) {
@@ -1325,6 +1610,8 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
         JS_ASSERT((flagsword & JSFUN_KINDMASK) >= JSFUN_INTERPRETED);
         nupvars = flagsword >> 16;
         fun->flags = uint16(flagsword);
+        fun->u.i.skipmin = uint16(firstword >> 2);
+        fun->u.i.wrapper = (firstword >> 1) & 1;
     }
 
     /* do arguments and local vars */
@@ -2134,6 +2421,8 @@ js_NewFunction(JSContext *cx, JSObject *funobj, JSNative native, uintN nargs,
         JS_ASSERT(nargs == 0);
         fun->u.i.nvars = 0;
         fun->u.i.nupvars = 0;
+        fun->u.i.skipmin = 0;
+        fun->u.i.wrapper = false;
         fun->u.i.script = NULL;
 #ifdef DEBUG
         fun->u.i.names.taggedAtom = 0;
@@ -2188,10 +2477,12 @@ JSObject * JS_FASTCALL
 js_AllocFlatClosure(JSContext *cx, JSFunction *fun, JSObject *scopeChain)
 {
     JS_ASSERT(FUN_FLAT_CLOSURE(fun));
-    JS_ASSERT(fun->u.i.script->upvarsOffset);
+    JS_ASSERT((fun->u.i.script->upvarsOffset
+               ? JS_SCRIPT_UPVARS(fun->u.i.script)->length
+               : 0) == fun->u.i.nupvars);
 
     JSObject *closure = js_CloneFunctionObject(cx, fun, scopeChain);
-    if (!closure)
+    if (!closure || fun->u.i.nupvars == 0)
         return closure;
 
     uint32 nslots = JSSLOT_FREE(&js_FunctionClass);
@@ -2210,6 +2501,8 @@ JSObject *
 js_NewFlatClosure(JSContext *cx, JSFunction *fun)
 {
     JSObject *closure = js_AllocFlatClosure(cx, fun, cx->fp->scopeChain);
+    if (!closure || fun->u.i.nupvars == 0)
+        return closure;
 
     JSUpvarArray *uva = JS_SCRIPT_UPVARS(fun->u.i.script);
     JS_ASSERT(uva->length <= size_t(closure->dslots[-1]));
@@ -2221,6 +2514,15 @@ js_NewFlatClosure(JSContext *cx, JSFunction *fun)
     return closure;
 }
 
+JSObject *
+js_NewDebuggableFlatClosure(JSContext *cx, JSFunction *fun)
+{
+    JS_ASSERT(cx->fp->fun->flags & JSFUN_HEAVYWEIGHT);
+    JS_ASSERT(!cx->fp->fun->optimizedClosure());
+
+    return WrapEscapingClosure(cx, cx->fp, FUN_OBJECT(fun), fun);
+}
+
 JSFunction *
 js_DefineFunction(JSContext *cx, JSObject *obj, JSAtom *atom, JSNative native,
                   uintN nargs, uintN attrs)
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index f700bce1aee2..f86667f23d09 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -147,6 +147,15 @@ struct JSFunction {
             uint16      nvars;    /* number of local variables */
             uint16      nupvars;  /* number of upvars (computable from script
                                      but here for faster access) */
+            uint16       skipmin; /* net skip amount up (toward zero) from
+                                     script->staticLevel to nearest upvar,
+                                     including upvars in nested functions */
+            JSPackedBool wrapper; /* true if this function is a wrapper that
+                                     rewrites bytecode optimized for a function
+                                     judged non-escaping by the compiler, which
+                                     then escaped via the debugger or a rogue
+                                     indirect eval; if true, then this function
+                                     object's proto is the wrapped object */
             JSScript    *script;  /* interpreted bytecode descriptor or null */
             JSLocalNames names;   /* argument and variable names */
         } i;
@@ -154,6 +163,8 @@ struct JSFunction {
     JSAtom          *atom;        /* name for diagnostics and decompiling */
 
 #ifdef __cplusplus
+    bool optimizedClosure() { return FUN_KIND(this) > JSFUN_INTERPRETED; }
+    bool needsWrapper()     { return FUN_NULL_CLOSURE(this) && u.i.skipmin != 0; }
 
     uintN countArgsAndVars() const {
         JS_ASSERT(FUN_INTERPRETED(this));
@@ -231,6 +242,9 @@ js_CloneFunctionObject(JSContext *cx, JSFunction *fun, JSObject *parent);
 extern JS_REQUIRES_STACK JSObject *
 js_NewFlatClosure(JSContext *cx, JSFunction *fun);
 
+extern JS_REQUIRES_STACK JSObject *
+js_NewDebuggableFlatClosure(JSContext *cx, JSFunction *fun);
+
 extern JSFunction *
 js_DefineFunction(JSContext *cx, JSObject *obj, JSAtom *atom, JSNative native,
                   uintN nargs, uintN flags);
@@ -265,9 +279,16 @@ js_PutCallObject(JSContext *cx, JSStackFrame *fp);
 extern JSBool
 js_GetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
 
-extern JSBool
+extern JS_REQUIRES_STACK JSBool
 js_GetCallVar(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
 
+/*
+ * Slower version of js_GetCallVar used when call_resolve detects an attempt to
+ * leak an optimized closure via indirect or debugger eval.
+ */
+extern JS_REQUIRES_STACK JSBool
+js_GetCallVarChecked(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
 extern JSBool
 js_GetArgsValue(JSContext *cx, JSStackFrame *fp, jsval *vp);
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index c2f7e11e448e..14721edf14a1 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -2589,11 +2589,19 @@ AssertValidPropertyCacheHit(JSContext *cx, JSScript *script, JSFrameRegs& regs,
 JS_STATIC_ASSERT(JSOP_NAME_LENGTH == JSOP_CALLNAME_LENGTH);
 JS_STATIC_ASSERT(JSOP_GETGVAR_LENGTH == JSOP_CALLGVAR_LENGTH);
 JS_STATIC_ASSERT(JSOP_GETUPVAR_LENGTH == JSOP_CALLUPVAR_LENGTH);
+JS_STATIC_ASSERT(JSOP_GETUPVAR_DBG_LENGTH == JSOP_CALLUPVAR_DBG_LENGTH);
+JS_STATIC_ASSERT(JSOP_GETUPVAR_DBG_LENGTH == JSOP_GETUPVAR_LENGTH);
 JS_STATIC_ASSERT(JSOP_GETDSLOT_LENGTH == JSOP_CALLDSLOT_LENGTH);
 JS_STATIC_ASSERT(JSOP_GETARG_LENGTH == JSOP_CALLARG_LENGTH);
 JS_STATIC_ASSERT(JSOP_GETLOCAL_LENGTH == JSOP_CALLLOCAL_LENGTH);
 JS_STATIC_ASSERT(JSOP_XMLNAME_LENGTH == JSOP_CALLXMLNAME_LENGTH);
 
+/*
+ * Same for debuggable flat closures defined at top level in another function
+ * or program fragment.
+ */
+JS_STATIC_ASSERT(JSOP_DEFFUN_FC_LENGTH == JSOP_DEFFUN_DBGFC_LENGTH);
+
 /*
  * Same for JSOP_SETNAME and JSOP_SETPROP, which differ only slightly but
  * remain distinct for the decompiler.
@@ -5733,6 +5741,43 @@ js_Interpret(JSContext *cx)
           }
           END_CASE(JSOP_GETUPVAR)
 
+          BEGIN_CASE(JSOP_GETUPVAR_DBG)
+          BEGIN_CASE(JSOP_CALLUPVAR_DBG)
+            fun = fp->fun;
+            JS_ASSERT(FUN_KIND(fun) == JSFUN_INTERPRETED);
+            JS_ASSERT(fun->u.i.wrapper);
+
+            /* Scope for tempPool mark and local names allocation in it. */
+            {
+                void *mark = JS_ARENA_MARK(&cx->tempPool);
+                jsuword *names = js_GetLocalNameArray(cx, fun, &cx->tempPool);
+                if (!names)
+                    goto error;
+
+                index = fun->countArgsAndVars() + GET_UINT16(regs.pc);
+                atom = JS_LOCAL_NAME_TO_ATOM(names[index]);
+                id = ATOM_TO_JSID(atom);
+
+                ok = js_FindProperty(cx, id, &obj, &obj2, &prop);
+                JS_ARENA_RELEASE(&cx->tempPool, mark);
+                if (!ok)
+                    goto error;
+            }
+
+            if (!prop)
+                goto atom_not_defined;
+
+            /* Minimize footprint with generic code instead of NATIVE_GET. */
+            OBJ_DROP_PROPERTY(cx, obj2, prop);
+            vp = regs.sp;
+            PUSH_OPND(JSVAL_NULL);
+            if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
+                goto error;
+
+            if (op == JSOP_CALLUPVAR_DBG)
+                PUSH_OPND(JSVAL_NULL);
+          END_CASE(JSOP_GETUPVAR_DBG)
+
           BEGIN_CASE(JSOP_GETDSLOT)
           BEGIN_CASE(JSOP_CALLDSLOT)
             obj = fp->callee;
@@ -6018,9 +6063,12 @@ js_Interpret(JSContext *cx)
           END_CASE(JSOP_DEFFUN)
 
           BEGIN_CASE(JSOP_DEFFUN_FC)
+          BEGIN_CASE(JSOP_DEFFUN_DBGFC)
             LOAD_FUNCTION(0);
 
-            obj = js_NewFlatClosure(cx, fun);
+            obj = (op == JSOP_DEFFUN_FC)
+                  ? js_NewFlatClosure(cx, fun)
+                  : js_NewDebuggableFlatClosure(cx, fun);
             if (!obj)
                 goto error;
             rval = OBJECT_TO_JSVAL(obj);
@@ -6117,6 +6165,17 @@ js_Interpret(JSContext *cx)
             fp->slots[slot] = OBJECT_TO_JSVAL(obj);
           END_CASE(JSOP_DEFLOCALFUN_FC)
 
+          BEGIN_CASE(JSOP_DEFLOCALFUN_DBGFC)
+            LOAD_FUNCTION(SLOTNO_LEN);
+
+            obj = js_NewDebuggableFlatClosure(cx, fun);
+            if (!obj)
+                goto error;
+
+            slot = GET_SLOTNO(regs.pc);
+            fp->slots[slot] = OBJECT_TO_JSVAL(obj);
+          END_CASE(JSOP_DEFLOCALFUN_DBGFC)
+
           BEGIN_CASE(JSOP_LAMBDA)
             /* Load the specified function object literal. */
             LOAD_FUNCTION(0);
@@ -6152,6 +6211,16 @@ js_Interpret(JSContext *cx)
             PUSH_OPND(OBJECT_TO_JSVAL(obj));
           END_CASE(JSOP_LAMBDA_FC)
 
+          BEGIN_CASE(JSOP_LAMBDA_DBGFC)
+            LOAD_FUNCTION(0);
+
+            obj = js_NewDebuggableFlatClosure(cx, fun);
+            if (!obj)
+                goto error;
+
+            PUSH_OPND(OBJECT_TO_JSVAL(obj));
+          END_CASE(JSOP_LAMBDA_DBGFC)
+
           BEGIN_CASE(JSOP_CALLEE)
             PUSH_OPND(OBJECT_TO_JSVAL(fp->callee));
           END_CASE(JSOP_CALLEE)
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 78f0f08e5322..adff59f5e180 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -2804,6 +2804,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 
               case JSOP_GETUPVAR:
               case JSOP_CALLUPVAR:
+              case JSOP_GETUPVAR_DBG:
+              case JSOP_CALLUPVAR_DBG:
               case JSOP_GETDSLOT:
               case JSOP_CALLDSLOT:
               {
@@ -3974,6 +3976,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 
               case JSOP_LAMBDA:
               case JSOP_LAMBDA_FC:
+              case JSOP_LAMBDA_DBGFC:
 #if JS_HAS_GENERATOR_EXPRS
                 sn = js_GetSrcNote(jp->script, pc);
                 if (sn && SN_TYPE(sn) == SRC_GENEXP) {
@@ -4339,6 +4342,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 
               case JSOP_DEFFUN:
               case JSOP_DEFFUN_FC:
+              case JSOP_DEFFUN_DBGFC:
                 LOAD_FUNCTION(0);
                 todo = -2;
                 goto do_function;
diff --git a/js/src/jsopcode.tbl b/js/src/jsopcode.tbl
index 654a83d663e2..6981a1edf309 100644
--- a/js/src/jsopcode.tbl
+++ b/js/src/jsopcode.tbl
@@ -580,3 +580,12 @@ OPDEF(JSOP_LAMBDA_FC,     226,"lambda_fc",     NULL,  3,  0,  1, 19,  JOF_OBJECT
 OPDEF(JSOP_OBJTOP,        227,"objtop",        NULL,  3,  0,  0,  0,  JOF_UINT16)
 
 OPDEF(JSOP_LOOP,          228, "loop",         NULL,  1,  0,  0,  0,  JOF_BYTE)
+
+/*
+ * Debugger versions of JSOP_{GET,CALL}UPVAR.
+ */
+OPDEF(JSOP_GETUPVAR_DBG,  229,"getupvar_dbg",  NULL,  3,  0,  1, 19,  JOF_UINT16|JOF_NAME)
+OPDEF(JSOP_CALLUPVAR_DBG, 230,"callupvar_dbg", NULL,  3,  0,  2, 19,  JOF_UINT16|JOF_NAME|JOF_CALLOP)
+OPDEF(JSOP_DEFFUN_DBGFC,     231,"deffun_dbgfc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
+OPDEF(JSOP_DEFLOCALFUN_DBGFC,232,"deflocalfun_dbgfc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING)
+OPDEF(JSOP_LAMBDA_DBGFC,     233,"lambda_dbgfc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index 6c2d39f6b85c..1d4e5dec2c96 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -819,7 +819,7 @@ JSCompiler::compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *cal
     /* Null script early in case of error, to reduce our code footprint. */
     script = NULL;
 
-    cg.flags |= (uint16) tcflags;
+    cg.flags |= uint16(tcflags);
     cg.scopeChain = scopeChain;
     if (!SetStaticLevel(&cg, TCF_GET_STATIC_LEVEL(tcflags)))
         goto out;
@@ -1586,6 +1586,10 @@ BindDestructuringArg(JSContext *cx, BindData *data, JSAtom *atom,
     JSAtomListElement *ale;
     JSParseNode *pn;
 
+    /* Flag tc so we don't have to lookup arguments on every use. */
+    if (atom == tc->compiler->context->runtime->atomState.argumentsAtom)
+        tc->flags |= TCF_FUN_PARAM_ARGUMENTS;
+
     JS_ASSERT(tc->flags & TCF_IN_FUNCTION);
     ale = tc->decls.lookup(atom);
     pn = data->pn;
@@ -1688,12 +1692,21 @@ JSCompiler::analyzeFunctions(JSFunctionBox *funbox, uint16& tcflags)
  * process is potentially exponential in the number of functions, but generally
  * not so complex. But it can't be done during a single recursive traversal of
  * the funbox tree, so we must use a work queue.
+ *
+ * Return the minimal "skipmin" for funbox and its siblings. This is the delta
+ * between the static level of the bodies of funbox and its peers (which must
+ * be funbox->level + 1), and the static level of the nearest upvar among all
+ * the upvars contained by funbox and its peers. If there are no upvars, return
+ * FREE_STATIC_LEVEL. Thus this function never returns 0.
  */
-static void
+static uintN
 FindFunArgs(JSFunctionBox *funbox, int level, JSFunctionBoxQueue *queue)
 {
+    uintN allskipmin = FREE_STATIC_LEVEL;
+
     do {
         JSParseNode *fn = funbox->node;
+        JSFunction *fun = (JSFunction *) funbox->object;
         int fnlevel = level;
 
         /*
@@ -1709,35 +1722,78 @@ FindFunArgs(JSFunctionBox *funbox, int level, JSFunctionBoxQueue *queue)
                 kid->node->setFunArg();
         }
 
-        if (fn->isFunArg()) {
-            queue->push(funbox);
-            fnlevel = int(funbox->level);
-        } else {
-            JSParseNode *pn = fn->pn_body;
+        /*
+         * Compute in skipmin the least distance from fun's static level up to
+         * an upvar, whether used directly by fun, or indirectly by a function
+         * nested in fun.
+         */
+        uintN skipmin = FREE_STATIC_LEVEL;
+        JSParseNode *pn = fn->pn_body;
 
-            if (pn->pn_type == TOK_UPVARS) {
-                JSAtomList upvars(pn->pn_names);
-                JS_ASSERT(upvars.count != 0);
+        if (pn->pn_type == TOK_UPVARS) {
+            JSAtomList upvars(pn->pn_names);
+            JS_ASSERT(upvars.count != 0);
 
-                JSAtomListIterator iter(&upvars);
-                JSAtomListElement *ale;
+            JSAtomListIterator iter(&upvars);
+            JSAtomListElement *ale;
 
-                while ((ale = iter()) != NULL) {
-                    JSDefinition *lexdep = ALE_DEFN(ale)->resolve();
+            while ((ale = iter()) != NULL) {
+                JSDefinition *lexdep = ALE_DEFN(ale)->resolve();
 
-                    if (!lexdep->isFreeVar() && int(lexdep->frameLevel()) <= fnlevel) {
+                if (!lexdep->isFreeVar()) {
+                    uintN upvarLevel = lexdep->frameLevel();
+
+                    if (int(upvarLevel) <= fnlevel)
                         fn->setFunArg();
-                        queue->push(funbox);
-                        fnlevel = int(funbox->level);
-                        break;
-                    }
+
+                    uintN skip = (funbox->level + 1) - upvarLevel;
+                    if (skip < skipmin)
+                        skipmin = skip;
                 }
             }
         }
 
-        if (funbox->kids)
-            FindFunArgs(funbox->kids, fnlevel, queue);
+        /*
+         * If this function escapes, whether directly (the parser detects such
+         * escapes) or indirectly (because this non-escaping function uses an
+         * upvar that reaches across an outer function boundary where the outer
+         * function escapes), enqueue it for further analysis, and bump fnlevel
+         * to trap any non-escaping children.
+         */
+        if (fn->isFunArg()) {
+            queue->push(funbox);
+            fnlevel = int(funbox->level);
+        }
+
+        /*
+         * Now process the current function's children, and recalibrate their
+         * cumulative skipmin to be relative to the current static level.
+         */
+        if (funbox->kids) {
+            uintN kidskipmin = FindFunArgs(funbox->kids, fnlevel, queue);
+
+            JS_ASSERT(kidskipmin != 0);
+            if (kidskipmin != FREE_STATIC_LEVEL) {
+                --kidskipmin;
+                if (kidskipmin != 0 && kidskipmin < skipmin)
+                    skipmin = kidskipmin;
+            }
+        }
+
+        /*
+         * Finally, after we've traversed all of the current function's kids,
+         * minimize fun's skipmin against our accumulated skipmin. Do likewise
+         * with allskipmin, but minimize across funbox and all of its siblings,
+         * to compute our return value.
+         */
+        if (skipmin != FREE_STATIC_LEVEL) {
+            fun->u.i.skipmin = skipmin;
+            if (skipmin < allskipmin)
+                allskipmin = skipmin;
+        }
     } while ((funbox = funbox->siblings) != NULL);
+
+    return allskipmin;
 }
 
 bool
@@ -1767,13 +1823,14 @@ JSCompiler::markFunArgs(JSFunctionBox *funbox, uintN tcflags)
                     !lexdep->isFunArg() &&
                     lexdep->kind() == JSDefinition::FUNCTION) {
                     /*
-                     * Mark this formerly-Algol-like function as a funarg,
-                     * since it is referenced from a funarg and can no longer
-                     * use JSOP_{GET,CALL}UPVAR to access upvars.
+                     * Mark this formerly-Algol-like function as an escaping
+                     * function (i.e., as a funarg), because it is used from a
+                     * funarg and therefore can not use JSOP_{GET,CALL}UPVAR to
+                     * access upvars.
                      *
-                     * Progress is guaranteed since we set PND_FUNARG here,
-                     * which suppresses revisiting this function (namely the
-                     * !lexdep->isFunArg() test just above).
+                     * Progress is guaranteed because we set the funarg flag
+                     * here, which suppresses revisiting this function (thanks
+                     * to the !lexdep->isFunArg() test just above).
                      */
                     lexdep->setFunArg();
 
@@ -3442,10 +3499,11 @@ typedef struct FindPropValEntry {
 } FindPropValEntry;
 
 #define ASSERT_VALID_PROPERTY_KEY(pnkey)                                      \
-    JS_ASSERT((pnkey)->pn_arity == PN_NULLARY &&                              \
-              ((pnkey)->pn_type == TOK_NUMBER ||                              \
-               (pnkey)->pn_type == TOK_STRING ||                              \
-               (pnkey)->pn_type == TOK_NAME))
+    JS_ASSERT(((pnkey)->pn_arity == PN_NULLARY &&                             \
+               ((pnkey)->pn_type == TOK_NUMBER ||                             \
+                (pnkey)->pn_type == TOK_STRING ||                             \
+                (pnkey)->pn_type == TOK_NAME)) ||                             \
+               (pnkey)->pn_arity == PN_NAME && (pnkey)->pn_type == TOK_NAME)
 
 static JSDHashNumber
 HashFindPropValKey(JSDHashTable *table, const void *key)
@@ -3573,6 +3631,9 @@ FindPropertyValue(JSParseNode *pn, JSParseNode *pnid, FindPropValData *data)
  * If data is null, the caller is AssignExpr and instead of binding variables,
  * we specialize lvalues in the propery value positions of the left-hand side.
  * If right is null, just check for well-formed lvalues.
+ *
+ * See also UndominateInitializers, immediately below. If you change either of
+ * these functions, you might have to change the other to match.
  */
 static JSBool
 CheckDestructuring(JSContext *cx, BindData *data,
@@ -3725,6 +3786,86 @@ CheckDestructuring(JSContext *cx, BindData *data,
     goto out;
 }
 
+/*
+ * This is a greatly pared down version of CheckDestructuring that extends the
+ * pn_pos.end source coordinate of each name in a destructuring binding such as
+ * 
+ *   var [x, y] = [function () y, 42];
+ *
+ * to cover its corresponding initializer, so that the initialized binding does
+ * not appear to dominate any closures in its initializer. See bug 496134.
+ *
+ * The quick-and-dirty dominance computation in JSCompiler::setFunctionKinds is
+ * not very precise. With one-pass SSA construction from structured source code
+ * (see "Single-Pass Generation of Static Single Assignment Form for Structured
+ * Languages", Brandis and Mössenböck), we could do much better.
+ *
+ * See CheckDestructuring, immediately above. If you change either of these
+ * functions, you might have to change the other to match.
+ */
+static JSBool
+UndominateInitializers(JSParseNode *left, JSParseNode *right, JSTreeContext *tc)
+{
+    FindPropValData fpvd;
+    JSParseNode *lhs, *rhs;
+
+    JS_ASSERT(left->pn_type != TOK_ARRAYCOMP);
+    JS_ASSERT(right);
+
+#if JS_HAS_DESTRUCTURING_SHORTHAND
+    if (right->pn_arity == PN_LIST && (right->pn_xflags & PNX_DESTRUCT)) {
+        js_ReportCompileErrorNumber(tc->compiler->context, TS(tc->compiler), right,
+                                    JSREPORT_ERROR, JSMSG_BAD_OBJECT_INIT);
+        return JS_FALSE;
+    }
+#endif
+
+    if (right->pn_type != left->pn_type)
+        return JS_TRUE;
+
+    fpvd.table.ops = NULL;
+    lhs = left->pn_head;
+    if (left->pn_type == TOK_RB) {
+        rhs = right->pn_head;
+
+        while (lhs && rhs) {
+            /* Nullary comma is an elision; binary comma is an expression.*/
+            if (lhs->pn_type != TOK_COMMA || lhs->pn_arity != PN_NULLARY) {
+                if (lhs->pn_type == TOK_RB || lhs->pn_type == TOK_RC) {
+                    if (!UndominateInitializers(lhs, rhs, tc))
+                        return JS_FALSE;
+                } else {
+                    lhs->pn_pos.end = rhs->pn_pos.end;
+                }
+            }
+
+            lhs = lhs->pn_next;
+            rhs = rhs->pn_next;
+        }
+    } else {
+        JS_ASSERT(left->pn_type == TOK_RC);
+        fpvd.numvars = left->pn_count;
+        fpvd.maxstep = 0;
+
+        while (lhs) {
+            JS_ASSERT(lhs->pn_type == TOK_COLON);
+            JSParseNode *pn = lhs->pn_right;
+
+            rhs = FindPropertyValue(right, lhs->pn_left, &fpvd);
+            if (pn->pn_type == TOK_RB || pn->pn_type == TOK_RC) {
+                if (rhs && !UndominateInitializers(pn, rhs, tc))
+                    return JS_FALSE;
+            } else {
+                if (rhs)
+                    pn->pn_pos.end = rhs->pn_pos.end;
+            }
+
+            lhs = lhs->pn_next;
+        }
+    }
+    return JS_TRUE;
+}
+
 static JSParseNode *
 DestructuringExpr(JSContext *cx, BindData *data, JSTreeContext *tc,
                   JSTokenType tt)
@@ -5435,10 +5576,10 @@ Variables(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, bool inLetHead)
             if (!pn2)
                 return NULL;
 
+            if (!CheckDestructuring(cx, &data, pn2, NULL, tc))
+                return NULL;
             if ((tc->flags & TCF_IN_FOR_INIT) &&
                 js_PeekToken(cx, ts) == TOK_IN) {
-                if (!CheckDestructuring(cx, &data, pn2, NULL, tc))
-                    return NULL;
                 pn->append(pn2);
                 continue;
             }
@@ -5461,13 +5602,12 @@ Variables(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, bool inLetHead)
             }
 #endif
 
-            pn2 = NewBinary(TOK_ASSIGN, JSOP_NOP, pn2, init, tc);
-            if (!pn2 ||
-                !CheckDestructuring(cx, &data,
-                                    pn2->pn_left, pn2->pn_right,
-                                    tc)) {
+            if (!init || !UndominateInitializers(pn2, init, tc))
+                return NULL;
+
+            pn2 = NewBinary(TOK_ASSIGN, JSOP_NOP, pn2, init, tc);
+            if (!pn2)
                 return NULL;
-            }
             pn->append(pn2);
             continue;
         }
@@ -7018,8 +7158,11 @@ QualifiedIdentifier(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
     pn = PropertySelector(cx, ts, tc);
     if (!pn)
         return NULL;
-    if (js_MatchToken(cx, ts, TOK_DBLCOLON))
+    if (js_MatchToken(cx, ts, TOK_DBLCOLON)) {
+        /* Hack for bug 496316. Slowing down E4X won't make it go away, alas. */
+        tc->flags |= TCF_FUN_HEAVYWEIGHT;
         pn = QualifiedSuffix(cx, ts, pn, tc);
+    }
     return pn;
 }
 
@@ -8016,8 +8159,20 @@ PrimaryExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
                 if (ale) {
                     dn = ALE_DEFN(ale);
 #if JS_HAS_BLOCK_SCOPE
-                    if (dn->isLet() && !BlockIdInScope(dn->pn_blockid, tc))
-                        ale = NULL;
+                    /*
+                     * Skip out-of-scope let bindings along an ALE list or hash
+                     * chain. These can happen due to |let (x = x) x| block and
+                     * expression bindings, where the x on the right of = comes
+                     * from an outer scope. See bug 496532.
+                     */
+                    while (dn->isLet() && !BlockIdInScope(dn->pn_blockid, tc)) {
+                        do {
+                            ale = ALE_NEXT(ale);
+                        } while (ale && ALE_ATOM(ale) != pn->pn_atom);
+                        if (!ale)
+                            break;
+                        dn = ALE_DEFN(ale);
+                    }
 #endif
                 }
 
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 114633dcdde0..6660f0b4fe09 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -1308,6 +1308,19 @@ TypeMap::matches(TypeMap& other) const
     return !memcmp(data(), other.data(), length());
 }
 
+/* Use the provided storage area to create a new type map that contains the partial type map
+   with the rest of it filled up from the complete type map. */
+static void
+mergeTypeMaps(uint8** partial, unsigned* plength, uint8* complete, unsigned clength, uint8* mem)
+{
+    unsigned l = *plength;
+    JS_ASSERT(l < clength);
+    memcpy(mem, *partial, l * sizeof(uint8));
+    memcpy(mem + l, complete + l, (clength - l) * sizeof(uint8));
+    *partial = mem;
+    *plength = clength;
+}
+
 /* Specializes a tree to any missing globals, including any dependent trees. */
 static JS_REQUIRES_STACK void
 specializeTreesToMissingGlobals(JSContext* cx, TreeInfo* root)
@@ -1846,34 +1859,26 @@ FlushNativeGlobalFrame(JSContext* cx, unsigned ngslots, uint16* gslots, uint8* m
 }
 
 /*
- * Helper for js_GetUpvarOnTrace.
+ * Generic function to read upvars on trace.
+ *     T   Traits type parameter. Must provide static functions:
+ *             interp_get(fp, slot)     Read the value out of an interpreter frame.
+ *             native_slot(argc, slot)  Return the position of the desired value in the on-trace
+ *                                      stack frame (with position 0 being callee).
+ *
+ *     upvarLevel  Static level of the function containing the upvar definition.
+ *     slot        Identifies the value to get. The meaning is defined by the traits type.
+ *     callDepth   Call depth of current point relative to trace entry
  */
-static uint32 
-GetUpvarOnTraceTail(InterpState* state, uint32 cookie,
-                    uint32 nativeStackFramePos, uint8* typemap, double* result)
+template<typename T>
+uint32 JS_INLINE
+js_GetUpvarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
 {
-    uintN slot = UPVAR_FRAME_SLOT(cookie);
-    slot = (slot == CALLEE_UPVAR_SLOT) ? 0 : 2/*callee,this*/ + slot;
-    *result = state->stackBase[nativeStackFramePos + slot];
-    return typemap[slot];
-}
-
-/*
- * Builtin to get an upvar on trace. See js_GetUpvar for the meaning
- * of the first three arguments. The value of the upvar is stored in
- * *result as an unboxed native. The return value is the typemap type.
- */
-uint32 JS_FASTCALL
-js_GetUpvarOnTrace(JSContext* cx, uint32 level, uint32 cookie, uint32 callDepth, double* result)
-{
-    uintN skip = UPVAR_FRAME_SKIP(cookie);
-    uintN upvarLevel = level - skip;
     InterpState* state = cx->interpState;
     FrameInfo** fip = state->rp + callDepth;
 
     /*
      * First search the FrameInfo call stack for an entry containing
-     * our upvar, namely one with staticLevel == upvarLevel.
+     * our upvar, namely one with level == upvarLevel.
      */
     while (--fip >= state->callstackBase) {
         FrameInfo* fi = *fip;
@@ -1886,31 +1891,96 @@ js_GetUpvarOnTrace(JSContext* cx, uint32 level, uint32 cookie, uint32 callDepth,
              * activation record corresponding to *fip in the native
              * stack.
              */
-            uintN nativeStackFramePos = state->callstackBase[0]->spoffset;
+            int32 nativeStackFramePos = state->callstackBase[0]->spoffset;
             for (FrameInfo** fip2 = state->callstackBase; fip2 <= fip; fip2++)
                 nativeStackFramePos += (*fip2)->spdist;
-            nativeStackFramePos -= (2 + (*fip)->argc);
-            uint8* typemap = (uint8*) (fi+1);
-            return GetUpvarOnTraceTail(state, cookie, nativeStackFramePos,
-                                       typemap, result);
+            nativeStackFramePos -= (2 + (*fip)->get_argc());
+            uint32 native_slot = T::native_slot((*fip)->get_argc(), slot);
+            *result = state->stackBase[nativeStackFramePos + native_slot];
+            return fi->get_typemap()[native_slot];
         }
     }
 
+    // Next search the trace entry frame, which is not in the FrameInfo stack.
     if (state->outermostTree->script->staticLevel == upvarLevel) {
-        return GetUpvarOnTraceTail(state, cookie, 0, 
-                                   state->outermostTree->stackTypeMap(), result);
+        uint32 argc = ((VMFragment*) state->outermostTree->fragment)->argc;
+        uint32 native_slot = T::native_slot(argc, slot);
+        *result = state->stackBase[native_slot];
+        return state->callstackBase[0]->get_typemap()[native_slot];
     }
 
     /*
      * If we did not find the upvar in the frames for the active traces,
      * then we simply get the value from the interpreter state.
      */
-    jsval v = js_GetUpvar(cx, level, cookie);
+    JS_ASSERT(upvarLevel < JS_DISPLAY_SIZE);
+    JSStackFrame* fp = cx->display[upvarLevel];
+    jsval v = T::interp_get(fp, slot);
     uint8 type = getCoercedType(v);
     ValueToNative(cx, v, type, result);
     return type;
 }
 
+// For this traits type, 'slot' is the argument index, which may be -2 for callee.
+struct UpvarArgTraits {
+    static jsval interp_get(JSStackFrame* fp, int32 slot) {
+        return fp->argv[slot];
+    }
+
+    static uint32 native_slot(uint32 argc, int32 slot) {
+        return 2 /*callee,this*/ + slot;
+    }
+};
+
+uint32 JS_FASTCALL
+js_GetUpvarArgOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+{
+    return js_GetUpvarOnTrace<UpvarArgTraits>(cx, upvarLevel, slot, callDepth, result);
+}
+
+// For this traits type, 'slot' is an index into the local slots array.
+struct UpvarVarTraits {
+    static jsval interp_get(JSStackFrame* fp, int32 slot) {
+        return fp->slots[slot];
+    }
+
+    static uint32 native_slot(uint32 argc, int32 slot) {
+        return 2 /*callee,this*/ + argc + slot;
+    }
+};
+
+uint32 JS_FASTCALL
+js_GetUpvarVarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+{
+    return js_GetUpvarOnTrace<UpvarVarTraits>(cx, upvarLevel, slot, callDepth, result);
+}
+
+/*
+ * For this traits type, 'slot' is an index into the stack area (within slots, after nfixed)
+ * of a frame with no function. (On trace, the top-level frame is the only one that can have
+ * no function.)
+ */
+struct UpvarStackTraits {
+    static jsval interp_get(JSStackFrame* fp, int32 slot) {
+        return fp->slots[slot + fp->script->nfixed];
+    }
+
+    static uint32 native_slot(uint32 argc, int32 slot) {
+        /* 
+         * Locals are not imported by the tracer when the frame has no function, so
+         * we do not add fp->script->nfixed.
+         */
+        JS_ASSERT(argc == 0);
+        return slot;
+    }
+};
+
+uint32 JS_FASTCALL
+js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+{
+    return js_GetUpvarOnTrace<UpvarStackTraits>(cx, upvarLevel, slot, callDepth, result);
+}
+
 /**
  * Box the given native stack frame into the virtual machine stack. This
  * is infallible.
@@ -2077,16 +2147,29 @@ JS_REQUIRES_STACK void
 TraceRecorder::import(TreeInfo* treeInfo, LIns* sp, unsigned stackSlots, unsigned ngslots,
                       unsigned callDepth, uint8* typeMap)
 {
+    /* If we get a partial list that doesn't have all the types (i.e. recording from a side
+       exit that was recorded but we added more global slots later), merge the missing types
+       from the entry type map. This is safe because at the loop edge we verify that we
+       have compatible types for all globals (entry type and loop edge type match). While
+       a different trace of the tree might have had a guard with a different type map for
+       these slots we just filled in here (the guard we continue from didn't know about them),
+       since we didn't take that particular guard the only way we could have ended up here
+       is if that other trace had at its end a compatible type distribution with the entry
+       map. Since thats exactly what we used to fill in the types our current side exit
+       didn't provide, this is always safe to do. */
+
+    uint8* globalTypeMap = typeMap + stackSlots;
+    unsigned length = treeInfo->nGlobalTypes();
+
     /*
-     * If we get a partial list that doesn't have all the types, capture the missing types
-     * from the current environment.
+     * This is potentially the typemap of the side exit and thus shorter than the tree's
+     * global type map.
      */
-    TypeMap fullTypeMap(typeMap, stackSlots + ngslots);
-    if (ngslots < treeInfo->globalSlots->length()) {
-        fullTypeMap.captureMissingGlobalTypes(cx, *treeInfo->globalSlots, stackSlots);
-        ngslots = treeInfo->globalSlots->length();
+    if (ngslots < length) {
+        mergeTypeMaps(&globalTypeMap/*out param*/, &ngslots/*out param*/,
+                      treeInfo->globalTypeMap(), length,
+                      (uint8*)alloca(sizeof(uint8) * length));
     }
-    uint8* globalTypeMap = fullTypeMap.data() + stackSlots;
     JS_ASSERT(ngslots == treeInfo->nGlobalTypes());
 
     /*
@@ -2412,6 +2495,7 @@ TraceRecorder::snapshot(ExitType exitType)
         for (unsigned n = 0; n < nexits; ++n) {
             VMSideExit* e = exits[n];
             if (e->pc == pc && e->imacpc == fp->imacpc &&
+                ngslots == e->numGlobalSlots &&
                 !memcmp(getFullTypeMap(exits[n]), typemap, typemap_size)) {
                 AUDIT(mergedLoopExits);
                 return e;
@@ -3537,7 +3621,7 @@ js_SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
     /* Code duplicated from inline_call: case in js_Interpret (FIXME). */
     JSArena* a = cx->stackPool.current;
     void* newmark = (void*) a->avail;
-    uintN argc = fi.argc & 0x7fff;
+    uintN argc = fi.get_argc();
     jsval* vp = fp->slots + fi.spdist - (2 + argc);
     uintN missing = 0;
     jsval* newsp;
@@ -3596,7 +3680,7 @@ js_SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
     newifp->frame.callee = fi.callee; // Roll with a potentially stale callee for now.
     newifp->frame.fun = fun;
 
-    bool constructing = (fi.argc & 0x8000) != 0;
+    bool constructing = fi.is_constructing();
     newifp->frame.argc = argc;
     newifp->callerRegs.pc = fi.pc;
     newifp->callerRegs.sp = fp->slots + fi.spdist;
@@ -3984,9 +4068,14 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
             fullMap.add(getStackTypeMap(e2), e2->numStackSlots);
             stackSlots = fullMap.length();
             fullMap.add(getGlobalTypeMap(e2), e2->numGlobalSlots);
-            ngslots = e2->numGlobalSlots;
+            if (e1->numGlobalSlots >= e2->numGlobalSlots) {
+                fullMap.add(getGlobalTypeMap(e1) + e2->numGlobalSlots,
+                            e1->numGlobalSlots - e2->numGlobalSlots);
+            }
+            ngslots = e1->numGlobalSlots;
             typeMap = fullMap.data();
         }
+        JS_ASSERT(ngslots >= anchor->numGlobalSlots);
         return js_StartRecorder(cx, anchor, c, (TreeInfo*)f->vmprivate, stackSlots,
                                 ngslots, typeMap, exitedFrom, outer, cx->fp->argc);
     }
@@ -5322,12 +5411,13 @@ js_PurgeScriptRecordingAttempts(JSDHashTable *table,
     return JS_DHASH_NEXT;
 }
 
-JS_REQUIRES_STACK void
-js_PurgeScriptFragments(JSContext* cx, JSScript* script)
+/*
+ * Call 'action' for each root fragment created for 'script'.
+ */
+template<typename FragmentAction>
+static void
+js_IterateScriptFragments(JSContext* cx, JSScript* script, FragmentAction action)
 {
-    if (!TRACING_ENABLED(cx))
-        return;
-    debug_only_v(nj_dprintf("Purging fragments for JSScript %p.\n", (void*)script);)
     JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
     for (size_t i = 0; i < FRAGMENT_TABLE_SIZE; ++i) {
         for (VMFragment **f = &(tm->vmfragments[i]); *f; ) {
@@ -5340,15 +5430,39 @@ js_PurgeScriptFragments(JSContext* cx, JSScript* script)
                                         (void*)frag, frag->ip, script->code,
                                         script->code + script->length));
                 VMFragment* next = frag->next;
-                for (Fragment *p = frag; p; p = p->peer)
-                    js_TrashTree(cx, p);
-                tm->fragmento->clearFragment(frag);
+                action(cx, tm, frag);
                 *f = next;
             } else {
                 f = &((*f)->next);
             }
         }
     }
+}
+
+static void trashTreeAction(JSContext* cx, JSTraceMonitor* tm, Fragment* frag)
+{
+    for (Fragment *p = frag; p; p = p->peer)
+        js_TrashTree(cx, p);
+}
+
+static void clearFragmentAction(JSContext* cx, JSTraceMonitor* tm, Fragment* frag)
+{
+    tm->fragmento->clearFragment(frag);
+}
+
+JS_REQUIRES_STACK void
+js_PurgeScriptFragments(JSContext* cx, JSScript* script)
+{
+    if (!TRACING_ENABLED(cx))
+        return;
+    debug_only_v(nj_dprintf("Purging fragments for JSScript %p.\n", (void*)script);)
+    /*
+     * js_TrashTree trashes dependent trees recursively, so we must do all the trashing
+     * before clearing in order to avoid calling js_TrashTree with a deleted fragment.
+     */
+    js_IterateScriptFragments(cx, script, trashTreeAction);
+    js_IterateScriptFragments(cx, script, clearFragmentAction);
+    JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
     JS_DHashTableEnumerate(&(tm->recordAttempts),
                            js_PurgeScriptRecordingAttempts, script);
 
@@ -6730,6 +6844,7 @@ TraceRecorder::getThis(LIns*& this_ins)
     }
 
     jsval& thisv = cx->fp->argv[-1];
+    JS_ASSERT(JSVAL_IS_OBJECT(thisv));
 
     /*
      * Traces type-specialize between null and objects, so if we currently see a null
@@ -6738,7 +6853,12 @@ TraceRecorder::getThis(LIns*& this_ins)
      * can only detect this condition prior to calling js_ComputeThisForFrame, since it
      * updates the interpreter's copy of argv[-1].
      */
-    if (JSVAL_IS_NULL(original)) {
+    JSClass* clasp = NULL;;
+    if (JSVAL_IS_NULL(original) ||
+        (((clasp = STOBJ_GET_CLASS(JSVAL_TO_OBJECT(original))) == &js_CallClass) ||
+         (clasp == &js_BlockClass))) {
+        if (clasp)
+            guardClass(JSVAL_TO_OBJECT(original), get(&thisv), clasp, snapshot(BRANCH_EXIT));
         JS_ASSERT(!JSVAL_IS_PRIMITIVE(thisv));
         if (thisObj != globalObj)
             ABORT_TRACE("global object was wrapped while recording");
@@ -6752,7 +6872,6 @@ TraceRecorder::getThis(LIns*& this_ins)
      * The only unwrapped object that needs to be wrapped that we can get here is the
      * global object obtained throught the scope chain.
      */
-    JS_ASSERT(JSVAL_IS_OBJECT(thisv));
     JSObject* obj = js_GetWrappedObject(cx, JSVAL_TO_OBJECT(thisv));
     OBJ_TO_INNER_OBJECT(cx, obj);
     if (!obj)
@@ -8414,7 +8533,11 @@ TraceRecorder::record_JSOP_CALLNAME()
     return JSRS_CONTINUE;
 }
 
-JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarOnTrace, CONTEXT, UINT32, UINT32, UINT32,
+JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarArgOnTrace, CONTEXT, UINT32, INT32, UINT32,
+                     DOUBLEPTR, 0, 0)
+JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarVarOnTrace, CONTEXT, UINT32, INT32, UINT32,
+                     DOUBLEPTR, 0, 0)
+JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarStackOnTrace, CONTEXT, UINT32, INT32, UINT32,
                      DOUBLEPTR, 0, 0)
 
 /*
@@ -8426,10 +8549,16 @@ JS_REQUIRES_STACK LIns*
 TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, jsval& v)
 {
     /*
-     * Try to find the upvar in the current trace's tracker.
+     * Try to find the upvar in the current trace's tracker. For &vr to be
+     * the address of the jsval found in js_GetUpvar, we must initialize
+     * vr directly with the result, so it is a reference to the same location.
+     * It does not work to assign the result to v, because v is an already
+     * existing reference that points to something else.
      */
-    v = js_GetUpvar(cx, script->staticLevel, uva->vector[index]);
-    LIns* upvar_ins = get(&v);
+    uint32 cookie = uva->vector[index];
+    jsval& vr = js_GetUpvar(cx, script->staticLevel, cookie);
+    v = vr;
+    LIns* upvar_ins = get(&vr);
     if (upvar_ins) {
         return upvar_ins;
     }
@@ -8438,15 +8567,33 @@ TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, jsval& v)
      * The upvar is not in the current trace, so get the upvar value 
      * exactly as the interpreter does and unbox.
      */
+    uint32 level = script->staticLevel - UPVAR_FRAME_SKIP(cookie);
+    uint32 cookieSlot = UPVAR_FRAME_SLOT(cookie);
+    JSStackFrame* fp = cx->display[level];
+    const CallInfo* ci;
+    int32 slot;
+    if (!fp->fun) {
+        ci = &js_GetUpvarStackOnTrace_ci;
+        slot = cookieSlot;
+    } else if (cookieSlot < fp->fun->nargs) {
+        ci = &js_GetUpvarArgOnTrace_ci;
+        slot = cookieSlot;
+    } else if (cookieSlot == CALLEE_UPVAR_SLOT) {
+        ci = &js_GetUpvarArgOnTrace_ci;
+        slot = -2;
+    } else {
+        ci = &js_GetUpvarVarOnTrace_ci;
+        slot = cookieSlot - fp->fun->nargs;
+    }
+
     LIns* outp = lir->insAlloc(sizeof(double));
     LIns* args[] = { 
         outp,
         INS_CONST(callDepth),
-        INS_CONST(uva->vector[index]), 
-        INS_CONST(script->staticLevel), 
+        INS_CONST(slot), 
+        INS_CONST(level), 
         cx_ins 
     };
-    const CallInfo* ci = &js_GetUpvarOnTrace_ci;
     LIns* call_ins = lir->insCall(ci, args);
     uint8 type = getCoercedType(v);
     guard(true,
@@ -8589,7 +8736,7 @@ TraceRecorder::interpretedFunctionCall(jsval& fval, JSFunction* fun, uintN argc,
     fi->pc = fp->regs->pc;
     fi->imacpc = fp->imacpc;
     fi->spdist = fp->regs->sp - fp->slots;
-    fi->argc = argc | (constructing ? 0x8000 : 0);
+    fi->set_argc(argc, constructing);
     fi->spoffset = 2 /*callee,this*/ + fp->argc;
 
     unsigned callDepth = getCallDepth();
@@ -10769,6 +10916,19 @@ TraceRecorder::record_JSOP_LOOP()
     return JSRS_CONTINUE;
 }
 
+#define DBG_STUB(OP)                                                          \
+    JS_REQUIRES_STACK JSRecordingStatus                                       \
+    TraceRecorder::record_##OP()                                              \
+    {                                                                         \
+        ABORT_TRACE("can't trace " #OP);                                      \
+    }
+
+DBG_STUB(JSOP_GETUPVAR_DBG)
+DBG_STUB(JSOP_CALLUPVAR_DBG)
+DBG_STUB(JSOP_DEFFUN_DBGFC)
+DBG_STUB(JSOP_DEFLOCALFUN_DBGFC)
+DBG_STUB(JSOP_LAMBDA_DBGFC)
+
 #ifdef JS_JIT_SPEW
 /* Prints information about entry typemaps and unstable exits for all peers at a PC */
 void
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index c63d3a018425..3bb138c04d92 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -76,13 +76,6 @@ public:
         this->_data = (T*)malloc(max * sizeof(T));
     }
 
-    Queue(T* data, unsigned length) {
-        this->_max =
-        this->_len = length;
-        this->_data = (T*)malloc(length * sizeof(T));
-        memcpy(this->_data, data, length);
-    }
-
     ~Queue() {
         free(_data);
     }
@@ -196,12 +189,6 @@ typedef Queue<uint16> SlotList;
 
 class TypeMap : public Queue<uint8> {
 public:
-    TypeMap() : Queue<uint8>() {
-    }
-
-    TypeMap(uint8* partial, unsigned length) : Queue<uint8>(partial, length) {
-    }
-
     JS_REQUIRES_STACK void captureTypes(JSContext* cx, SlotList& slots, unsigned callDepth);
     JS_REQUIRES_STACK void captureMissingGlobalTypes(JSContext* cx,
                                                      SlotList& slots,
@@ -305,7 +292,12 @@ struct FrameInfo {
     jsbytecode*     pc;         // caller fp->regs->pc
     jsbytecode*     imacpc;     // caller fp->imacpc
     uint16          spdist;     // distance from fp->slots to fp->regs->sp at JSOP_CALL
-    uint16          argc;       // actual argument count, may be < fun->nargs
+
+    /*
+     * Bit  15 (0x8000) is a flag that is set if constructing (called through new).
+     * Bits 0-14 are the actual argument count. This may be less than fun->nargs.
+     */
+    uint16          argc;
 
     /*
      * Stack pointer adjustment needed for navigation of native stack in
@@ -317,6 +309,17 @@ struct FrameInfo {
      * non-argument slot in the callee's native stack frame.
      */
     int32          spoffset;
+
+    // Safer accessors for argc.
+    enum { CONSTRUCTING_MASK = 0x8000 };
+    void   set_argc(uint16 argc, bool constructing) {
+        this->argc = argc | (constructing ? CONSTRUCTING_MASK : 0);
+    }
+    uint16 get_argc() const { return argc & ~CONSTRUCTING_MASK; }
+    bool   is_constructing() const { return (argc & CONSTRUCTING_MASK) != 0; }
+
+    // The typemap just before the callee is called.
+    uint8* get_typemap() { return (uint8*) (this+1); }
 };
 
 struct UnstableExit
@@ -327,8 +330,8 @@ struct UnstableExit
 };
 
 class TreeInfo MMGC_SUBCLASS_DECL {
-    nanojit::Fragment*      fragment;
 public:
+    nanojit::Fragment* const      fragment;
     JSScript*               script;
     unsigned                maxNativeStackSlots;
     ptrdiff_t               nativeStackBase;
diff --git a/js/src/jsxdrapi.h b/js/src/jsxdrapi.h
index daaa338ddc7b..f20bc57b3ee9 100644
--- a/js/src/jsxdrapi.h
+++ b/js/src/jsxdrapi.h
@@ -204,7 +204,7 @@ JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
  * before deserialization of bytecode.  If the saved version does not match
  * the current version, abort deserialization and invalidate the file.
  */
-#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 48)
+#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 49)
 
 /*
  * Library-private functions.
diff --git a/js/src/nanojit/LIR.cpp b/js/src/nanojit/LIR.cpp
index 647d683d6b95..fcd8e5981b40 100644
--- a/js/src/nanojit/LIR.cpp
+++ b/js/src/nanojit/LIR.cpp
@@ -396,6 +396,91 @@ namespace nanojit
         }
     }
     
+#if defined(_DEBUG)
+    bool LIns::isOp1() const {
+        switch (firstWord.code) {
+            case LIR_skip:
+            case LIR_ret:
+            case LIR_live:
+            case LIR_neg:
+#if !defined NANOJIT_64BIT
+            case LIR_callh:
+#endif
+            case LIR_not:
+            case LIR_qlo:
+            case LIR_qhi:
+            case LIR_ov:
+            case LIR_cs:
+            case LIR_file:
+            case LIR_line:
+            case LIR_fret:
+            case LIR_fneg:
+            case LIR_i2f:
+            case LIR_u2f:
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    bool LIns::isOp2() const {
+        switch (firstWord.code) {
+            case LIR_ld:
+            case LIR_loop:
+            case LIR_x:
+            case LIR_jt:
+            case LIR_jf:
+            case LIR_ldcs:
+            case LIR_feq:
+            case LIR_flt:
+            case LIR_fgt:
+            case LIR_fle:
+            case LIR_fge:
+            case LIR_cmov:
+            case LIR_add:
+            case LIR_sub:
+            case LIR_mul:
+            case LIR_and:
+            case LIR_or:
+            case LIR_xor:
+            case LIR_lsh:
+            case LIR_rsh:
+            case LIR_ush:
+            case LIR_xt:
+            case LIR_xf:
+            case LIR_ldcb:
+            case LIR_eq:
+            case LIR_lt:
+            case LIR_gt:
+            case LIR_le:
+            case LIR_ge:
+            case LIR_ult:
+            case LIR_ugt:
+            case LIR_ule:
+            case LIR_uge:
+            case LIR_2:
+            case LIR_xbarrier:
+            case LIR_xtbl:
+            case LIR_ldq:
+            case LIR_qiand:
+            case LIR_qiadd:
+            case LIR_qjoin:
+            case LIR_qcmov:
+            case LIR_fadd:
+            case LIR_fsub:
+            case LIR_fmul:
+            case LIR_fdiv:
+            case LIR_qior:
+            case LIR_qilsh:
+                return true;
+
+            default:
+                return false;
+        }
+    }
+#endif // defined(_DEBUG)
+
 	bool LIns::isCmp() const {
         LOpcode op = firstWord.code;
         return (op >= LIR_eq && op <= LIR_uge) || (op >= LIR_feq && op <= LIR_fge);
@@ -507,6 +592,7 @@ namespace nanojit
 
 	const CallInfo* LIns::callInfo() const
 	{
+        NanoAssert(isCall());
         return c.ci;
 	}
 
@@ -514,6 +600,7 @@ namespace nanojit
     // Nb: this must be kept in sync with insCall().
     LInsp LIns::arg(uint32_t i) 
 	{
+        NanoAssert(isCall());
         NanoAssert(i < argc());
         LInsp* offs = (LInsp*)this - (i+1);
         return *offs;
@@ -882,7 +969,7 @@ namespace nanojit
 			iffalse = tmp;
 		}
 
-		if (true/*avmplus::AvmCore::use_cmov()*/)
+		if (avmplus::AvmCore::use_cmov())
 		{
 			return ins2((iftrue->isQuad() || iffalse->isQuad()) ? LIR_qcmov : LIR_cmov, cond, ins2(LIR_2, iftrue, iffalse));
 		}
diff --git a/js/src/nanojit/LIR.h b/js/src/nanojit/LIR.h
index 351bf0f59484..987f0ff536b2 100644
--- a/js/src/nanojit/LIR.h
+++ b/js/src/nanojit/LIR.h
@@ -242,12 +242,18 @@ namespace nanojit
 		};
 
 	public:
-        LIns* oprnd1() const { return u.oprnd_1; }
-        LIns* oprnd2() const { return u.oprnd_2; }
+        LIns* oprnd1() const {
+            NanoAssert(isOp1() || isOp2() || isStore());
+            return u.oprnd_1;
+        }
+        LIns* oprnd2() const {
+            NanoAssert(isOp2() || isStore());
+            return u.oprnd_2;
+        }
 
         inline LOpcode opcode()   const { return firstWord.code; }
-        inline uint8_t imm8()     const { return c.imm8a; }
-        inline uint8_t imm8b()    const { return c.imm8b; }
+        inline uint8_t imm8()     const { NanoAssert(isop(LIR_param)); return c.imm8a; }
+        inline uint8_t imm8b()    const { NanoAssert(isop(LIR_param)); return c.imm8b; }
         inline int32_t imm32()    const { NanoAssert(isconst());  return i.imm32; }
         inline int32_t imm64_0()  const { NanoAssert(isconstq()); return i64.imm64_0; }
         inline int32_t imm64_1()  const { NanoAssert(isconstq()); return i64.imm64_1; }
@@ -285,6 +291,10 @@ namespace nanojit
 		bool isCse(const CallInfo *functions) const;
         bool isRet() const { return nanojit::isRetOpcode(firstWord.code); }
 		bool isop(LOpcode o) const { return firstWord.code == o; }
+        #if defined(_DEBUG)
+        bool isOp1() const;     // true for unary ops
+        bool isOp2() const;     // true for binary ops
+        #endif
 		bool isQuad() const;
 		bool isCond() const;
         bool isFloat() const;
@@ -319,16 +329,25 @@ namespace nanojit
 		bool isBranch() const {
 			return isop(LIR_jt) || isop(LIR_jf) || isop(LIR_j);
 		}
-        void setimm32(int32_t x) { i.imm32 = x; }
+        void setimm32(int32_t x) { NanoAssert(isconst()); i.imm32 = x; }
         // Set the opcode and clear resv.
         void initOpcodeAndClearResv(LOpcode);
         Reservation* initResv();
         void         clearResv();
 
 		// operand-setting methods
-        void setOprnd1(LIns* r) { u.oprnd_1 = r; }
-        void setOprnd2(LIns* r) { u.oprnd_2 = r; }
-        void setDisp(int32_t d) { sti.disp = d; }
+        void setOprnd1(LIns* r) {
+            NanoAssert(isOp1() || isOp2() || isStore());
+            u.oprnd_1 = r;
+        }
+        void setOprnd2(LIns* r) {
+            NanoAssert(isOp2() || isStore());
+            u.oprnd_2 = r;
+        }
+        void setDisp(int32_t d) {
+            NanoAssert(isStore());
+            sti.disp = d;
+        }
 		void setTarget(LIns* t);
 		LIns* getTarget();
 
diff --git a/js/src/nanojit/avmplus.h b/js/src/nanojit/avmplus.h
index 09252930606f..400b982507c0 100644
--- a/js/src/nanojit/avmplus.h
+++ b/js/src/nanojit/avmplus.h
@@ -328,10 +328,6 @@ namespace avmplus {
             verbose_exits = 1;
             verbose_live = 1;
             show_stats = 1;
-#endif
-#if defined (AVMPLUS_AMD64)
-            sse2 = true;
-            use_cmov = true;
 #endif
         }
         
@@ -343,7 +339,8 @@ namespace avmplus {
         uint32_t verbose_exits:1;
         uint32_t show_stats:1;
 
-#if defined (AVMPLUS_IA32) || defined(AVMPLUS_AMD64)
+#if defined (AVMPLUS_IA32)
+	// Whether or not we can use SSE2 instructions and conditional moves.
         bool sse2;
         bool use_cmov;
 #endif
@@ -433,19 +430,23 @@ namespace avmplus {
         static GC* gc;
         static String* k_str[];
 
-#if defined (AVMPLUS_IA32) || defined(AVMPLUS_AMD64)
+#ifdef AVMPLUS_IA32
         static inline bool
         use_sse2()
         {
             return config.sse2;
         }
+#endif
         
         static inline bool
         use_cmov()
         {
+#ifdef AVMPLUS_IA32
             return config.use_cmov;
-        }
+#else
+	    return true;
 #endif
+        }
 
         static inline bool
         quiet_opt()
diff --git a/js/src/trace-test.js b/js/src/trace-test.js
index 8cf0631b83d3..670f7f46eb37 100644
--- a/js/src/trace-test.js
+++ b/js/src/trace-test.js
@@ -5289,6 +5289,21 @@ function testSetProtoRegeneratesObjectShape()
 testSetProtoRegeneratesObjectShape.expected = true;
 test(testSetProtoRegeneratesObjectShape);
 
+function testFewerGlobalsInInnerTree() {
+    for each (a in [new Number(1), new Number(1), {}, {}, new Number(1)]) {
+        for each (b in [2, "", 2, "", "", ""]) {
+		    for each (c in [{}, {}, 3, 3, 3, 3, {}, {}]) {
+                4 + a;
+			}
+		}
+	}
+    delete a;
+    delete b;
+    delete c;
+    return "ok";
+}
+testFewerGlobalsInInnerTree.expected = "ok";
+test(testFewerGlobalsInInnerTree);
 
 /*****************************************************************************
  *                                                                           *
diff --git a/js/tests/js1_8_1/regress/regress-496922.js b/js/tests/js1_8_1/regress/regress-496922.js
new file mode 100644
index 000000000000..785c799a602f
--- /dev/null
+++ b/js/tests/js1_8_1/regress/regress-496922.js
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Dave Mandelin
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var gTestfile = 'regress-496922.js';
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 496922;
+var summary = 'Incorrect handling of extra arguments';
+var actual = ''
+var expect = '0,0,1,1,2,2,3,3';
+
+
+//-----------------------------------------------------------------------------
+
+// The code must run as part of the top-level script in order to get the bug.
+enterFunc ('test');
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+jit(true);
+
+var a = [];
+let(
+f = function() {
+    for (let x = 0; x < 4; ++x) {
+        (function() {
+            for (let y = 0; y < 2; ++y) {
+              a.push(x);
+            }
+        })()
+    }
+}) { (function() {})()
+    f(99)
+}
+actual = '' + a;
+
+jit(false);
+reportCompare(expect, actual, summary);
+exitFunc ('test');
+//-----------------------------------------------------------------------------
+
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index cc840919275c..906a5ecac465 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -110,7 +110,6 @@ EXPORTS		= \
 		nsIReflowCallback.h \
 		nsLayoutErrors.h \
 		nsLayoutUtils.h \
-		nsIFocusEventSuppressor.h \
 		nsPresContext.h \
 		nsPresState.h \
 		nsStyleChangeList.h \
@@ -140,7 +139,6 @@ CPPSRCS		= \
 		nsQuoteList.cpp \
 		nsStyleChangeList.cpp \
 		nsStyleSheetService.cpp \
-		nsFocusEventSuppressor.cpp \
 		$(NULL)
 
 ifndef MOZ_XUL
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 6b6151663b28..399b4fbfdafc 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -477,11 +477,6 @@ nsBidiPresUtils::Resolve(nsBlockFrame*   aBlockFrame,
             mContentToFrameIndex.Get(content, &newIndex);
             if (newIndex > frameIndex) {
               RemoveBidiContinuation(frame, frameIndex, newIndex, temp);
-              if (lineNeedsUpdate) {
-                AdvanceLineIteratorToFrame(frame, &lineIter, prevFrame);
-                lineNeedsUpdate = PR_FALSE;
-              }
-              lineIter.GetLine()->MarkDirty();
               runLength -= temp;
               fragmentLength -= temp;
               lineOffset += temp;
@@ -489,6 +484,11 @@ nsBidiPresUtils::Resolve(nsBlockFrame*   aBlockFrame,
             }
           }
           frame->AdjustOffsetsForBidi(contentOffset, contentOffset + fragmentLength);
+          if (lineNeedsUpdate) {
+            AdvanceLineIteratorToFrame(frame, &lineIter, prevFrame);
+            lineNeedsUpdate = PR_FALSE;
+          }
+          lineIter.GetLine()->MarkDirty();
         }
       } // isTextFrame
       else {
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index f81adf005039..5950fe06069f 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -119,7 +119,6 @@
 #include "nsIPrincipal.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsStyleUtil.h"
-#include "nsIFocusEventSuppressor.h"
 #include "nsBox.h"
 #include "nsTArray.h"
 #include "nsGenericDOMDataNode.h"
@@ -1575,7 +1574,6 @@ nsCSSFrameConstructor::nsCSSFrameConstructor(nsIDocument *aDocument,
   , mGfxScrollFrame(nsnull)
   , mPageSequenceFrame(nsnull)
   , mUpdateCount(0)
-  , mFocusSuppressCount(0)
   , mQuotesDirty(PR_FALSE)
   , mCountersDirty(PR_FALSE)
   , mIsDestroyingFrameTree(PR_FALSE)
@@ -7774,8 +7772,6 @@ nsCSSFrameConstructor::AttributeChanged(nsIContent* aContent,
 
 void
 nsCSSFrameConstructor::BeginUpdate() {
-  NS_SuppressFocusEvent();
-  ++mFocusSuppressCount;
   ++mUpdateCount;
 }
 
@@ -7790,10 +7786,6 @@ nsCSSFrameConstructor::EndUpdate()
     NS_ASSERTION(mUpdateCount == 1, "Odd update count");
   }
   --mUpdateCount;
-  if (mFocusSuppressCount) {
-    NS_UnsuppressFocusEvent();
-    --mFocusSuppressCount;
-  }
 }
 
 void
@@ -7813,23 +7805,6 @@ nsCSSFrameConstructor::RecalcQuotesAndCounters()
   NS_ASSERTION(!mCountersDirty, "Counter updates will be lost");  
 }
 
-class nsFocusUnsuppressEvent : public nsRunnable {
-  public:
-    NS_DECL_NSIRUNNABLE
-    nsFocusUnsuppressEvent(PRUint32 aCount) : mCount(aCount) {}
-  private:
-    PRUint32 mCount;
-  };
-
-NS_IMETHODIMP nsFocusUnsuppressEvent::Run()
-{
-  while (mCount) {
-    --mCount;
-    NS_UnsuppressFocusEvent();
-  }
-  return NS_OK;
-}
-
 void
 nsCSSFrameConstructor::WillDestroyFrameTree()
 {
@@ -7845,14 +7820,6 @@ nsCSSFrameConstructor::WillDestroyFrameTree()
 
   // Cancel all pending re-resolves
   mRestyleEvent.Revoke();
-
-  if (mFocusSuppressCount && mPresShell->IsDestroying()) {
-    nsRefPtr<nsFocusUnsuppressEvent> ev =
-      new nsFocusUnsuppressEvent(mFocusSuppressCount);
-    if (NS_SUCCEEDED(NS_DispatchToCurrentThread(ev))) {
-      mFocusSuppressCount = 0;
-    }
-  }
 }
 
 //STATIC
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 472f72a5619d..48ffe82479a3 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -52,7 +52,6 @@
 #include "nsHashKeys.h"
 #include "nsThreadUtils.h"
 #include "nsPageContentFrame.h"
-#include "nsIViewManager.h"
 
 class nsIDocument;
 struct nsFrameItems;
@@ -88,7 +87,6 @@ public:
   nsCSSFrameConstructor(nsIDocument *aDocument, nsIPresShell* aPresShell);
   ~nsCSSFrameConstructor(void) {
     NS_ASSERTION(mUpdateCount == 0, "Dying in the middle of our own update?");
-    NS_ASSERTION(mFocusSuppressCount == 0, "Focus suppression will be wrong");
   }
 
   // Maintain global objects - gXBLService
@@ -1604,7 +1602,6 @@ private:
   nsQuoteList         mQuoteList;
   nsCounterManager    mCounterManager;
   PRUint16            mUpdateCount;
-  PRUint32            mFocusSuppressCount;
   PRPackedBool        mQuotesDirty : 1;
   PRPackedBool        mCountersDirty : 1;
   PRPackedBool        mIsDestroyingFrameTree : 1;
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 4d80313ad280..84225fdecead 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -118,6 +118,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsJSEnvironment.h"
 #include "nsIFocusController.h"
+#include "nsFocusManager.h"
 
 #include "nsIScrollableView.h"
 #include "nsIHTMLDocument.h"
@@ -1177,6 +1178,13 @@ DocumentViewerImpl::PageHide(PRBool aIsUnload)
   }
 
   mDocument->OnPageHide(!aIsUnload, nsnull);
+
+  // inform the window so that the focus state is reset.
+  NS_ENSURE_STATE(mDocument);
+  nsPIDOMWindow *window = mDocument->GetWindow();
+  if (window)
+    window->PageHidden();
+
   if (aIsUnload) {
     // if Destroy() was called during OnPageHide(), mDocument is nsnull.
     NS_ENSURE_STATE(mDocument);
@@ -4120,29 +4128,23 @@ DocumentViewerImpl::ReturnToGalleyPresentation()
 static void
 ResetFocusState(nsIDocShell* aDocShell)
 {
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return;
+
   nsCOMPtr<nsISimpleEnumerator> docShellEnumerator;
   aDocShell->GetDocShellEnumerator(nsIDocShellTreeItem::typeContent,
                                    nsIDocShell::ENUMERATE_FORWARDS,
                                    getter_AddRefs(docShellEnumerator));
   
-  nsCOMPtr<nsIDocShell> currentDocShell;
   nsCOMPtr<nsISupports> currentContainer;
   PRBool hasMoreDocShells;
   while (NS_SUCCEEDED(docShellEnumerator->HasMoreElements(&hasMoreDocShells))
          && hasMoreDocShells) {
     docShellEnumerator->GetNext(getter_AddRefs(currentContainer));
-    currentDocShell = do_QueryInterface(currentContainer);
-    if (!currentDocShell) {
-      break;
-    }
-    nsCOMPtr<nsPresContext> presContext;
-    currentDocShell->GetPresContext(getter_AddRefs(presContext));
-    nsIEventStateManager* esm =
-      presContext ? presContext->EventStateManager() : nsnull;
-    if (esm) {
-       esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-       esm->SetFocusedContent(nsnull);
-    }
+    nsCOMPtr<nsIDOMWindow> win = do_GetInterface(currentContainer);
+    if (win)
+      fm->ClearFocus(win);
   }
 }
 
diff --git a/layout/base/nsFocusEventSuppressor.cpp b/layout/base/nsFocusEventSuppressor.cpp
deleted file mode 100644
index bdb06be6be23..000000000000
--- a/layout/base/nsFocusEventSuppressor.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Olli Pettay <Olli.Pettay@helsinki.fi> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIFocusEventSuppressor.h"
-#include "nsTArray.h"
-
-class nsFocusEventSuppressorService : public nsIFocusEventSuppressorService
-{
-public:
-  NS_DECL_ISUPPORTS
-  virtual void AddObserverCallback(nsFocusEventSuppressorCallback aCallback)
-  {
-    NS_AddFocusSuppressorCallback(aCallback);
-  }
-  virtual void Suppress()
-  {
-    NS_SuppressFocusEvent();
-  }
-  virtual void Unsuppress()
-  {
-    NS_UnsuppressFocusEvent();
-  }
-};
-
-static nsTArray<nsFocusEventSuppressorCallback>* sCallbacks = nsnull;
-static PRUint32 sFocusSuppressCount = 0;
-
-NS_IMPL_ADDREF(nsFocusEventSuppressorService)
-NS_IMPL_RELEASE(nsFocusEventSuppressorService)
-
-NS_INTERFACE_MAP_BEGIN(nsFocusEventSuppressorService)
-  NS_INTERFACE_MAP_ENTRY(nsIFocusEventSuppressorService)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-void
-NS_AddFocusSuppressorCallback(nsFocusEventSuppressorCallback aCallback)
-{
-  if (aCallback) {
-    if (!sCallbacks) {
-      sCallbacks = new nsTArray<nsFocusEventSuppressorCallback>(2);
-      if (!sCallbacks) {
-        NS_WARNING("Out of memory!");
-        return;
-      }
-    } else if (sCallbacks->Contains(aCallback)) {
-      return;
-    }
-    sCallbacks->AppendElement(aCallback);
-  }
-}
-
-void
-NS_SuppressFocusEvent()
-{
-  ++sFocusSuppressCount;
-  if (sFocusSuppressCount == 1 && sCallbacks) {
-    for (PRUint32 i = 0; i < sCallbacks->Length(); ++i) {
-      sCallbacks->ElementAt(i)(PR_TRUE);
-    }
-  }
-}
-
-void
-NS_UnsuppressFocusEvent()
-{
-  --sFocusSuppressCount;
-  if (sFocusSuppressCount == 0 && sCallbacks) {
-    for (PRUint32 i = 0; i < sCallbacks->Length(); ++i) {
-      sCallbacks->ElementAt(i)(PR_FALSE);
-    }
-  }
-}
-
-void
-NS_ShutdownFocusSuppressor()
-{
-  delete sCallbacks;
-  sCallbacks = nsnull;
-}
-
-nsresult
-NS_NewFocusEventSuppressorService(nsIFocusEventSuppressorService** aResult)
-{
-  nsIFocusEventSuppressorService* it = new nsFocusEventSuppressorService();
-  NS_ENSURE_TRUE(it, NS_ERROR_OUT_OF_MEMORY);
-  NS_ADDREF(*aResult = it);
-  return NS_OK;
-}
diff --git a/layout/base/nsIFocusEventSuppressor.h b/layout/base/nsIFocusEventSuppressor.h
deleted file mode 100644
index 42251c296dbe..000000000000
--- a/layout/base/nsIFocusEventSuppressor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Olli Pettay <Olli.Pettay@helsinki.fi> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIFocusEventSuppressor_h___
-#define nsIFocusEventSuppressor_h___
-#include "nsISupports.h"
-
-typedef void (* nsFocusEventSuppressorCallback)(PRBool aSuppress);
-
-#define NS_NSIFOCUSEVENTSUPPRESSORSERVICE_IID \
-  { 0x8aae5cee, 0x59ab, 0x42d4, \
-    { 0xa3, 0x76, 0xbf, 0x63, 0x54, 0x04, 0xc7, 0x98 } }
-
-class nsIFocusEventSuppressorService : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_NSIFOCUSEVENTSUPPRESSORSERVICE_IID)
-  virtual void AddObserverCallback(nsFocusEventSuppressorCallback aCallback) = 0;
-  virtual void Suppress() = 0;
-  virtual void Unsuppress() = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIFocusEventSuppressorService,
-                              NS_NSIFOCUSEVENTSUPPRESSORSERVICE_IID)
-
-#if defined(_IMPL_NS_LAYOUT) || defined(NS_STATIC_FOCUS_SUPPRESSOR)
-void NS_SuppressFocusEvent();
-void NS_UnsuppressFocusEvent();
-void NS_AddFocusSuppressorCallback(nsFocusEventSuppressorCallback aCallback);
-void NS_ShutdownFocusSuppressor();
-#endif
-
-#define NS_NSIFOCUSEVENTSUPPRESSORSERVICE_CID \
-  { 0x35b2656c, 0x4102, 0x4bc1, \
-    { 0x87, 0x6a, 0xfd, 0x6c, 0xb8, 0x30, 0x78, 0x7b } }
-
-#define NS_NSIFOCUSEVENTSUPPRESSORSERVICE_CONTRACTID \
-  "@mozilla.org/focus-event-suppressor-service;1"
-
-#endif
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index db4680df34d3..3a7dcb6874a5 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -101,10 +101,10 @@ class nsPIDOMEventTarget;
 typedef short SelectionType;
 typedef PRUint32 nsFrameState;
 
-// 4fb87dae-8986-429f-b6ba-f040750e3ee8
+// 41FE90F8-88DF-476E-A3B0-60916234F791
 #define NS_IPRESSHELL_IID \
-  { 0x4fb87dae, 0x8986, 0x429f, \
-    { 0xb6, 0xba, 0xf0, 0x40, 0x75, 0x0e, 0x3e, 0xe8 } }
+{ 0x41fe90f8, 0x88df, 0x476e, \
+  { 0xa3, 0xb0, 0x60, 0x91, 0x62, 0x34, 0xf7, 0x91 } }
 
 // Constants for ScrollContentIntoView() function
 #define NS_PRESSHELL_SCROLL_TOP      0
@@ -707,7 +707,6 @@ public:
    */
   virtual void Thaw() = 0;
 
-  virtual void NeedsFocusOrBlurAfterSuppression(nsPIDOMEventTarget* aTarget, PRUint32 aEventType) = 0;
   virtual void FireOrClearDelayedEvents(PRBool aFireEvents) = 0;
 
   /**
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 2c89bd5de2dd..18db90805f4a 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -48,7 +48,6 @@
 #include "nsIContentViewer.h"
 #include "nsIDocumentViewer.h"
 #include "nsPIDOMWindow.h"
-#include "nsIFocusController.h"
 #include "nsStyleSet.h"
 #include "nsImageLoader.h"
 #include "nsIContent.h"
@@ -1557,7 +1556,7 @@ nsPresContext::SetPrintSettings(nsIPrintSettings *aPrintSettings)
 }
 
 PRBool
-nsPresContext::EnsureVisible(PRBool aUnsuppressFocus)
+nsPresContext::EnsureVisible()
 {
   nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
   if (docShell) {
@@ -1569,22 +1568,8 @@ nsPresContext::EnsureVisible(PRBool aUnsuppressFocus)
       nsCOMPtr<nsPresContext> currentPresContext;
       docV->GetPresContext(getter_AddRefs(currentPresContext));
       if (currentPresContext == this) {
-        // OK, this is us.  We want to call Show() on the content viewer.  But
-        // first, we need to suppress focus changes; otherwise the focus will
-        // get sent to the wrong place (toplevel window).
-        nsCOMPtr<nsPIDOMWindow> privWindow = do_GetInterface(docShell);
-        // XXXbz privWindow should never really be null!
-        nsIFocusController* fc =
-          privWindow ? privWindow->GetRootFocusController() : nsnull;
-        if (fc) {
-          fc->SetSuppressFocus(PR_TRUE,
-                               "nsPresContext::EnsureVisible Suppression");
-        }
+        // OK, this is us.  We want to call Show() on the content viewer.
         cv->Show();
-        if (fc && aUnsuppressFocus) {
-          fc->SetSuppressFocus(PR_FALSE,
-                               "nsPresContext::EnsureVisible Suppression");
-        }
         return PR_TRUE;
       }
     }
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 5e4cbe8382bb..bc69bb1874cc 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -743,12 +743,8 @@ public:
   /* Helper function that ensures that this prescontext is shown in its
      docshell if it's the most recent prescontext for the docshell.  Returns
      whether the prescontext is now being shown.
-
-     @param aUnsuppressFocus If this is false, then focus will not be
-     unsuppressed when PR_TRUE is returned.  It's the caller's responsibility
-     to unsuppress focus in that case.
   */
-  NS_HIDDEN_(PRBool) EnsureVisible(PRBool aUnsuppressFocus);
+  NS_HIDDEN_(PRBool) EnsureVisible();
   
 #ifdef MOZ_REFLOW_PERF
   NS_HIDDEN_(void) CountReflows(const char * aName,
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 55eb6f824215..8beff402d34d 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -152,7 +152,7 @@
 #include "nsIReflowCallback.h"
 
 #include "nsPIDOMWindow.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIPluginInstance.h"
 #include "nsIObjectFrame.h"
 #include "nsIObjectLoadingContent.h"
@@ -810,6 +810,7 @@ public:
 
   NS_IMETHOD BeginObservingDocument();
   NS_IMETHOD EndObservingDocument();
+  NS_IMETHOD GetDidInitialReflow(PRBool *aDidInitialReflow);
   NS_IMETHOD InitialReflow(nscoord aWidth, nscoord aHeight);
   NS_IMETHOD ResizeReflow(nscoord aWidth, nscoord aHeight);
   NS_IMETHOD StyleChangeReflow();
@@ -881,8 +882,6 @@ public:
   virtual nsresult ReconstructFrames(void);
   virtual void Freeze();
   virtual void Thaw();
-  virtual void NeedsFocusOrBlurAfterSuppression(nsPIDOMEventTarget* aTarget,
-                                                PRUint32 aEventType);
   virtual void FireOrClearDelayedEvents(PRBool aFireEvents);
 
   virtual nsIFrame* GetFrameForPoint(nsIFrame* aFrame, nsPoint aPt);
@@ -1192,28 +1191,6 @@ protected:
     }
   };
 
-  class nsDelayedFocusBlur : public nsDelayedEvent
-  {
-  public:
-    nsDelayedFocusBlur(nsPIDOMEventTarget* aTarget, PRUint32 aEventType)
-    : mTarget(aTarget), mEventType(aEventType) {}
-
-    virtual void Dispatch(PresShell* aShell)
-    {
-      nsEvent event(PR_TRUE, mEventType);
-      event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
-      nsEventDispatcher::Dispatch(mTarget, aShell->GetPresContext(), &event);
-    }
-
-    virtual PRBool Equals(nsPIDOMEventTarget* aTarget, PRUint32 aEventType)
-    {
-      return aTarget == mTarget && aEventType == mEventType;
-    }
-
-    nsCOMPtr<nsPIDOMEventTarget> mTarget;
-    PRUint32                     mEventType;
-  };
-
   class nsDelayedInputEvent : public nsDelayedEvent
   {
   public:
@@ -1328,6 +1305,10 @@ protected:
 
   nsCOMPtr<nsIDocumentObserver> mDocumentObserverForNonDynamicContext;
 
+  // false if a check should be done for key/ime events that should be
+  // retargeted to the currently focused presshell
+  static PRBool sDontRetargetEvents;
+
 private:
 
   PRBool InZombieDocument(nsIContent *aContent);
@@ -1521,6 +1502,7 @@ NS_IMPL_ISUPPORTS2(nsDocumentObserverForNonDynamicPresContext,
                    nsIMutationObserver)
 
 PRBool PresShell::sDisableNonTestMouseEvents = PR_FALSE;
+PRBool PresShell::sDontRetargetEvents = PR_FALSE;
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* PresShell::gLog;
@@ -2561,76 +2543,15 @@ PresShell::EndObservingDocument()
 char* nsPresShell_ReflowStackPointerTop;
 #endif
 
-static void CheckForFocus(nsPIDOMWindow* aOurWindow,
-                          nsIFocusController* aFocusController,
-                          nsIDocument* aDocument)
+NS_IMETHODIMP
+PresShell::GetDidInitialReflow(PRBool *aDidInitialReflow)
 {
-  NS_ASSERTION(aOurWindow->IsOuterWindow(),
-               "Uh, our window has to be an outer window!");
+  if (!aDidInitialReflow)
+    return NS_ERROR_FAILURE;
 
-  // Now that we have a root frame, we can set focus on the presshell.
-  // We do this only if our DOM window is currently focused or is an
-  // an ancestor of a previously focused window.
+  *aDidInitialReflow = mDidInitialReflow;
 
-  if (!aFocusController)
-    return;
-
-  nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-  aFocusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-  if (!focusedWindow) {
-    // This happens if the window has not been shown yet. We don't need to
-    // focus anything now because showing the window will set the focus.
-    return;
-  }
-
-  // Walk up the document chain, starting with focusedWindow's document.
-  // We stop walking when we find a document that has a null DOMWindow
-  // (meaning that the DOMWindow has a new document now) or find aOurWindow
-  // as the document's window.  We also stop if we hit aDocument, since
-  // that means there is a child document which loaded before us that's
-  // already been given focus.
-
-  nsCOMPtr<nsIDOMDocument> focusedDOMDoc;
-  focusedWindow->GetDocument(getter_AddRefs(focusedDOMDoc));
-
-  nsCOMPtr<nsIDocument> curDoc = do_QueryInterface(focusedDOMDoc);
-  if (!curDoc) {
-    // This can happen if the previously focused DOM window has been
-    // unhooked from its document during document teardown.  We don't
-    // really have any other information to help us determine where
-    // focusedWindow fits into the DOM window hierarchy.  For now, we'll
-    // go ahead and allow this window to take focus, so that something
-    // ends up focused.
-
-    curDoc = aDocument;
-  }
-
-  while (curDoc) {
-    nsPIDOMWindow *curWin = curDoc->GetWindow();
-
-    if (!curWin || curWin == aOurWindow)
-      break;
-
-    curDoc = curDoc->GetParentDocument();
-    if (curDoc == aDocument)
-      return;
-  }
-
-  if (!curDoc) {
-    // We reached the top of the document chain, and did not encounter
-    // aOurWindow or a windowless document. So, focus should be unaffected
-    // by this document load.
-    return;
-  }
-
-  PRBool active;
-  aFocusController->GetActive(&active);
-  if (active)
-    aOurWindow->Focus();
-
-  // We need to ensure that the focus controller is updated, since it may be
-  // suppressed when this function is called.
-  aFocusController->SetFocusedWindow(aOurWindow);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -3576,10 +3497,17 @@ PresShell::FrameNeedsToContinueReflow(nsIFrame *aFrame)
 nsIScrollableView*
 PresShell::GetViewToScroll(nsLayoutUtils::Direction aDirection)
 {
-  nsCOMPtr<nsIEventStateManager> esm = mPresContext->EventStateManager();
   nsIScrollableView* scrollView = nsnull;
+
   nsCOMPtr<nsIContent> focusedContent;
-  esm->GetFocusedContent(getter_AddRefs(focusedContent));
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm && mDocument) {
+    nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(mDocument->GetWindow());
+
+    nsCOMPtr<nsIDOMElement> focusedElement;
+    fm->GetFocusedElementForWindow(window, PR_FALSE, nsnull, getter_AddRefs(focusedElement));
+    focusedContent = do_QueryInterface(focusedElement);
+  }
   if (!focusedContent && mSelection) {
     nsISelection* domSelection = mSelection->
       GetSelection(nsISelectionController::SELECTION_NORMAL);
@@ -3986,15 +3914,12 @@ PresShell::GoToAnchor(const nsAString& aAnchorName, PRBool aScroll)
       // Now focus the document itself if focus is on an element within it.
       nsPIDOMWindow *win = mDocument->GetWindow();
 
-      if (win) {
-        nsCOMPtr<nsIFocusController> focusController = win->GetRootFocusController();
-        if (focusController) {
-          nsCOMPtr<nsIDOMWindowInternal> focusedWin;
-          focusController->GetFocusedWindow(getter_AddRefs(focusedWin));
-          if (SameCOMIdentity(win, focusedWin)) {
-            esm->ChangeFocusWith(nsnull, nsIEventStateManager::eEventFocusedByApplication);
-          }
-        }
+      nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+      if (fm && win) {
+        nsCOMPtr<nsIDOMWindow> focusedWindow;
+        fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
+        if (SameCOMIdentity(win, focusedWindow))
+          fm->ClearFocus(focusedWindow);
       }
     }
   } else {
@@ -4253,27 +4178,6 @@ PresShell::ScrollContentIntoView(nsIContent* aContent,
   nsCOMPtr<nsIDocument> currentDoc = content->GetCurrentDoc();
   NS_ENSURE_STATE(currentDoc);
 
-  // Before we scroll the frame into view, ask the command dispatcher
-  // if we're resetting focus because a window just got an activate
-  // event. If we are, we do not want to scroll the frame into view.
-  // Example: The user clicks on an anchor, and then deactivates the 
-  // window. When they reactivate the window, the expected behavior
-  // is not for the anchor link to scroll back into view. That is what
-  // this check is preventing.
-  // XXX: The dependency on the command dispatcher needs to be fixed.
-  nsPIDOMWindow* ourWindow = currentDoc->GetWindow();
-  if (ourWindow) {
-    nsIFocusController *focusController = ourWindow->GetRootFocusController();
-    if (focusController) {
-      PRBool dontScroll = PR_FALSE;
-      focusController->GetSuppressFocusScroll(&dontScroll);
-      if (dontScroll) {
-        mContentToScrollTo = nsnull;
-        return NS_OK;
-      }
-    }
-  }
-
   mContentToScrollTo = aContent;
   mContentScrollVPosition = aVPercent;
   mContentScrollHPosition = aHPercent;
@@ -4436,14 +4340,13 @@ PresShell::GetSelectionForCopy(nsISelection** outSelection)
   if (!mDocument) return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsIContent> content;
-  nsPIDOMWindow *ourWindow = mDocument->GetWindow();
-  if (ourWindow) {
-    nsIFocusController *focusController = ourWindow->GetRootFocusController();
-    if (focusController) {
-      nsCOMPtr<nsIDOMElement> focusedElement;
-      focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-      content = do_QueryInterface(focusedElement);
-    }
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(mDocument->GetWindow());
+
+    nsCOMPtr<nsIDOMElement> focusedElement;
+    fm->GetFocusedElementForWindow(window, PR_FALSE, nsnull, getter_AddRefs(focusedElement));
+    content = do_QueryInterface(focusedElement);
   }
 
   nsCOMPtr<nsISelection> sel;
@@ -4631,7 +4534,7 @@ PresShell::IsPaintingSuppressed(PRBool* aResult)
 void
 PresShell::UnsuppressAndInvalidate()
 {
-  if (!mPresContext->EnsureVisible(PR_FALSE) || mHaveShutDown) {
+  if (!mPresContext->EnsureVisible() || mHaveShutDown) {
     // No point; we're about to be torn down anyway.
     return;
   }
@@ -4644,18 +4547,10 @@ PresShell::UnsuppressAndInvalidate()
     rootFrame->Invalidate(rect);
   }
 
-  // This makes sure to get the same thing that nsPresContext::EnsureVisible()
-  // got.
-  nsCOMPtr<nsISupports> container = mPresContext->GetContainer();
-  nsCOMPtr<nsPIDOMWindow> ourWindow = do_GetInterface(container);
-  nsCOMPtr<nsIFocusController> focusController =
-    ourWindow ? ourWindow->GetRootFocusController() : nsnull;
-
-  if (ourWindow)
-    CheckForFocus(ourWindow, focusController, mDocument);
-
-  if (focusController) // Unsuppress now that we've shown the new window and focused it.
-    focusController->SetSuppressFocus(PR_FALSE, "PresShell suppression on Web page loads");
+  // now that painting is unsuppressed, focus may be set on the document
+  nsPIDOMWindow *win = mDocument->GetWindow();
+  if (win)
+    win->SetReadyForFocus();
 
   if (!mHaveShutDown && mViewManager)
     mViewManager->SynthesizeMouseMove(PR_FALSE);
@@ -5078,7 +4973,7 @@ PresShell::ContentRemoved(nsIDocument *aDocument,
 
   // Notify the ESM that the content has been removed, so that
   // it can clean up any state related to the content.
-  mPresContext->EventStateManager()->ContentRemoved(aChild);
+  mPresContext->EventStateManager()->ContentRemoved(aDocument, aChild);
 
   nsAutoScriptBlocker scriptBlocker;
 
@@ -5915,8 +5810,10 @@ nsresult PresShell::RetargetEventToParent(nsGUIEvent*     aEvent,
   nsIView *parentRootView;
   parentPresShell->GetViewManager()->GetRootView(parentRootView);
   
-  return parentViewObserver->HandleEvent(parentRootView, aEvent, 
-                                         aEventStatus);
+  sDontRetargetEvents = PR_TRUE;
+  nsresult rv = parentViewObserver->HandleEvent(parentRootView, aEvent, aEventStatus);
+  sDontRetargetEvents = PR_FALSE;
+  return rv;
 }
 
 NS_IMETHODIMP
@@ -5947,6 +5844,45 @@ PresShell::HandleEvent(nsIView         *aView,
   }
 #endif
 
+  // key and IME events must be targeted at the presshell for the focused frame
+  if (!sDontRetargetEvents &&
+      (NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_EVENT(aEvent) ||
+       NS_IS_CONTEXT_MENU_KEY(aEvent))) {
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (!fm)
+      return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsIDOMWindow> window;
+    fm->GetFocusedWindow(getter_AddRefs(window));
+
+    // if there is no focused frame, there isn't anything to fire a key event
+    // at so just return
+    nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(window);
+    if (!piWindow)
+      return NS_OK;
+
+    nsCOMPtr<nsIDocument> doc(do_QueryInterface(piWindow->GetExtantDocument()));    
+    if (!doc)
+      return NS_OK;
+
+    nsIPresShell *presShell = doc->GetPrimaryShell();
+    if (!presShell)
+      return NS_OK;
+
+    if (presShell != this) {
+      nsCOMPtr<nsIViewObserver> viewObserver = do_QueryInterface(presShell);
+      if (!viewObserver)
+        return NS_ERROR_FAILURE;
+
+      nsIView *view;
+      presShell->GetViewManager()->GetRootView(view);
+      sDontRetargetEvents = PR_TRUE;
+      nsresult rv = viewObserver->HandleEvent(view, aEvent, aEventStatus);
+      sDontRetargetEvents = PR_FALSE;
+      return rv;
+    }
+  }
+
   // Check for a theme change up front, since the frame type is irrelevant
   if (aEvent->message == NS_THEMECHANGED && mPresContext) {
     mPresContext->ThemeChanged();
@@ -5973,34 +5909,25 @@ PresShell::HandleEvent(nsIView         *aView,
     return NS_OK;
   }
 
-  PRBool widgetHandlingEvent =
-    (aEvent->message == NS_GOTFOCUS ||
-     aEvent->message == NS_LOSTFOCUS ||
-     aEvent->message == NS_ACTIVATE ||
-     aEvent->message == NS_DEACTIVATE);
   if (mDocument && mDocument->EventHandlingSuppressed()) {
-    if (!widgetHandlingEvent) {
-      nsDelayedEvent* event = nsnull;
-      if (aEvent->eventStructType == NS_KEY_EVENT) {
-        if (aEvent->message == NS_KEY_DOWN) {
-          mNoDelayedKeyEvents = PR_TRUE;
-        } else if (!mNoDelayedKeyEvents) {
-          event = new nsDelayedKeyEvent(static_cast<nsKeyEvent*>(aEvent));
-        }
-      } else if (aEvent->eventStructType == NS_MOUSE_EVENT) {
-        if (aEvent->message == NS_MOUSE_BUTTON_DOWN) {
-          mNoDelayedMouseEvents = PR_TRUE;
-        } else if (!mNoDelayedMouseEvents && aEvent->message == NS_MOUSE_BUTTON_UP) {
-          event = new nsDelayedMouseEvent(static_cast<nsMouseEvent*>(aEvent));
-        }
+    nsDelayedEvent* event = nsnull;
+    if (aEvent->eventStructType == NS_KEY_EVENT) {
+      if (aEvent->message == NS_KEY_DOWN) {
+        mNoDelayedKeyEvents = PR_TRUE;
+      } else if (!mNoDelayedKeyEvents) {
+        event = new nsDelayedKeyEvent(static_cast<nsKeyEvent*>(aEvent));
       }
-      if (event && !mDelayedEvents.AppendElement(event)) {
-        delete event;
+    } else if (aEvent->eventStructType == NS_MOUSE_EVENT) {
+      if (aEvent->message == NS_MOUSE_BUTTON_DOWN) {
+        mNoDelayedMouseEvents = PR_TRUE;
+      } else if (!mNoDelayedMouseEvents && aEvent->message == NS_MOUSE_BUTTON_UP) {
+        event = new nsDelayedMouseEvent(static_cast<nsMouseEvent*>(aEvent));
       }
-      return NS_OK;
     }
-  } else if (widgetHandlingEvent) {
-    FireOrClearDelayedEvents(PR_FALSE);
+    if (event && !mDelayedEvents.AppendElement(event)) {
+      delete event;
+    }
+    return NS_OK;
   }
 
   nsIFrame* frame = static_cast<nsIFrame*>(aView->GetClientData());
@@ -6103,40 +6030,36 @@ PresShell::HandleEvent(nsIView         *aView,
     PushCurrentEventInfo(nsnull, nsnull);
 
     // key and IME events go to the focused frame
-    nsIEventStateManager *esm = mPresContext->EventStateManager();
-
     if (NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_EVENT(aEvent) ||
         NS_IS_CONTEXT_MENU_KEY(aEvent) || NS_IS_PLUGIN_EVENT(aEvent)) {
-      esm->GetFocusedFrame(&mCurrentEventFrame);
-      if (mCurrentEventFrame) {
-        esm->GetFocusedContent(getter_AddRefs(mCurrentEventContent));
-      } else {
-        if (NS_TargetUnfocusedEventToLastFocusedContent(aEvent)) {
-          nsPIDOMWindow *ourWindow = mDocument->GetWindow();
-          if (ourWindow) {
-            nsIFocusController *focusController =
-              ourWindow->GetRootFocusController();
-            if (focusController) {
-              PRBool active = PR_FALSE;
-              // check input focus is in Mozilla
-              focusController->GetActive(&active);
-              if (!active) {
-                // if not, search for pre-focused element
-                nsCOMPtr<nsIDOMElement> focusedElement;
-                focusController->GetFocusedElement(getter_AddRefs(focusedElement));
-                if (focusedElement) {
-                  // get mCurrentEventContent from focusedElement
-                  mCurrentEventContent = do_QueryInterface(focusedElement);
-                }
-              }
-            }
-          }
-        }
-        if (!mCurrentEventContent) {
-          mCurrentEventContent = mDocument->GetRootContent();
-        }
-        mCurrentEventFrame = nsnull; // XXXldb Isn't it already?
+      nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+      if (!fm)
+        return NS_ERROR_FAILURE;
+
+      nsCOMPtr<nsIDOMElement> element;
+      fm->GetFocusedElement(getter_AddRefs(element));
+      mCurrentEventContent = do_QueryInterface(element);
+
+      // a key or IME event may come in to an inactive window. In this
+      // situation, look for the element that would be focused if this
+      // window was active.
+      if (!mCurrentEventContent &&
+          NS_TargetUnfocusedEventToLastFocusedContent(aEvent)) {
+        nsPIDOMWindow *win = mDocument->GetWindow();
+        nsCOMPtr<nsPIDOMWindow> focusedWindow;
+        mCurrentEventContent =
+          nsFocusManager::GetFocusedDescendant(win, PR_TRUE, getter_AddRefs(focusedWindow));
       }
+
+      // otherwise, if there is no focused content or the focused content has
+      // no frame, just use the root content. This ensures that key events
+      // still get sent to the window properly if nothing is focused or if a
+      // frame goes away while it is focused.
+      if (!mCurrentEventContent || !GetCurrentEventFrame())
+        mCurrentEventContent = mDocument->GetRootContent();
+      mCurrentEventFrame = nsnull;
+
+        
       if (!mCurrentEventContent || InZombieDocument(mCurrentEventContent)) {
         rv = RetargetEventToParent(aEvent, aEventStatus);
         PopCurrentEventInfo();
@@ -6155,7 +6078,7 @@ PresShell::HandleEvent(nsIView         *aView,
     PopCurrentEventInfo();
   } else {
     // Focus events need to be dispatched even if no frame was found, since
-    // we don't want the focus controller to be out of sync.
+    // we don't want the focus to be out of sync.
 
     if (!NS_EVENT_NEEDS_FRAME(aEvent)) {
       mCurrentEventFrame = nsnull;
@@ -6304,17 +6227,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
 
     if (NS_IS_TRUSTED_EVENT(aEvent)) {
       switch (aEvent->message) {
-      case NS_GOTFOCUS:
-      case NS_LOSTFOCUS:
-      case NS_ACTIVATE:
-      case NS_DEACTIVATE:
-        // Treat focus/blur events as user input if they happen while
-        // executing trusted script, or no script at all. If they
-        // happen during execution of non-trusted script, then they
-        // should not be considered user input.
-        if (!nsContentUtils::IsCallerChrome()) {
-          break;
-        }
       case NS_MOUSE_BUTTON_DOWN:
       case NS_MOUSE_BUTTON_UP:
       case NS_KEY_PRESS:
@@ -6462,28 +6374,21 @@ PresShell::AdjustContextMenuKeyEvent(nsMouseEvent* aEvent)
   // If we're here because of the key-equiv for showing context menus, we
   // have to reset the event target to the currently focused element. Get it
   // from the focus controller.
-  nsIDocument *doc = GetDocument();
-  if (doc) {
-    nsPIDOMWindow* privWindow = doc->GetWindow();
-    if (privWindow) {
-      nsIFocusController *focusController =
-        privWindow->GetRootFocusController();
-      if (focusController) {
-        nsCOMPtr<nsIDOMElement> currentFocus;
-        focusController->GetFocusedElement(getter_AddRefs(currentFocus));
-        // Reset event coordinates relative to focused frame in view
-        if (currentFocus) {
-          nsCOMPtr<nsIContent> currentPointElement;
-          GetCurrentItemAndPositionForElement(currentFocus,
-                                              getter_AddRefs(currentPointElement),
-                                              aEvent->refPoint);
-          if (currentPointElement) {
-            mCurrentEventContent = currentPointElement;
-            mCurrentEventFrame = nsnull;
-            GetCurrentEventFrame();
-          }
-        }
-      }
+  nsCOMPtr<nsIDOMElement> currentFocus;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm)
+    fm->GetFocusedElement(getter_AddRefs(currentFocus));
+
+  // Reset event coordinates relative to focused frame in view
+  if (currentFocus) {
+    nsCOMPtr<nsIContent> currentPointElement;
+    GetCurrentItemAndPositionForElement(currentFocus,
+                                        getter_AddRefs(currentPointElement),
+                                        aEvent->refPoint);
+    if (currentPointElement) {
+      mCurrentEventContent = currentPointElement;
+      mCurrentEventFrame = nsnull;
+      GetCurrentEventFrame();
     }
   }
 
@@ -6867,24 +6772,6 @@ PresShell::FireOrClearDelayedEvents(PRBool aFireEvents)
   }
 }
 
-void
-PresShell::NeedsFocusOrBlurAfterSuppression(nsPIDOMEventTarget* aTarget,
-                                            PRUint32 aEventType)
-{
-  if (mDocument && mDocument->EventHandlingSuppressed()) {
-    for (PRUint32 i = mDelayedEvents.Length(); i > 0; --i) {
-      if (mDelayedEvents[i - 1]->Equals(aTarget, aEventType)) {
-        mDelayedEvents.RemoveElementAt(i - 1);
-      }
-    }
-
-    nsDelayedFocusBlur* delayed = new nsDelayedFocusBlur(aTarget, aEventType);
-    if (delayed && !mDelayedEvents.AppendElement(delayed)) {
-      delete delayed;
-    }
-  }
-}
-
 static void
 ThawElement(nsIContent *aContent, void *aShell)
 {
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
index 811cf7451a84..25f82c2a3cae 100644
--- a/layout/build/nsLayoutCID.h
+++ b/layout/build/nsLayoutCID.h
@@ -234,6 +234,10 @@
 #define NS_DOMJSON_CID \
 { 0x93ad72a6, 0x02cd, 0x4716, { 0x96, 0x26, 0xd4, 0x7d, 0x5e, 0xc2, 0x75, 0xec } }
 
+// {CF7FD51F-ABA2-44C1-9FF0-11F7508EFCD4}
+#define NS_FOCUSMANAGER_CID \
+{ 0xcf7fd51f, 0xaba2, 0x44c1, { 0x9f, 0xf0, 0x11, 0xf7, 0x50, 0x8e, 0xfc, 0xd4 } }
+
 #ifdef MOZ_MEDIA
 #define NS_HTMLAUDIOELEMENT_CID                   \
 { /* 1d40026b-4c44-4f6f-b158-26bb5e9c65e9 */      \
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index ebcace7bcc3c..5617baa3181e 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -100,6 +100,7 @@
 #include "nsILanguageAtomService.h"
 #include "nsStyleSheetService.h"
 #include "nsXULPopupManager.h"
+#include "nsFocusManager.h"
 
 // Transformiix stuff
 #include "nsXPathEvaluator.h"
@@ -127,8 +128,6 @@
 #include "nsDOMStorage.h"
 #include "nsJSON.h"
 
-#include "nsIFocusEventSuppressor.h"
-
 // Editor stuff
 #include "nsEditorCID.h"
 #include "nsEditor.h"
@@ -425,7 +424,6 @@ nsresult NS_NewTextEncoder(nsIDocumentEncoder** aResult);
 nsresult NS_NewXBLService(nsIXBLService** aResult);
 nsresult NS_NewContentPolicy(nsIContentPolicy** aResult);
 nsresult NS_NewDOMEventGroup(nsIDOMEventGroup** aResult);
-nsresult NS_NewFocusEventSuppressorService(nsIFocusEventSuppressorService** aResult);
 
 NS_IMETHODIMP NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
@@ -514,7 +512,6 @@ MAKE_CTOR(CreateSanitizingHTMLSerializer, nsIContentSerializer,        NS_NewSan
 MAKE_CTOR(CreateXBLService,               nsIXBLService,               NS_NewXBLService)
 MAKE_CTOR(CreateContentPolicy,            nsIContentPolicy,            NS_NewContentPolicy)
 MAKE_CTOR(CreateComputedDOMStyle,         nsIComputedDOMStyle,         NS_NewComputedDOMStyle)
-MAKE_CTOR(CreateFocusEventSuppressorService,nsIFocusEventSuppressorService,NS_NewFocusEventSuppressorService)
 #ifdef MOZ_XUL
 MAKE_CTOR(CreateXULSortService,           nsIXULSortService,           NS_NewXULSortService)
 // NS_NewXULContentBuilder
@@ -539,6 +536,7 @@ MAKE_CTOR(CreatePluginDocument,           nsIDocument,                 NS_NewPlu
 #ifdef MOZ_MEDIA
 MAKE_CTOR(CreateVideoDocument,            nsIDocument,                 NS_NewVideoDocument)
 #endif
+MAKE_CTOR(CreateFocusManager,             nsIFocusManager,      NS_NewFocusManager)
 
 #ifdef MOZ_ENABLE_CANVAS
 MAKE_CTOR(CreateCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D, NS_NewCanvasRenderingContext2D)
@@ -1333,11 +1331,6 @@ static const nsModuleComponentInfo gComponents[] = {
   { "View Manager", NS_VIEW_MANAGER_CID, "@mozilla.org/view-manager;1",
     nsViewManagerConstructor },
 
-  { "Focus Event Suppressor",
-    NS_NSIFOCUSEVENTSUPPRESSORSERVICE_CID,
-    NS_NSIFOCUSEVENTSUPPRESSORSERVICE_CONTRACTID,
-    CreateFocusEventSuppressorService },
-
   { "Plugin Document Loader Factory",
     NS_PLUGINDOCLOADERFACTORY_CID,
     "@mozilla.org/content/plugin/document-loader-factory;1",
@@ -1459,6 +1452,11 @@ static const nsModuleComponentInfo gComponents[] = {
       nsGeolocationServiceConstructor },
 
 
+
+  { "Focus Manager",
+    NS_FOCUSMANAGER_CID,
+    "@mozilla.org/focus-manager;1",
+    CreateFocusManager },
 };
 
 NS_IMPL_NSGETMODULE_WITH_CTOR(nsLayoutModule, gComponents, Initialize)
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 3c8acbdadba8..6f1cdaf8f680 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -80,11 +80,11 @@
 #include "nsTextFragment.h"
 #include "nsCSSRuleProcessor.h"
 #include "nsXMLHttpRequest.h"
-#include "nsIFocusEventSuppressor.h"
 #include "nsDOMThreadService.h"
 #include "nsHTMLDNSPrefetch.h"
 #include "nsHtml5Module.h"
 #include "nsCrossSiteListenerProxy.h"
+#include "nsFocusManager.h"
 
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
@@ -255,6 +255,12 @@ nsLayoutStatics::Initialize()
   }
 #endif
 
+  rv = nsFocusManager::Init();
+  if (NS_FAILED(rv)) {
+    NS_ERROR("Could not initialize nsFocusManager");
+    return rv;
+  }
+
 #ifdef MOZ_MEDIA
   rv = nsMediaDecoder::InitLogger();
   if (NS_FAILED(rv)) {
@@ -279,6 +285,7 @@ nsLayoutStatics::Initialize()
 void
 nsLayoutStatics::Shutdown()
 {
+  nsFocusManager::Shutdown();
 #ifdef MOZ_XUL
   nsXULPopupManager::Shutdown();
 #endif
@@ -349,8 +356,6 @@ nsLayoutStatics::Shutdown()
 
   nsDOMThreadService::Shutdown();
 
-  NS_ShutdownFocusSuppressor();
-
 #ifdef MOZ_MEDIA
   nsHTMLMediaElement::ShutdownMediaTypes();
 #endif
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index 91287ab564e4..70bdc8ea7091 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -243,13 +243,6 @@ NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame)
 void 
 nsFileControlFrame::SetFocus(PRBool aOn, PRBool aRepaint)
 {
-  // Fix for Bug 6133 
-  if (mTextFrame) {
-    nsIContent* content = mTextFrame->GetContent();
-    if (content) {
-      content->SetFocus(PresContext());
-    }
-  }
 }
 
 /**
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index b9dc035a308e..1607c8fbcad4 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -118,6 +118,7 @@
 #include "nsIDOM3EventTarget.h"
 #include "nsINativeKeyBindings.h"
 #include "nsIJSContextStack.h"
+#include "nsFocusManager.h"
 
 #define DEFAULT_COLUMN_WIDTH 20
 
@@ -135,15 +136,6 @@ static const PRInt32 DEFAULT_UNDO_CAP = 1000;
 static nsINativeKeyBindings *sNativeInputBindings = nsnull;
 static nsINativeKeyBindings *sNativeTextAreaBindings = nsnull;
 
-static PRBool
-IsFocusedContent(nsPresContext* aPresContext, nsIContent* aContent)
-{
-  nsCOMPtr<nsIContent> focusedContent;
-  aPresContext->EventStateManager()->
-    GetFocusedContent(getter_AddRefs(focusedContent));
-  return focusedContent == aContent;
-}
-
 static void
 PlatformToDOMLineBreaks(nsString &aString)
 {
@@ -190,7 +182,6 @@ GetWrapPropertyEnum(nsIContent* aContent, nsHTMLTextWrap& aWrapProp)
 }
 
 class nsTextInputListener : public nsISelectionListener,
-                            public nsIDOMFocusListener,
                             public nsIDOMKeyListener,
                             public nsIEditorObserver,
                             public nsSupportsWeakReference
@@ -212,14 +203,7 @@ public:
 
   NS_DECL_NSISELECTIONLISTENER
 
-  /** nsIDOMFocusListener interfaces 
-    * used to propagate focus, blur, and change notifications
-    * @see nsIDOMFocusListener
-    */
   NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
-  NS_IMETHOD Focus(nsIDOMEvent* aEvent);
-  NS_IMETHOD Blur (nsIDOMEvent* aEvent);
-  /* END interfaces from nsIDOMFocusListener*/
 
   // nsIDOMKeyListener
   NS_IMETHOD KeyDown(nsIDOMEvent *aKeyEvent);
@@ -276,13 +260,25 @@ NS_INTERFACE_MAP_BEGIN(nsTextInputListener)
   NS_INTERFACE_MAP_ENTRY(nsIEditorObserver)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
   NS_INTERFACE_MAP_ENTRY(nsIDOMKeyListener)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFocusListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFocusListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMKeyListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMKeyListener)
 NS_INTERFACE_MAP_END
 
 // BEGIN nsIDOMSelectionListener
 
+static PRBool
+IsFocusedContent(nsIContent* aContent)
+{
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (!fm)
+    return PR_FALSE;
+
+  nsCOMPtr<nsIDOMElement> focusedElement;
+  fm->GetFocusedElement(getter_AddRefs(focusedElement));
+  nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
+  return (focusedContent == aContent);
+}
+
 NS_IMETHODIMP
 nsTextInputListener::NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection* aSel, PRInt16 aReason)
 {
@@ -332,23 +328,15 @@ nsTextInputListener::NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection*
   
   mSelectionWasCollapsed = collapsed;
 
-  if (!mFrame) {
+  if (!mFrame || !IsFocusedContent(mFrame->GetContent()))
     return NS_OK;
-  }
-  
-  nsCOMPtr<nsIContent> focusedContent;
-  mFrame->PresContext()->EventStateManager()->
-    GetFocusedContent(getter_AddRefs(focusedContent));
-  if (focusedContent != mFrame->GetContent()) {
-    return NS_OK;
-  }
 
   return UpdateTextInputCommands(NS_LITERAL_STRING("select"));
 }
 
 // END nsIDOMSelectionListener
 
-// BEGIN nsIFocusListener
+// BEGIN nsIDOMKeyListener
 
 NS_IMETHODIMP
 nsTextInputListener::HandleEvent(nsIDOMEvent* aEvent)
@@ -356,47 +344,6 @@ nsTextInputListener::HandleEvent(nsIDOMEvent* aEvent)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsTextInputListener::Focus(nsIDOMEvent* aEvent)
-{
-  if (!mFrame)
-    return NS_OK;
-
-  nsCOMPtr<nsIEditor> editor;
-  mFrame->GetEditor(getter_AddRefs(editor));
-  if (editor) {
-    editor->AddEditorObserver(this);
-  }
-
-  nsresult rv = mFrame->InitFocusedValue();
-
-  if (NS_SUCCEEDED(rv))
-    rv = mFrame->MaybeBeginSecureKeyboardInput();
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsTextInputListener::Blur(nsIDOMEvent* aEvent)
-{
-  if (!mFrame)
-    return NS_OK;
-
-  nsCOMPtr<nsIEditor> editor;
-  mFrame->GetEditor(getter_AddRefs(editor));
-  if (editor) {
-    editor->RemoveEditorObserver(this);
-  }
-
-  mFrame->MaybeEndSecureKeyboardInput();
-
-  return NS_OK;
-}
-
-// END nsIFocusListener
-
-// BEGIN nsIDOMKeyListener
-
 static void
 DoCommandCallback(const char *aCommand, void *aData)
 {
@@ -1134,10 +1081,6 @@ nsTextControlFrame::PreDestroy()
   if (mTextListener)
   {
     mTextListener->SetFrame(nsnull);
-    if (mContent)
-    {
-      mContent->RemoveEventListenerByIID(static_cast<nsIDOMFocusListener  *>(mTextListener), NS_GET_IID(nsIDOMFocusListener));
-    }
 
     nsCOMPtr<nsIDOMEventGroup> systemGroup;
     mContent->GetSystemEventGroup(getter_AddRefs(systemGroup));
@@ -1412,11 +1355,8 @@ nsTextControlFrame::DelayedEditorInit()
   pusher.PushNull();
 
   InitEditor();
-  // Notify the text listener we have focus and setup the caret etc (bug 446663).
-  if (IsFocusedContent(PresContext(), GetContent())) {
-    mTextListener->Focus(nsnull);
+  if (IsFocusedContent(GetContent()))
     SetFocus(PR_TRUE, PR_FALSE);
-  }
 }
 
 nsresult
@@ -1892,14 +1832,25 @@ nsTextControlFrame::IsLeaf() const
 //IMPLEMENTING NS_IFORMCONTROLFRAME
 void nsTextControlFrame::SetFocus(PRBool aOn, PRBool aRepaint)
 {
-  if (!aOn || !mSelCon)
+  nsCOMPtr<nsIEditor> editor;
+  GetEditor(getter_AddRefs(editor));
+
+  if (!aOn) {
+    if (editor)
+      editor->RemoveEditorObserver(mTextListener);
+
+    MaybeEndSecureKeyboardInput();
+    return;
+  }
+
+  if (!mSelCon)
     return;
 
-  // onfocus="some_where_else.focus()" can trigger several focus
-  // in succession. Here, we only care if we are the winner.
-  // @see also nsTextEditorFocusListener::Focus()
-  if (!IsFocusedContent(PresContext(), mContent))
-    return;
+  if (editor)
+    editor->AddEditorObserver(mTextListener);
+
+  if (NS_SUCCEEDED(InitFocusedValue()))
+    MaybeBeginSecureKeyboardInput();
 
   // tell the caret to use our selection
 
@@ -2425,14 +2376,14 @@ nsTextControlFrame::AttributeChanged(PRInt32         aNameSpaceID,
     if (AttributeExists(nsGkAtoms::readonly))
     { // set readonly
       flags |= nsIPlaintextEditor::eEditorReadonlyMask;
-      if (IsFocusedContent(PresContext(), mContent))
+      if (IsFocusedContent(mContent))
         mSelCon->SetCaretEnabled(PR_FALSE);
     }
     else 
     { // unset readonly
       flags &= ~(nsIPlaintextEditor::eEditorReadonlyMask);
       if (!(flags & nsIPlaintextEditor::eEditorDisabledMask) &&
-          IsFocusedContent(PresContext(), mContent))
+          IsFocusedContent(mContent))
         mSelCon->SetCaretEnabled(PR_TRUE);
     }    
     mEditor->SetFlags(flags);
@@ -2445,7 +2396,7 @@ nsTextControlFrame::AttributeChanged(PRInt32         aNameSpaceID,
     { // set disabled
       flags |= nsIPlaintextEditor::eEditorDisabledMask;
       mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_OFF);
-      if (IsFocusedContent(PresContext(), mContent))
+      if (IsFocusedContent(mContent))
         mSelCon->SetCaretEnabled(PR_FALSE);
     }
     else 
@@ -2803,17 +2754,7 @@ nsTextControlFrame::SetInitialChildList(nsIAtom*        aListName,
       scrollableFrame->SetScrollbarVisibility(PR_FALSE, PR_FALSE);
   }
 
-  //register focus and key listeners
-  if (mContent) {
-    // register the event listeners with the DOM event receiver
-    rv = mContent->AddEventListenerByIID(static_cast<nsIDOMFocusListener *>(mTextListener),
-                                         NS_GET_IID(nsIDOMFocusListener));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener");
-    // XXXbryner do we need to check for a null presshell here?
-    if (!PresContext()->GetPresShell())
-      return NS_ERROR_FAILURE;
-  }
-
+  //register key listeners
   nsCOMPtr<nsIDOMEventGroup> systemGroup;
   mContent->GetSystemEventGroup(getter_AddRefs(systemGroup));
   nsCOMPtr<nsIDOM3EventTarget> dom3Targ = do_QueryInterface(mContent);
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 4bca9e3f2ae9..c8d9aa17563a 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -297,7 +297,8 @@ nsContainerFrame::Destroy()
         nsIContent* content = generatedContent->ObjectAt(i);
         // Tell the ESM that this content is going away now, so it'll update
         // its hover content, etc.
-        PresContext()->EventStateManager()->ContentRemoved(content);
+        PresContext()->EventStateManager()->
+          ContentRemoved(content->GetCurrentDoc(), content);
         content->UnbindFromTree();
       }
       delete generatedContent;
diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsHTMLFrame.cpp
index 35484ba7e562..00bc9871987b 100644
--- a/layout/generic/nsHTMLFrame.cpp
+++ b/layout/generic/nsHTMLFrame.cpp
@@ -58,7 +58,6 @@
 
 // for focus
 #include "nsIDOMWindowInternal.h"
-#include "nsIFocusController.h"
 #include "nsIScrollableFrame.h"
 #include "nsIScrollableView.h"
 #include "nsIDocShell.h"
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index ece4158103b5..555da064ecb4 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -114,6 +114,7 @@
 #include "nsAttrName.h"
 #include "nsDataHashtable.h"
 #include "nsDOMClassInfo.h"
+#include "nsFocusManager.h"
 
 // headers for plugin scriptability
 #include "nsIScriptGlobalObject.h"
@@ -1643,11 +1644,10 @@ nsObjectFrame::HandleEvent(nsPresContext* aPresContext,
   mInstanceOwner->ConsiderNewEventloopNestingLevel();
 
   if (anEvent->message == NS_PLUGIN_ACTIVATE) {
-    nsIContent* content = GetContent();
-    if (content) {
-      content->SetFocus(aPresContext);
-      return rv;
-    }
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(GetContent());
+    if (fm && elem)
+      return fm->SetFocus(elem, 0);
   }
 
   if (mInstanceOwner->SendNativeEvents() && NS_IS_PLUGIN_EVENT(anEvent)) {
@@ -1664,8 +1664,8 @@ nsObjectFrame::HandleEvent(nsPresContext* aPresContext,
   case NS_DESTROY:
     mInstanceOwner->CancelTimer();
     break;
-  case NS_GOTFOCUS:
-  case NS_LOSTFOCUS:
+  case NS_ACTIVATE:
+  case NS_DEACTIVATE:
     *anEventStatus = mInstanceOwner->ProcessEvent(*anEvent);
     break;
     
@@ -3061,8 +3061,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
   // (see the AddAttributes functions in the HTML and XML content sinks).
   PRInt16 start, end, increment;
   if (mContent->IsNodeOfType(nsINode::eHTML) &&
-      mContent->GetOwnerDoc() && // XXX clean up after bug 335998 lands
-      !(mContent->GetOwnerDoc()->IsCaseSensitive())) {
+      mContent->IsInHTMLDocument()) {
     // HTML.  Walk attributes in reverse order.
     start = numRealAttrs - 1;
     end = -1;
@@ -3163,25 +3162,14 @@ NPDrawingModel nsPluginInstanceOwner::GetDrawingModel()
 
 void nsPluginInstanceOwner::GUItoMacEvent(const nsGUIEvent& anEvent, EventRecord* origEvent, EventRecord& aMacEvent)
 {
-  nsPresContext* presContext = mOwner ? mOwner->PresContext() : nsnull;
   InitializeEventRecord(&aMacEvent);
   switch (anEvent.message) {
-    case NS_FOCUS_EVENT_START:   // this is the same as NS_FOCUS_CONTENT
+    case NS_FOCUS_CONTENT: 
         aMacEvent.what = nsPluginEventType_GetFocusEvent;
-        if (presContext) {
-            nsIContent* content = mContent;
-            if (content)
-                content->SetFocus(presContext);
-        }
         break;
 
     case NS_BLUR_CONTENT:
         aMacEvent.what = nsPluginEventType_LoseFocusEvent;
-        if (presContext) {
-            nsIContent* content = mContent;
-            if (content)
-                content->RemoveFocus(presContext);
-        }
         break;
 
     case NS_MOUSE_MOVE:
@@ -3499,7 +3487,12 @@ nsPluginInstanceOwner::MouseDown(nsIDOMEvent* aMouseEvent)
   // otherwise, we might not get key events
   if (mOwner && mPluginWindow &&
       mPluginWindow->type == nsPluginWindowType_Drawable) {
-    mContent->SetFocus(mOwner->PresContext());
+    
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm) {
+      nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(mContent);
+      fm->SetFocus(elem, 0);
+    }
   }
 
   nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(aMouseEvent));
@@ -3953,49 +3946,44 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
   // we can get synthetic events from the nsEventStateManager... these
   // have no nativeMsg
   nsPluginEvent pluginEvent;
-  switch (anEvent.eventStructType) {
-    case NS_MOUSE_EVENT:
-      // XXX we could synthesize Windows mouse events here for our
-      // synthetic mouse events (i.e. !pPluginEvent)
-      if (pPluginEvent) {
-        // Make event coordinates relative to our enclosing widget,
-        // not the widget they were received on.
-        // See use of nsPluginEvent in widget/src/windows/nsWindow.cpp
-        // for why this assert should be safe
-        NS_ASSERTION(anEvent.message == NS_MOUSE_BUTTON_DOWN ||
-                     anEvent.message == NS_MOUSE_BUTTON_UP ||
-                     anEvent.message == NS_MOUSE_DOUBLECLICK ||
-                     anEvent.message == NS_MOUSE_ENTER_SYNTH ||
-                     anEvent.message == NS_MOUSE_EXIT_SYNTH ||
-                     anEvent.message == NS_MOUSE_MOVE,
-                     "Incorrect event type for coordinate translation");
-        nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mOwner);
-        nsPresContext* presContext = mOwner->PresContext();
-        nsIntPoint ptPx(presContext->AppUnitsToDevPixels(pt.x),
-                        presContext->AppUnitsToDevPixels(pt.y));
-        nsIntPoint widgetPtPx = ptPx + mOwner->GetWindowOriginInPixels(PR_TRUE);
-        pPluginEvent->lParam = MAKELPARAM(widgetPtPx.x, widgetPtPx.y);
-      }
-      break;
-
-    case NS_FOCUS_EVENT:
-      if (!pPluginEvent) {
-        switch (anEvent.message) {
-          case NS_FOCUS_CONTENT:
-            pluginEvent.event = WM_SETFOCUS;
-            pluginEvent.wParam = 0;
-            pluginEvent.lParam = 0;
-            pPluginEvent = &pluginEvent;
-            break;
-          case NS_BLUR_CONTENT:
-            pluginEvent.event = WM_KILLFOCUS;
-            pluginEvent.wParam = 0;
-            pluginEvent.lParam = 0;
-            pPluginEvent = &pluginEvent;
-            break;
-        }
-      }
-      break;
+  if (anEvent.eventStructType == NS_MOUSE_EVENT) {
+    // XXX we could synthesize Windows mouse events here for our
+    // synthetic mouse events (i.e. !pPluginEvent)
+    if (pPluginEvent) {
+      // Make event coordinates relative to our enclosing widget,
+      // not the widget they were received on.
+      // See use of nsPluginEvent in widget/src/windows/nsWindow.cpp
+      // for why this assert should be safe
+      NS_ASSERTION(anEvent.message == NS_MOUSE_BUTTON_DOWN ||
+                   anEvent.message == NS_MOUSE_BUTTON_UP ||
+                   anEvent.message == NS_MOUSE_DOUBLECLICK ||
+                   anEvent.message == NS_MOUSE_ENTER_SYNTH ||
+                   anEvent.message == NS_MOUSE_EXIT_SYNTH ||
+                   anEvent.message == NS_MOUSE_MOVE,
+                   "Incorrect event type for coordinate translation");
+      nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mOwner);
+      nsPresContext* presContext = mOwner->PresContext();
+      nsIntPoint ptPx(presContext->AppUnitsToDevPixels(pt.x),
+                      presContext->AppUnitsToDevPixels(pt.y));
+      nsIntPoint widgetPtPx = ptPx + mOwner->GetWindowOriginInPixels(PR_TRUE);
+      pPluginEvent->lParam = MAKELPARAM(widgetPtPx.x, widgetPtPx.y);
+    }
+  }
+  else if (!pPluginEvent) {
+    switch (anEvent.message) {
+      case NS_FOCUS_CONTENT:
+        pluginEvent.event = WM_SETFOCUS;
+        pluginEvent.wParam = 0;
+        pluginEvent.lParam = 0;
+        pPluginEvent = &pluginEvent;
+        break;
+      case NS_BLUR_CONTENT:
+        pluginEvent.event = WM_KILLFOCUS;
+        pluginEvent.wParam = 0;
+        pluginEvent.lParam = 0;
+        pPluginEvent = &pluginEvent;
+        break;
+    }
   }
 
   if (pPluginEvent) {
@@ -4707,7 +4695,7 @@ nsresult nsPluginInstanceOwner::Init(nsPresContext* aPresContext,
   // a page is reloaded. Shutdown happens usually when the last instance
   // is destroyed. Here we make sure the plugin instance in the old
   // document is destroyed before we try to create the new one.
-  aPresContext->EnsureVisible(PR_TRUE);
+  aPresContext->EnsureVisible();
 
   if (!weakFrame.IsAlive()) {
     PR_LOG(nsObjectFrameLM, PR_LOG_DEBUG,
diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in
index 8c169dc41293..a0bf255b74bb 100644
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -89,6 +89,7 @@ include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../base \
+		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 3c680997e32f..f634e8c54303 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -158,7 +158,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsIDocumentViewerPrint.h"
 
 #include "nsPIDOMWindow.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 
 #include "nsCDefaultURIFixup.h"
 #include "nsIURIFixup.h"
@@ -2700,22 +2700,15 @@ PRBool nsPrintEngine::HasFramesetChild(nsIContent* aContent)
 already_AddRefed<nsIDOMWindow>
 nsPrintEngine::FindFocusedDOMWindow()
 {
-  nsIDOMWindow * domWin = nsnull;
-
-  nsPIDOMWindow *theDOMWindow = mDocument->GetWindow();
-  if(theDOMWindow){
-    nsIFocusController *focusController =
-      theDOMWindow->GetRootFocusController();
-    if (focusController) {
-      nsCOMPtr<nsIDOMWindowInternal> theDOMWin;
-      focusController->GetFocusedWindow(getter_AddRefs(theDOMWin));
-      if(theDOMWin && IsWindowsInOurSubTree(theDOMWin)){
-        NS_ADDREF(domWin = theDOMWin);
-      }
-    }
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMWindow> domWin;
+    fm->GetFocusedWindow(getter_AddRefs(domWin));
+    if (domWin && IsWindowsInOurSubTree(domWin))
+      return domWin.forget();
   }
 
-  return domWin;
+  return nsnull;
 }
 
 //---------------------------------------------------------------------
diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp
index 9ee525a40992..9736972c1552 100644
--- a/layout/printing/nsPrintPreviewListener.cpp
+++ b/layout/printing/nsPrintPreviewListener.cpp
@@ -39,6 +39,9 @@
 
 #include "nsPrintPreviewListener.h"
 #include "nsIContent.h"
+#include "nsIDOMWindow.h"
+#include "nsPIDOMWindow.h"
+#include "nsIDOMElement.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDocument.h"
@@ -46,6 +49,7 @@
 #include "nsIDocShell.h"
 #include "nsPresContext.h"
 #include "nsIEventStateManager.h"
+#include "nsFocusManager.h"
 #include "nsLiteralString.h"
 
 NS_IMPL_ISUPPORTS1(nsPrintPreviewListener, nsIDOMEventListener)
@@ -187,13 +191,20 @@ nsPrintPreviewListener::HandleEvent(nsIDOMEvent* aEvent)
 
           nsIDocument* parentDoc = doc->GetParentDocument();
           NS_ASSERTION(parentDoc, "no parent document");
-          nsIEventStateManager* esm =
-            parentDoc->GetPrimaryShell()->GetPresContext()->EventStateManager();
-          if (esm) {
-            esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
+
+          nsCOMPtr<nsIDOMWindow> win = do_QueryInterface(parentDoc->GetWindow());
+
+          nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+          if (fm && win) {
+            nsIContent* fromContent = parentDoc->FindContentForSubDocument(doc);
+            nsCOMPtr<nsIDOMElement> from = do_QueryInterface(fromContent);
+
             PRBool forward = (action == eEventAction_Tab);
-            esm->ShiftFocus(forward,
-                            forward ? nsnull : parentDoc->FindContentForSubDocument(doc));
+            nsCOMPtr<nsIDOMElement> result;
+            fm->MoveFocus(win, from,
+                          forward ? nsIFocusManager::MOVEFOCUS_FORWARD :
+                                    nsIFocusManager::MOVEFOCUS_BACKWARD,
+                          0, getter_AddRefs(result));
           }
         }
       }
diff --git a/layout/reftests/bidi/496006-1-ref.html b/layout/reftests/bidi/496006-1-ref.html
new file mode 100644
index 000000000000..704befb66a4a
--- /dev/null
+++ b/layout/reftests/bidi/496006-1-ref.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+</head>
+<body style="direction: rtl;">
+m
+<span id="a" style="border: 1px solid black"></span>
+<div></div>
+m
+</body>
+</html>
diff --git a/layout/reftests/bidi/496006-1.html b/layout/reftests/bidi/496006-1.html
new file mode 100644
index 000000000000..57e75e74d2c2
--- /dev/null
+++ b/layout/reftests/bidi/496006-1.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+</head>
+<body style="direction: rtl;">
+m
+<span id="a" style="border: 1px solid black;"></span>
+<div><script>document.body.offsetHeight;</script></div>
+m
+
+<script>
+function doe() {
+var a=document.getElementById('a');
+a.style.outline = '1px solid transparent';
+document.body.offsetHeight;
+a.style.outline = '';
+}
+setTimeout(doe, 500);
+</script>
+</body>
+</html>
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 5ed47bb9ea30..4d3697d9eb50 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -40,3 +40,4 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 386339.html 386339-ref.html
 == 489517-1.html 489517-1-ref.html
 == 489887-1.html 489887-1-ref.html
 == 492231-1.html 492231-1-ref.html
+== 496006-1.html 496006-1-ref.html
diff --git a/layout/reftests/table-anonymous-boxes/443616-1-ref.html b/layout/reftests/table-anonymous-boxes/443616-1-ref.html
new file mode 100644
index 000000000000..a110c089ba53
--- /dev/null
+++ b/layout/reftests/table-anonymous-boxes/443616-1-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<body>
+<table cellpadding="0" cellspacing="0">
+  <tr>
+    <td rowspan="2">
+      Sidebar <br />
+      an unused link <br />
+      next unused link <br />
+    </td>
+    <td>
+      content <br />
+      more content
+    </td>
+  </tr>
+  <tr>
+    <td>
+      no yes no yes
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+
+
diff --git a/layout/reftests/table-anonymous-boxes/443616-1a.xhtml b/layout/reftests/table-anonymous-boxes/443616-1a.xhtml
new file mode 100644
index 000000000000..b1ff0b4e9f51
--- /dev/null
+++ b/layout/reftests/table-anonymous-boxes/443616-1a.xhtml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<body>
+<table cellpadding="0" cellspacing="0">
+  <tr>
+    <td rowspan="2">
+      Sidebar <br />
+      an unused link <br />
+      next unused link <br />
+    </td>
+    <td>
+      content <br />
+      more content
+      <script type="text/javascript">
+         document.body.offsetWidth;
+      </script>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      no yes no yes
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+
+
diff --git a/layout/reftests/table-anonymous-boxes/443616-1b.html b/layout/reftests/table-anonymous-boxes/443616-1b.html
new file mode 100644
index 000000000000..034603112bb0
--- /dev/null
+++ b/layout/reftests/table-anonymous-boxes/443616-1b.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<body>
+<table cellpadding="0" cellspacing="0">
+  <tr>
+    <td rowspan="2">
+      Sidebar <br />
+      an unused link <br />
+      next unused link <br />
+    </td>
+    <td>
+      content <br />
+      more content
+      <script type="text/javascript">
+         document.body.offsetWidth;
+      </script>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      no yes no yes
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+
+
diff --git a/layout/reftests/table-anonymous-boxes/reftest.list b/layout/reftests/table-anonymous-boxes/reftest.list
index b9cc1865f854..0eceaf9f210b 100644
--- a/layout/reftests/table-anonymous-boxes/reftest.list
+++ b/layout/reftests/table-anonymous-boxes/reftest.list
@@ -30,6 +30,8 @@ fails == 156888-1.html 156888-1-ref.html # bug 484825
 == 394402-1a.html 394402-1-ref.html
 == 394402-1b.html 394402-1-ref.html
 == 407115-1.html 407115-1-ref.html
+== 443616-1a.xhtml 443616-1-ref.html
+== 443616-1b.html 443616-1-ref.html
 == 448111-1.html 448111-1-ref.html
 == infer-first-row.html 3x3-ref.html
 == infer-first-row-and-table.html 3x3-ref.html
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 28f14796a477..80c1a4707409 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -897,14 +897,12 @@ RuleProcessorData::RuleProcessorData(nsPresContext* aPresContext,
     // see if there are attributes for the content
     mHasAttributes = aContent->GetAttrCount() > 0;
 
-    // check for HTMLContent and Link status
-    if (aContent->IsNodeOfType(nsINode::eHTML)) {
-      mIsHTMLContent = PR_TRUE;
-    }
-    
     // get the namespace
     mNameSpaceID = aContent->GetNameSpaceID();
 
+    // check for HTMLContent and Link status
+    mIsHTMLContent = (mNameSpaceID == kNameSpaceID_XHTML);
+
     // if HTML content and it has some attributes, check for an HTML link
     // NOTE: optimization: cannot be a link if no attributes (since it needs an href)
     nsILinkHandler* linkHandler =
@@ -992,14 +990,6 @@ const nsString* RuleProcessorData::GetLang()
   return mLanguage;
 }
 
-static inline PRInt32
-CSSNameSpaceID(nsIContent *aContent)
-{
-  return aContent->IsNodeOfType(nsINode::eHTML)
-           ? kNameSpaceID_XHTML
-           : aContent->GetNameSpaceID();
-}
-
 PRInt32
 RuleProcessorData::GetNthIndex(PRBool aIsOfType, PRBool aIsFromEnd,
                                PRBool aCheckEdgeOnly)
@@ -1058,7 +1048,7 @@ RuleProcessorData::GetNthIndex(PRBool aIsOfType, PRBool aIsFromEnd,
     if (child->IsNodeOfType(nsINode::eELEMENT) &&
         (!aIsOfType ||
          (child->Tag() == mContentTag &&
-          CSSNameSpaceID(child) == mNameSpaceID))) {
+          child->GetNameSpaceID() == mNameSpaceID))) {
       if (aCheckEdgeOnly) {
         // The caller only cares whether or not the result is 1, and we
         // now know it's not.
@@ -1567,9 +1557,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
       stateToCheck = NS_EVENT_STATE_INDETERMINATE;
     }
     else if (nsCSSPseudoClasses::mozIsHTML == pseudoClass->mAtom) {
-      result = data.mIsHTMLContent &&
-        data.mContent->GetOwnerDoc() && // XXX clean up after bug 335998 lands
-        !(data.mContent->GetOwnerDoc()->IsCaseSensitive());
+      result = data.mIsHTMLContent && data.mContent->IsInHTMLDocument();
     }
 #ifdef MOZ_MATHML
     else if (nsCSSPseudoClasses::mozMathIncrementScriptLevel == pseudoClass->mAtom) {
diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in
index a12ad945c261..6678500af187 100644
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -138,6 +138,7 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../base \
+		-I$(srcdir)/../../../../content/base/src \
 		-I$(srcdir)/../../../../content/events/src \
 		-I$(srcdir)/../../../generic \
 		-I$(srcdir)/../../../style \
diff --git a/layout/xul/base/src/crashtests/464149-1.xul b/layout/xul/base/src/crashtests/464149-1.xul
new file mode 100644
index 000000000000..556656f0217c
--- /dev/null
+++ b/layout/xul/base/src/crashtests/464149-1.xul
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<window onload="boom();" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<bindings xmlns="http://www.mozilla.org/xbl">
+  <binding id="m"><content><xul:textbox type="text"><children/></xul:textbox></content></binding>
+</bindings>
+
+<script type="text/javascript">
+<![CDATA[
+
+function boom()
+{
+  document.getElementById("b").style.MozBinding = 'url("data:text/xml,' + encodeURIComponent("<bindings xmlns='http://www.mozilla.org/xbl'><binding id='foo'><content><hbox xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'><children xmlns='http://www.mozilla.org/xbl'/></hbox></content></binding></bindings>\n") + '")';
+}
+
+]]>
+</script>
+
+<listbox style="float: right;"><listitem/><listitem id="b"/><listitem><hbox style="-moz-binding: url(#m);"/></listitem></listbox>
+
+</window>
diff --git a/layout/xul/base/src/crashtests/crashtests.list b/layout/xul/base/src/crashtests/crashtests.list
index 2c56c6b5b8fb..52378f80a546 100644
--- a/layout/xul/base/src/crashtests/crashtests.list
+++ b/layout/xul/base/src/crashtests/crashtests.list
@@ -45,6 +45,7 @@ load 430356-1.xhtml
 load 431738.xhtml
 load 433296-1.xul
 load 434458-1.xul
+load 464149-1.xul
 load 467481-1.xul
 load 470063-1.html
 load 472189.xul
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index 5ff46c316295..61241107c30a 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -56,7 +56,7 @@
 #include "nsILookAndFeel.h"
 #include "nsIComponentManager.h"
 #include "nsITimer.h"
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShell.h"
 #include "nsPIDOMWindow.h"
@@ -497,45 +497,36 @@ nsXULPopupManager::ShowPopupWithAnchorAlign(nsIContent* aPopup,
 }
 
 static void
-CheckCaretDrawingState(nsIDocument *aDocument) {
+CheckCaretDrawingState() {
 
   // There is 1 caret per document, we need to find the focused
   // document and erase its caret.
-  if (!aDocument)
-    return;
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMWindow> window;
+    fm->GetFocusedWindow(getter_AddRefs(window));
+    if (!window)
+      return;
 
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  nsCOMPtr<nsPIDOMWindow> windowPrivate = do_GetInterface(container);
-  if (!windowPrivate)
-    return;
+    nsCOMPtr<nsIDOMWindowInternal> windowInternal = do_QueryInterface(window);
 
-  nsIFocusController *focusController =
-    windowPrivate->GetRootFocusController();
-  if (!focusController)
-    return;
+    nsCOMPtr<nsIDOMDocument> domDoc;
+    nsCOMPtr<nsIDocument> focusedDoc;
+    windowInternal->GetDocument(getter_AddRefs(domDoc));
+    focusedDoc = do_QueryInterface(domDoc);
+    if (!focusedDoc)
+      return;
 
-  nsCOMPtr<nsIDOMWindowInternal> windowInternal;
-  focusController->GetFocusedWindow(getter_AddRefs(windowInternal));
-  if (!windowInternal)
-    return;
-
-  nsCOMPtr<nsIDOMDocument> domDoc;
-  nsCOMPtr<nsIDocument> focusedDoc;
-  windowInternal->GetDocument(getter_AddRefs(domDoc));
-  focusedDoc = do_QueryInterface(domDoc);
-  if (!focusedDoc)
-    return;
-
-  nsIPresShell* presShell = focusedDoc->GetPrimaryShell();
-  if (!presShell)
-    return;
-
-  nsRefPtr<nsCaret> caret;
-  presShell->GetCaret(getter_AddRefs(caret));
-  if (!caret)
-    return;
-  caret->CheckCaretDrawingState();
+    nsIPresShell* presShell = focusedDoc->GetPrimaryShell();
+    if (!presShell)
+      return;
 
+    nsRefPtr<nsCaret> caret;
+    presShell->GetCaret(getter_AddRefs(caret));
+    if (!caret)
+      return;
+    caret->CheckCaretDrawingState();
+  }
 }
 
 void
@@ -607,7 +598,7 @@ nsXULPopupManager::ShowPopupCallback(nsIContent* aPopup,
 
   // Caret visibility may have been affected, ensure that
   // the caret isn't now drawn when it shouldn't be.
-  CheckCaretDrawingState(aPopup->GetCurrentDoc());
+  CheckCaretDrawingState();
 }
 
 void
@@ -1009,19 +1000,22 @@ nsXULPopupManager::FirePopupShowingEvent(nsIContent* aPopup,
   if (aPopupType == ePopupTypePanel &&
       !aPopup->AttrValueIs(kNameSpaceID_None, nsGkAtoms::noautofocus,
                            nsGkAtoms::_true, eCaseMatters)) {
-    nsIEventStateManager* esm = presShell->GetPresContext()->EventStateManager();
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm) {
+      nsIDocument* doc = aPopup->GetCurrentDoc();
 
-    // Only remove the focus if the currently focused item is ouside the
-    // popup. It isn't a big deal if the current focus is in a child popup
-    // inside the popup as that shouldn't be visible. This check ensures that
-    // a node inside the popup that is focused during a popupshowing event
-    // remains focused.
-    nsCOMPtr<nsIContent> currentFocus;
-    esm->GetFocusedContent(getter_AddRefs(currentFocus));
-    if (currentFocus &&
-        !nsContentUtils::ContentIsDescendantOf(currentFocus, aPopup)) {
-      esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-      esm->SetFocusedContent(nsnull);
+      // Only remove the focus if the currently focused item is ouside the
+      // popup. It isn't a big deal if the current focus is in a child popup
+      // inside the popup as that shouldn't be visible. This check ensures that
+      // a node inside the popup that is focused during a popupshowing event
+      // remains focused.
+      nsCOMPtr<nsIDOMElement> currentFocusElement;
+      fm->GetFocusedElement(getter_AddRefs(currentFocusElement));
+      nsCOMPtr<nsIContent> currentFocus = do_QueryInterface(currentFocusElement);
+      if (doc && currentFocus &&
+          !nsContentUtils::ContentIsDescendantOf(currentFocus, aPopup)) {
+        fm->ClearFocus(doc->GetWindow());
+      }
     }
   }
 
@@ -1068,15 +1062,18 @@ nsXULPopupManager::FirePopupHidingEvent(nsIContent* aPopup,
   if (aPopupType == ePopupTypePanel &&
       !aPopup->AttrValueIs(kNameSpaceID_None, nsGkAtoms::noautofocus,
                            nsGkAtoms::_true, eCaseMatters)) {
-    nsIEventStateManager* esm = presShell->GetPresContext()->EventStateManager();
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm) {
+      nsIDocument* doc = aPopup->GetCurrentDoc();
 
-    // Remove the focus from the focused node only if it is inside the popup.
-    nsCOMPtr<nsIContent> currentFocus;
-    esm->GetFocusedContent(getter_AddRefs(currentFocus));
-    if (currentFocus &&
-        nsContentUtils::ContentIsDescendantOf(currentFocus, aPopup)) {
-      esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
-      esm->SetFocusedContent(nsnull);
+      // Remove the focus from the focused node only if it is inside the popup.
+      nsCOMPtr<nsIDOMElement> currentFocusElement;
+      fm->GetFocusedElement(getter_AddRefs(currentFocusElement));
+      nsCOMPtr<nsIContent> currentFocus = do_QueryInterface(currentFocusElement);
+      if (doc && currentFocus &&
+          nsContentUtils::ContentIsDescendantOf(currentFocus, aPopup)) {
+        fm->ClearFocus(doc->GetWindow());
+      }
     }
   }
 
@@ -1223,14 +1220,17 @@ nsXULPopupManager::MayShowPopup(nsMenuPopupFrame* aPopup)
   // open popups when they are focused and visible
   if (type != nsIDocShellTreeItem::typeChrome) {
     // only allow popups in active windows
-    nsCOMPtr<nsPIDOMWindow> win = do_GetInterface(dsti);
-    if (!win)
+    nsCOMPtr<nsIDocShellTreeItem> root;
+    dsti->GetRootTreeItem(getter_AddRefs(root));
+    nsCOMPtr<nsIDOMWindow> rootWin = do_GetInterface(root);
+
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (!fm || !rootWin)
       return PR_FALSE;
 
-    PRBool active;
-    nsIFocusController* focusController = win->GetRootFocusController();
-    focusController->GetActive(&active);
-    if (!active)
+    nsCOMPtr<nsIDOMWindow> activeWindow;
+    fm->GetActiveWindow(getter_AddRefs(activeWindow));
+    if (activeWindow != rootWin)
       return PR_FALSE;
 
     // only allow popups in visible frames
diff --git a/modules/plugin/base/src/nsJSNPRuntime.cpp b/modules/plugin/base/src/nsJSNPRuntime.cpp
index 29641a4d3b74..e17d0e4162db 100644
--- a/modules/plugin/base/src/nsJSNPRuntime.cpp
+++ b/modules/plugin/base/src/nsJSNPRuntime.cpp
@@ -1226,7 +1226,7 @@ NPObjWrapper_SetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   PluginDestructionGuard pdg(npp);
 
-  JSBool hasProperty = !npobj->_class->hasProperty(npobj, (NPIdentifier)id);
+  JSBool hasProperty = npobj->_class->hasProperty(npobj, (NPIdentifier)id);
   if (!ReportExceptionIfPending(cx))
     return JS_FALSE;
 
diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp
index b67884fe72a7..1d22c21c734f 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -353,8 +353,8 @@ nsNPAPIPlugin::SetPluginRefNum(short aRefNum)
 
 // Creates the nsNPAPIPlugin object. One nsNPAPIPlugin object exists per plugin (not instance).
 nsresult
-nsNPAPIPlugin::CreatePlugin(const char* aFileName, const char* aFullPath,
-                            PRLibrary* aLibrary, nsIPlugin** aResult)
+nsNPAPIPlugin::CreatePlugin(const char* aFilePath, PRLibrary* aLibrary,
+                            nsIPlugin** aResult)
 {
   CheckClassInitialized();
 
@@ -377,7 +377,8 @@ nsNPAPIPlugin::CreatePlugin(const char* aFileName, const char* aFullPath,
 
   NS_ADDREF(*aResult);
 
-  if (!aFileName) //do not call NP_Initialize in this case, bug 74938
+  // Do not initialize if the file path is NULL.
+  if (!aFilePath)
     return NS_OK;
 
   // we must init here because the plugin may call NPN functions
@@ -463,7 +464,7 @@ nsNPAPIPlugin::CreatePlugin(const char* aFileName, const char* aFullPath,
   unsigned long origDiskNum, pluginDiskNum, logicalDisk;
 
   char pluginPath[CCHMAXPATH], origPath[CCHMAXPATH];
-  strcpy(pluginPath, aFileName);
+  strcpy(pluginPath, aFilePath);
   char* slash = strrchr(pluginPath, '\\');
   *slash = '\0';
 
@@ -513,7 +514,7 @@ nsNPAPIPlugin::CreatePlugin(const char* aFileName, const char* aFullPath,
   short pluginRefNum;
 
   nsCOMPtr<nsILocalFile> pluginPath;
-  NS_NewNativeLocalFile(nsDependentCString(aFullPath), PR_TRUE,
+  NS_NewNativeLocalFile(nsDependentCString(aFilePath), PR_TRUE,
                         getter_AddRefs(pluginPath));
 
   nsPluginFile pluginFile(pluginPath);
diff --git a/modules/plugin/base/src/nsNPAPIPlugin.h b/modules/plugin/base/src/nsNPAPIPlugin.h
index aefcf9404ca8..d7e7f9cd7b8d 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.h
+++ b/modules/plugin/base/src/nsNPAPIPlugin.h
@@ -85,10 +85,9 @@ public:
   NS_DECL_NSIFACTORY
   NS_DECL_NSIPLUGIN
 
-  // Constructs and initializes an nsNPAPIPlugin object
-  static nsresult CreatePlugin(const char* aFileName,
-                               const char* aFullPath,
-                               PRLibrary* aLibrary,
+  // Constructs and initializes an nsNPAPIPlugin object. A NULL file path
+  // will prevent this from calling NP_Initialize.
+  static nsresult CreatePlugin(const char* aFilePath, PRLibrary* aLibrary,
                                nsIPlugin** aResult);
 #ifdef XP_MACOSX
   void SetPluginRefNum(short aRefNum);
diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp
index d4fdc7d45b7a..0d9b4823aeb6 100644
--- a/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -189,8 +189,9 @@
 // 0.08 mime entry point on MachO, bug 137535
 // 0.09 the file encoding is changed to UTF-8, bug 420285
 // 0.10 added plugin versions on appropriate platforms, bug 427743
+// 0.11 file name and full path fields now store expected values on all platforms, bug 488181
 // The current plugin registry version (and the maximum version we know how to read)
-static const char *kPluginRegistryVersion = "0.10";
+static const char *kPluginRegistryVersion = "0.11";
 // The minimum registry version we know how to read
 static const char *kMinimumRegistryVersion = "0.9";
 
@@ -3702,11 +3703,11 @@ nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
       return NS_ERROR_FAILURE;
     }
   }
-  else
+  else {
     mimetype = aMimeType;
+  }
 
   NS_ASSERTION(pluginTag, "Must have plugin tag here!");
-  PRBool isJavaPlugin = pluginTag->mIsJavaPlugin;
 
   nsCAutoString contractID(
           NS_LITERAL_CSTRING(NS_INLINE_PLUGIN_CONTRACTID_PREFIX) +
@@ -3724,7 +3725,7 @@ nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
       static BOOL firstJavaPlugin = FALSE;
       BOOL restoreOrigDir = FALSE;
       char origDir[_MAX_PATH];
-      if (isJavaPlugin && !firstJavaPlugin) {
+      if (pluginTag->mIsJavaPlugin && !firstJavaPlugin) {
         DWORD dw = ::GetCurrentDirectory(_MAX_PATH, origDir);
         NS_ASSERTION(dw <= _MAX_PATH, "Falied to obtain the current directory, which may leads to incorrect class laoding");
         nsCOMPtr<nsIFile> binDirectory;
@@ -3995,33 +3996,14 @@ public:
     PRBool bShowPath;
     nsCOMPtr<nsIPrefBranch> prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
     if (prefService &&
-        NS_SUCCEEDED(prefService->GetBoolPref("plugin.expose_full_path",&bShowPath)) &&
+        NS_SUCCEEDED(prefService->GetBoolPref("plugin.expose_full_path", &bShowPath)) &&
         bShowPath) {
-      // only show the full path if people have set the pref,
-      // the default should not reveal path information (bug 88183)
-#if defined(XP_MACOSX)
       CopyUTF8toUTF16(mPluginTag.mFullPath, aFilename);
-#else
-      CopyUTF8toUTF16(mPluginTag.mFileName, aFilename);
-#endif
-      return NS_OK;
-    }
-
-    nsAutoString spec;
-    if (!mPluginTag.mFullPath.IsEmpty()) {
-#if !defined(XP_MACOSX)
-      NS_ERROR("Only MAC should be using nsPluginTag::mFullPath!");
-#endif
-      CopyUTF8toUTF16(mPluginTag.mFullPath, spec);
     } else {
-      CopyUTF8toUTF16(mPluginTag.mFileName, spec);
+      CopyUTF8toUTF16(mPluginTag.mFileName, aFilename);
     }
 
-    nsCString leafName;
-    nsCOMPtr<nsILocalFile> pluginPath;
-    NS_NewLocalFile(spec, PR_TRUE, getter_AddRefs(pluginPath));
-
-    return pluginPath->GetLeafName(aFilename);
+    return NS_OK;
   }
 
   NS_METHOD GetVersion(nsAString& aVersion)
@@ -4324,7 +4306,7 @@ static nsresult CreateNPAPIPlugin(nsIServiceManagerObsolete* aServiceManager,
   rv = pcs->GetCharset(kPlatformCharsetSel_FileName, charset);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsCAutoString fileName, fullPath;
+  nsCAutoString fullPath;
   if (!charset.LowerCaseEqualsLiteral("utf-8")) {
     nsCOMPtr<nsIUnicodeEncoder> encoder;
     nsCOMPtr<nsICharsetConverterManager> ccm =
@@ -4332,17 +4314,13 @@ static nsresult CreateNPAPIPlugin(nsIServiceManagerObsolete* aServiceManager,
     NS_ENSURE_SUCCESS(rv, rv);
     rv = ccm->GetUnicodeEncoderRaw(charset.get(), getter_AddRefs(encoder));
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = ConvertToNative(encoder, aPluginTag->mFileName, fileName);
-    NS_ENSURE_SUCCESS(rv, rv);
     rv = ConvertToNative(encoder, aPluginTag->mFullPath, fullPath);
     NS_ENSURE_SUCCESS(rv, rv);
   } else {
-    fileName = aPluginTag->mFileName;
     fullPath = aPluginTag->mFullPath;
   }
 
-  return nsNPAPIPlugin::CreatePlugin(fileName.get(),
-                                     fullPath.get(),
+  return nsNPAPIPlugin::CreatePlugin(fullPath.get(),
                                      aPluginTag->mLibrary,
                                      aOutNPAPIPlugnin);
 }
@@ -4371,14 +4349,10 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
 #endif
 
     if (!pluginTag->mLibrary) { // if we haven't done this yet
-     nsCOMPtr<nsILocalFile> file = do_CreateInstance("@mozilla.org/file/local;1");
-#if !defined(XP_MACOSX)
-      file->InitWithPath(NS_ConvertUTF8toUTF16(pluginTag->mFileName));
-#else
       if (pluginTag->mFullPath.IsEmpty())
         return NS_ERROR_FAILURE;
+      nsCOMPtr<nsILocalFile> file = do_CreateInstance("@mozilla.org/file/local;1");
       file->InitWithPath(NS_ConvertUTF8toUTF16(pluginTag->mFullPath));
-#endif
       nsPluginFile pluginFile(file);
       PRLibrary* pluginLibrary = NULL;
 
@@ -4541,7 +4515,7 @@ PRBool nsPluginHostImpl::IsDuplicatePlugin(nsPluginTag * aPluginTag)
 // Structure for collecting plugin files found during directory scanning
 struct pluginFileinDirectory
 {
-  nsString mFilename;
+  nsString mFilePath;
   PRInt64  mModTime;
 
   pluginFileinDirectory()
@@ -4560,7 +4534,7 @@ class nsDefaultComparator<pluginFileinDirectory, pluginFileinDirectory>
   PRBool Equals(const pluginFileinDirectory& aA,
                 const pluginFileinDirectory& aB) const {
     if (aA.mModTime == aB.mModTime &&
-        Compare(aA.mFilename, aB.mFilename,
+        Compare(aA.mFilePath, aB.mFilePath,
                 nsCaseInsensitiveStringComparator()) == 0)
       return PR_TRUE;
     else
@@ -4571,7 +4545,7 @@ class nsDefaultComparator<pluginFileinDirectory, pluginFileinDirectory>
     if (aA.mModTime < aB.mModTime)
       return PR_TRUE;
     else if(aA.mModTime == aB.mModTime)
-      return Compare(aA.mFilename, aB.mFilename,
+      return Compare(aA.mFilePath, aB.mFilePath,
                      nsCaseInsensitiveStringComparator()) < 0;
     else
       return PR_FALSE;
@@ -4673,7 +4647,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
       dirEntry->GetLastModifiedTime(&fileModTime);
 
       item->mModTime = fileModTime;
-      item->mFilename = filePath;
+      item->mFilePath = filePath;
     }
   } // end round of up of plugin files
 
@@ -4686,12 +4660,12 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
     pluginFileinDirectory &pfd = pluginFilesArray[i];
     nsCOMPtr <nsIFile> file = do_CreateInstance("@mozilla.org/file/local;1");
     nsCOMPtr <nsILocalFile> localfile = do_QueryInterface(file);
-    localfile->InitWithPath(pfd.mFilename);
+    localfile->InitWithPath(pfd.mFilePath);
     PRInt64 fileModTime = pfd.mModTime;
 
     // Look for it in our cache
     nsRefPtr<nsPluginTag> pluginTag;
-    RemoveCachedPluginsInfo(NS_ConvertUTF16toUTF8(pfd.mFilename).get(),
+    RemoveCachedPluginsInfo(NS_ConvertUTF16toUTF8(pfd.mFilePath).get(),
                             getter_AddRefs(pluginTag));
 
     PRBool enabled = PR_TRUE;
@@ -5356,14 +5330,43 @@ nsPluginHostImpl::ReadPluginInfo()
   if (!ReadSectionHeader(reader, "PLUGINS"))
     return rv;
 
-  while (reader.NextLine()) {
-    const char *filename = reader.LinePtr();
-    if (!reader.NextLine())
-      return rv;
+#if defined(XP_MACOSX)
+  PRBool hasFullPathInFileNameField = PR_FALSE;
+#else
+  PRBool hasFullPathInFileNameField = (NS_CompareVersions(values[1], "0.11") < 0);
+#endif
 
-    const char *fullpath = reader.LinePtr();
-    if (!reader.NextLine())
-      return rv;
+  while (reader.NextLine()) {
+    const char *filename;
+    const char *fullpath;
+    nsCAutoString derivedFileName;
+    
+    if (hasFullPathInFileNameField) {
+      fullpath = reader.LinePtr();
+      if (!reader.NextLine())
+        return rv;
+      // try to derive a file name from the full path
+      if (fullpath) {
+        nsCOMPtr<nsILocalFile> file = do_CreateInstance("@mozilla.org/file/local;1");
+        file->InitWithNativePath(nsDependentCString(fullpath));
+        file->GetNativeLeafName(derivedFileName);
+        filename = derivedFileName.get();
+      } else {
+        filename = NULL;
+      }
+
+      // skip the next line, useless in this version
+      if (!reader.NextLine())
+        return rv;
+    } else {
+      filename = reader.LinePtr();
+      if (!reader.NextLine())
+        return rv;
+
+      fullpath = reader.LinePtr();
+      if (!reader.NextLine())
+        return rv;
+    }
 
     const char *version;
     if (regHasVersion) {
@@ -5379,7 +5382,7 @@ nsPluginHostImpl::ReadPluginInfo()
       return rv;
 
     // If this is an old plugin registry mark this plugin tag to be refreshed
-    PRInt64 lastmod = vdiff == 0 ? nsCRT::atoll(values[0]) : -1;
+    PRInt64 lastmod = (vdiff == 0) ? nsCRT::atoll(values[0]) : -1;
     PRBool canunload = atoi(values[1]);
     PRUint32 tagflag = atoi(values[2]);
     if (!reader.NextLine())
@@ -5435,7 +5438,7 @@ nsPluginHostImpl::ReadPluginInfo()
     nsRefPtr<nsPluginTag> tag = new nsPluginTag(name,
       description,
       filename,
-      (*fullpath ? fullpath : 0), // we have to pass 0 prt if it's empty str
+      fullpath,
       version,
       (const char* const*)mimetypes,
       (const char* const*)mimedescriptions,
@@ -5465,17 +5468,13 @@ nsPluginHostImpl::ReadPluginInfo()
 }
 
 void
-nsPluginHostImpl::RemoveCachedPluginsInfo(const char *filename, nsPluginTag **result)
+nsPluginHostImpl::RemoveCachedPluginsInfo(const char *filePath, nsPluginTag **result)
 {
   nsRefPtr<nsPluginTag> prev;
   nsRefPtr<nsPluginTag> tag = mCachedPlugins;
   while (tag)
   {
-    // compare filename or else the mFullPath if it exists. Mac seems to use
-    // mFullPath for fullpath and mFileName for just the leafname of fullpath.
-    // On win and unix, mFullPath is never used and mFileName is contains the
-    // full pathname. All this should move to using nsIFile.
-    if (tag->mFileName.Equals(filename) || tag->mFullPath.Equals(filename)) {
+    if (tag->mFullPath.Equals(filePath)) {
       // Found it. Remove it from our list
       if (prev)
         prev->mNext = tag->mNext;
diff --git a/modules/plugin/base/src/nsPluginHostImpl.h b/modules/plugin/base/src/nsPluginHostImpl.h
index 474219fefeb2..b809f95c08fe 100644
--- a/modules/plugin/base/src/nsPluginHostImpl.h
+++ b/modules/plugin/base/src/nsPluginHostImpl.h
@@ -397,9 +397,9 @@ private:
   // Loads all cached plugins info into mCachedPlugins
   nsresult ReadPluginInfo();
 
-  // Given a filename, returns the plugins info from our cache
+  // Given a file path, returns the plugins info from our cache
   // and removes it from the cache.
-  void RemoveCachedPluginsInfo(const char *filename,
+  void RemoveCachedPluginsInfo(const char *filePath,
                                nsPluginTag **result);
 
   //checks if the list already have the same plugin as given
diff --git a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp b/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
index 608a828ac363..e58d07c05136 100644
--- a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
+++ b/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
@@ -307,7 +307,7 @@ static LRESULT CALLBACK PluginWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
         nsCOMPtr<nsIWidget> widget;
         win->GetPluginWidget(getter_AddRefs(widget));
         if (widget) {
-          nsFocusEvent event(PR_TRUE, NS_PLUGIN_ACTIVATE, widget);
+          nsGUIEvent event(PR_TRUE, NS_PLUGIN_ACTIVATE, widget);
           nsEventStatus status;
           widget->DispatchEvent(&event, status);
         }
diff --git a/modules/plugin/base/src/nsPluginsDirBeOS.cpp b/modules/plugin/base/src/nsPluginsDirBeOS.cpp
index 07650c076abb..02031e3b7455 100644
--- a/modules/plugin/base/src/nsPluginsDirBeOS.cpp
+++ b/modules/plugin/base/src/nsPluginsDirBeOS.cpp
@@ -164,12 +164,16 @@ typedef char* (*BeOS_Plugin_GetMIMEDescription)();
 nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
 {
     info.fVersion = nsnull;
-    nsCAutoString fpath;
-    nsresult rv = mPlugin->GetNativePath(fpath);
-    if (NS_OK != rv) {
+
+    nsCAutoString fullPath;
+    if (NS_FAILED(rv = mPlugin->GetNativePath(fullPath)))
         return rv;
-    }
-    const char *path = fpath.get();
+
+    nsCAutoString fileName;
+    if (NS_FAILED(rv = mPlugin->GetNativeLeafName(fileName)))
+        return rv;
+
+    const char *path = fullPath.get();
     int i;
 
 #ifdef NS_PLUGIN_BEOS_DEBUG
@@ -243,8 +247,8 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
     }
 
     info.fVariantCount = types_num;
-    info.fFileName = PL_strdup(path);
-
+    info.fFullPath = PL_strdup(fullPath.get());
+    info.fFileName = PL_strdup(fileName.get());
 
 #ifdef NS_PLUGIN_BEOS_DEBUG
     printf("info.fFileName = %s\n", info.fFileName);
@@ -278,6 +282,9 @@ nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
     PR_FREEIF(info.fMimeDescriptionArray);
     PR_FREEIF(info.fExtensionArray);
 
+    if (info.fFullPath)
+        PL_strfree(info.fFullPath);
+
     if (info.fFileName)
         PL_strfree(info.fFileName);
 
diff --git a/modules/plugin/base/src/nsPluginsDirOS2.cpp b/modules/plugin/base/src/nsPluginsDirOS2.cpp
index 31ddfff8a9be..d11ac93bcf4d 100644
--- a/modules/plugin/base/src/nsPluginsDirOS2.cpp
+++ b/modules/plugin/base/src/nsPluginsDirOS2.cpp
@@ -214,16 +214,20 @@ nsresult nsPluginFile::LoadPlugin( PRLibrary *&outLibrary)
 // Obtains all of the information currently available for this plugin.
 nsresult nsPluginFile::GetPluginInfo( nsPluginInfo &info)
 {
-   nsresult   rc = NS_ERROR_FAILURE;
+   nsresult   rv = NS_ERROR_FAILURE;
    HMODULE    hPlug = 0; // Need a HMODULE to query resource statements
    char       failure[ CCHMAXPATH] = "";
    APIRET     ret;
 
-   const char* path;
-   nsCAutoString temp;
-   mPlugin->GetNativePath(temp);
-   path = temp.get();
-   ret = DosLoadModule( failure, CCHMAXPATH, path, &hPlug);
+   nsCAutoString path;
+   if (NS_FAILED(rv = mPlugin->GetNativePath(path)))
+     return rv;
+
+   nsCAutoString fileName;
+   if (NS_FAILED(rv = mPlugin->GetNativeLeafName(fileName)))
+     return rv;
+
+   ret = DosLoadModule( failure, CCHMAXPATH, path.get(), &hPlug);
    info.fVersion = nsnull;
 
    while( ret == NO_ERROR)
@@ -255,23 +259,27 @@ nsresult nsPluginFile::GetPluginInfo( nsPluginInfo &info)
       info.fExtensionArray = MakeStringArray(info.fVariantCount, extensions);
       if( nsnull == info.fExtensionArray) break;
 
-      info.fFileName = PL_strdup(path);
+      info.fFullPath = PL_strdup(path.get());
+      info.fFileName = PL_strdup(fileName.get());
 
-      rc = NS_OK;
+      rv = NS_OK;
       break;
    }
 
    if( 0 != hPlug)
       DosFreeModule( hPlug);
 
-   return rc;
+   return rv;
 }
 
 nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
 {
    if(info.fName != nsnull)
      PL_strfree(info.fName);
- 
+
+   if(info.fFullPath != nsnull)
+     PL_strfree(info.fFullPath);
+
    if(info.fFileName != nsnull)
      PL_strfree(info.fFileName);
  
diff --git a/modules/plugin/base/src/nsPluginsDirUnix.cpp b/modules/plugin/base/src/nsPluginsDirUnix.cpp
index 1e62fd1ad220..18b074dd0815 100644
--- a/modules/plugin/base/src/nsPluginsDirUnix.cpp
+++ b/modules/plugin/base/src/nsPluginsDirUnix.cpp
@@ -434,7 +434,6 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary)
 nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
 {
     nsresult rv;
-    const char* mimedescr = 0, *name = 0, *description = 0;
 
     // No, this doesn't leak. GetGlobalServiceManager() doesn't addref
     // it's out pointer. Maybe it should.
@@ -448,10 +447,7 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
 
     info.fVersion = nsnull;
     if (nsGetFactory) {
-        // It's an almost-new-style plugin. The "truly new" plugins
-        // are just XPCOM components, but there are some Mozilla
-        // Classic holdovers that live in the plugins directory but
-        // implement nsIPlugin and the factory stuff.
+        // This is an XPCOM plugin.
         static NS_DEFINE_CID(kPluginCID, NS_PLUGIN_CID);
 
         nsCOMPtr<nsIFactory> factory;
@@ -462,17 +458,18 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
             // HACK: The symbol lookup for "NSGetFactory" mistakenly returns
             // a reference to an unrelated function when we have an NPAPI
             // plugin linked to libxul.so.  Give this plugin another shot as
-            // an NPAPI plugin
-            rv = nsNPAPIPlugin::CreatePlugin(0, 0, pLibrary, getter_AddRefs(plugin));
+            // an NPAPI plugin.
+            // Passing NULL for a file path will prevent a call to NP_Initialize.
+            rv = nsNPAPIPlugin::CreatePlugin(NULL, pLibrary, getter_AddRefs(plugin));
             if (NS_FAILED(rv))
                 return rv;
         } else {
             plugin = do_QueryInterface(factory);
         }
     } else {
-        // It's old sk00l
-        // if fileName parameter == 0 nsNPAPIPlugin::CreatePlugin() will not call NP_Initialize()
-        rv = nsNPAPIPlugin::CreatePlugin(0, 0, pLibrary, getter_AddRefs(plugin));
+        // This is an NPAPI plugin.
+        // Passing NULL for a file path will prevent a call to NP_Initialize.
+        rv = nsNPAPIPlugin::CreatePlugin(NULL, pLibrary, getter_AddRefs(plugin));
         if (NS_FAILED(rv)) return rv;
     }
 
@@ -482,21 +479,32 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
         if (npGetPluginVersion)
             info.fVersion = PL_strdup(npGetPluginVersion());
 
+        const char *mimedescr = NULL;
         plugin->GetMIMEDescription(&mimedescr);
 #ifdef NS_DEBUG
         printf("GetMIMEDescription() returned \"%s\"\n", mimedescr);
 #endif
         if (NS_FAILED(rv = ParsePluginMimeDescription(mimedescr, info)))
             return rv;
-        nsCAutoString filename;
-        if (NS_FAILED(rv = mPlugin->GetNativePath(filename)))
-            return rv;
-        info.fFileName = PL_strdup(filename.get());
-        plugin->GetValue(nsPluginVariable_NameString, &name);
-        if (!name)
-            name = PL_strrchr(info.fFileName, '/') + 1;
-        info.fName = PL_strdup(name);
 
+        nsCAutoString path;
+        if (NS_FAILED(rv = mPlugin->GetNativePath(path)))
+            return rv;
+        info.fFullPath = PL_strdup(path.get());
+
+        nsCAutoString fileName;
+        if (NS_FAILED(rv = mPlugin->GetNativeLeafName(fileName)))
+          return rv;
+        info.fFileName = PL_strdup(fileName.get());
+
+        const char *name = NULL;
+        plugin->GetValue(nsPluginVariable_NameString, &name);
+        if (name)
+          info.fName = PL_strdup(name);
+        else
+          info.fName = PL_strdup(fileName.get());
+
+        const char *description = NULL;
         plugin->GetValue(nsPluginVariable_DescriptionString, &description);
         if (!description)
             description = "";
@@ -529,6 +537,9 @@ nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
     PR_FREEIF(info.fMimeDescriptionArray);
     PR_FREEIF(info.fExtensionArray);
 
+    if (info.fFullPath != nsnull)
+        PL_strfree(info.fFullPath);
+
     if (info.fFileName != nsnull)
         PL_strfree(info.fFileName);
 
diff --git a/modules/plugin/base/src/nsPluginsDirWin.cpp b/modules/plugin/base/src/nsPluginsDirWin.cpp
index 7f8d3be42275..9e4ea3deeeb4 100644
--- a/modules/plugin/base/src/nsPluginsDirWin.cpp
+++ b/modules/plugin/base/src/nsPluginsDirWin.cpp
@@ -263,7 +263,7 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary)
  */
 nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
 {
-  nsresult res = NS_OK;
+  nsresult rv = NS_OK;
   DWORD zerome, versionsize;
   TCHAR* verbuf = nsnull;
 
@@ -272,15 +272,20 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
   if (!mPlugin)
     return NS_ERROR_NULL_POINTER;
 
-  nsCAutoString temp;
-  mPlugin->GetNativePath(temp);
+  nsCAutoString fullPath;
+  if (NS_FAILED(rv = mPlugin->GetNativePath(fullPath)))
+    return rv;
+
+  nsCAutoString fileName;
+  if (NS_FAILED(rv = mPlugin->GetNativeLeafName(fileName)))
+    return rv;
 
 #ifdef UNICODE
-  NS_ConvertASCIItoUTF16 temp2(temp);
-  path = temp2.get();
+  NS_ConvertASCIItoUTF16 utf16Path(fullPath);
+  path = utf16Path.get();
   versionsize = ::GetFileVersionInfoSizeW((TCHAR*)path, &zerome);
 #else
-  path = temp.get();
+  path = fullPath.get();
   versionsize = ::GetFileVersionInfoSize((TCHAR*)path, &zerome);
 #endif
 
@@ -306,7 +311,8 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
     info.fMimeTypeArray = MakeStringArray(info.fVariantCount, mimeType);
     info.fMimeDescriptionArray = MakeStringArray(info.fVariantCount, mimeDescription);
     info.fExtensionArray = MakeStringArray(info.fVariantCount, extensions);
-    info.fFileName = PL_strdup(temp.get());
+    info.fFullPath = PL_strdup(fullPath.get());
+    info.fFileName = PL_strdup(fileName.get());
     info.fVersion = GetVersion(verbuf);
 
     PL_strfree(mimeType);
@@ -314,12 +320,12 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
     PL_strfree(extensions);
   }
   else {
-    res = NS_ERROR_FAILURE;
+    rv = NS_ERROR_FAILURE;
   }
 
   PR_Free(verbuf);
 
-  return res;
+  return rv;
 }
 
 nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
@@ -339,6 +345,9 @@ nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
   if (info.fExtensionArray)
     FreeStringArray(info.fVariantCount, info.fExtensionArray);
 
+  if (info.fFullPath)
+    PL_strfree(info.fFullPath);
+
   if (info.fFileName)
     PL_strfree(info.fFileName);
 
diff --git a/modules/plugin/test/unit/test_bug455213.js b/modules/plugin/test/unit/test_bug455213.js
index 00a6543f1d0a..57e5e831aa04 100644
--- a/modules/plugin/test/unit/test_bug455213.js
+++ b/modules/plugin/test/unit/test_bug455213.js
@@ -42,6 +42,15 @@ const Ci = Components.interfaces;
 const NS_APP_USER_PROFILE_50_DIR      = "ProfD";
 const NS_APP_PROFILE_DIR_STARTUP      = "ProfDS";
 
+// v0.9 registry field meanings are different on Mac OS X
+const CWD = do_get_cwd();
+function checkOS(os) {
+  const nsILocalFile_ = "nsILocalFile" + os;
+  return nsILocalFile_ in Components.interfaces &&
+         CWD instanceof Components.interfaces[nsILocalFile_];
+}
+const isMac = checkOS("Mac");
+
 // Plugin registry uses different field delimeters on different platforms
 var DELIM = ":";
 if ("@mozilla.org/windows-registry-key;1" in Components.classes)
@@ -155,8 +164,13 @@ function run_test() {
 
   // Write out a 0.9 version registry that marks the test plugin as disabled
   var registry = "";
-  registry += file.leafName + DELIM + "$\n";
-  registry += file.path + DELIM + "$\n";
+  if (isMac) {
+    registry += file.leafName + DELIM + "$\n";
+    registry += file.path + DELIM + "$\n";
+  } else {
+    registry += file.path + DELIM + "$\n";
+    registry += DELIM + "$\n";
+  }
   registry += file.lastModifiedTime + DELIM + "0" + DELIM + "0" + DELIM + "$\n";
   registry += "Plug-in for testing purposes." + DELIM + "$\n";
   registry += "Test Plug-in" + DELIM + "$\n";
diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp
index f38104362ef4..f7fdd1769079 100644
--- a/netwerk/base/src/nsStandardURL.cpp
+++ b/netwerk/base/src/nsStandardURL.cpp
@@ -55,6 +55,7 @@
 #include "prlog.h"
 #include "nsAutoPtr.h"
 #include "nsIProgrammingLanguage.h"
+#include "nsVoidArray.h"
 
 static NS_DEFINE_CID(kThisImplCID, NS_THIS_STANDARDURL_IMPL_CID);
 static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
@@ -269,6 +270,10 @@ nsSegmentEncoder::InitUnicodeEncoder()
 // nsStandardURL <public>
 //----------------------------------------------------------------------------
 
+#ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
+static PRCList gAllURLs;
+#endif
+
 nsStandardURL::nsStandardURL(PRBool aSupportsFileURL)
     : mDefaultPort(-1)
     , mPort(-1)
@@ -293,6 +298,10 @@ nsStandardURL::nsStandardURL(PRBool aSupportsFileURL)
 
     // default parser in case nsIStandardURL::Init is never called
     mParser = net_GetStdURLParser();
+
+#ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
+    PR_APPEND_LINK(&mDebugCList, &gAllURLs);
+#endif
 }
 
 nsStandardURL::~nsStandardURL()
@@ -300,8 +309,24 @@ nsStandardURL::~nsStandardURL()
     LOG(("Destroying nsStandardURL @%p\n", this));
 
     CRTFREEIF(mHostA);
+#ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
+    PR_REMOVE_LINK(&mDebugCList);
+#endif
 }
 
+#ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
+static void DumpLeakedURLs()
+{
+    if (!PR_CLIST_IS_EMPTY(&gAllURLs)) {
+        printf("Leaked URLs:\n");
+        for (PRCList *l = PR_LIST_HEAD(&gAllURLs); l != &gAllURLs; l = PR_NEXT_LINK(l)) {
+            nsStandardURL *url = reinterpret_cast<nsStandardURL*>(reinterpret_cast<char*>(l) - offsetof(nsStandardURL, mDebugCList));
+            url->PrintSpec();
+        }
+    }
+}
+#endif
+
 void
 nsStandardURL::InitGlobalObjects()
 {
@@ -315,6 +340,11 @@ nsStandardURL::InitGlobalObjects()
 
         PrefsChanged(prefBranch, nsnull);
     }
+
+#ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
+    PR_INIT_CLIST(&gAllURLs);
+    atexit(DumpLeakedURLs);
+#endif
 }
 
 void
diff --git a/netwerk/base/src/nsStandardURL.h b/netwerk/base/src/nsStandardURL.h
index 0082325ca8e2..b5da371fb2ec 100644
--- a/netwerk/base/src/nsStandardURL.h
+++ b/netwerk/base/src/nsStandardURL.h
@@ -53,6 +53,11 @@
 #include "nsCOMPtr.h"
 #include "nsURLHelper.h"
 #include "nsIClassInfo.h"
+#include "prclist.h"
+
+#ifdef NS_BUILD_REFCNT_LOGGING
+#define DEBUG_DUMP_URLS_AT_SHUTDOWN
+#endif
 
 class nsIBinaryInputStream;
 class nsIBinaryOutputStream;
@@ -271,6 +276,12 @@ private:
     static PRBool                       gEscapeUTF8;
     static PRBool                       gAlwaysEncodeInUTF8;
     static PRBool                       gEncodeQueryInUTF8;
+
+public:
+#ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
+    PRCList mDebugCList;
+    void PrintSpec() const { printf("  %s\n", mSpec.get()); }
+#endif
 };
 
 #define NS_THIS_STANDARDURL_IMPL_CID                 \
diff --git a/other-licenses/branding/firefox/content/about.png b/other-licenses/branding/firefox/content/about.png
index bd6a5ea54f3c..144866a2b538 100644
Binary files a/other-licenses/branding/firefox/content/about.png and b/other-licenses/branding/firefox/content/about.png differ
diff --git a/other-licenses/branding/firefox/content/aboutCredits.png b/other-licenses/branding/firefox/content/aboutCredits.png
index fe70667472e9..a71b930cfeeb 100644
Binary files a/other-licenses/branding/firefox/content/aboutCredits.png and b/other-licenses/branding/firefox/content/aboutCredits.png differ
diff --git a/other-licenses/branding/firefox/content/icon48.png b/other-licenses/branding/firefox/content/icon48.png
index d9c034771e4b..b982cf979038 100644
Binary files a/other-licenses/branding/firefox/content/icon48.png and b/other-licenses/branding/firefox/content/icon48.png differ
diff --git a/other-licenses/branding/firefox/content/icon64.png b/other-licenses/branding/firefox/content/icon64.png
index 7947535fe2d4..582a6952abe0 100644
Binary files a/other-licenses/branding/firefox/content/icon64.png and b/other-licenses/branding/firefox/content/icon64.png differ
diff --git a/other-licenses/branding/firefox/default16.png b/other-licenses/branding/firefox/default16.png
index e303b27dca11..f7f9b420f7fc 100644
Binary files a/other-licenses/branding/firefox/default16.png and b/other-licenses/branding/firefox/default16.png differ
diff --git a/other-licenses/branding/firefox/default22.png b/other-licenses/branding/firefox/default22.png
new file mode 100644
index 000000000000..20e6cabcff78
Binary files /dev/null and b/other-licenses/branding/firefox/default22.png differ
diff --git a/other-licenses/branding/firefox/default24.png b/other-licenses/branding/firefox/default24.png
new file mode 100644
index 000000000000..c6aab1c4bb5f
Binary files /dev/null and b/other-licenses/branding/firefox/default24.png differ
diff --git a/other-licenses/branding/firefox/default256.png b/other-licenses/branding/firefox/default256.png
new file mode 100644
index 000000000000..0be7473b3d2a
Binary files /dev/null and b/other-licenses/branding/firefox/default256.png differ
diff --git a/other-licenses/branding/firefox/default32.png b/other-licenses/branding/firefox/default32.png
index 32cbaeb3c329..0c4f6818bd8a 100644
Binary files a/other-licenses/branding/firefox/default32.png and b/other-licenses/branding/firefox/default32.png differ
diff --git a/other-licenses/branding/firefox/default48.png b/other-licenses/branding/firefox/default48.png
index 129c82c558f5..b982cf979038 100644
Binary files a/other-licenses/branding/firefox/default48.png and b/other-licenses/branding/firefox/default48.png differ
diff --git a/other-licenses/branding/firefox/firefox.icns b/other-licenses/branding/firefox/firefox.icns
index 43aa8bf66ea0..b05448d4a8c7 100644
Binary files a/other-licenses/branding/firefox/firefox.icns and b/other-licenses/branding/firefox/firefox.icns differ
diff --git a/other-licenses/branding/firefox/firefox.ico b/other-licenses/branding/firefox/firefox.ico
index b02e470bfb14..223fe0f977fb 100644
Binary files a/other-licenses/branding/firefox/firefox.ico and b/other-licenses/branding/firefox/firefox.ico differ
diff --git a/other-licenses/branding/firefox/mozicon128.png b/other-licenses/branding/firefox/mozicon128.png
index 13b15c6af321..f82ea67df208 100644
Binary files a/other-licenses/branding/firefox/mozicon128.png and b/other-licenses/branding/firefox/mozicon128.png differ
diff --git a/other-licenses/branding/firefox/wizHeader.bmp b/other-licenses/branding/firefox/wizHeader.bmp
index 6265e4891eea..026f412f3d07 100644
Binary files a/other-licenses/branding/firefox/wizHeader.bmp and b/other-licenses/branding/firefox/wizHeader.bmp differ
diff --git a/other-licenses/branding/firefox/wizHeaderRTL.bmp b/other-licenses/branding/firefox/wizHeaderRTL.bmp
index 33798b0913b2..55d2c1aa27ca 100644
Binary files a/other-licenses/branding/firefox/wizHeaderRTL.bmp and b/other-licenses/branding/firefox/wizHeaderRTL.bmp differ
diff --git a/other-licenses/branding/firefox/wizWatermark.bmp b/other-licenses/branding/firefox/wizWatermark.bmp
index f35c5935e32e..0abfbb7fae79 100644
Binary files a/other-licenses/branding/firefox/wizWatermark.bmp and b/other-licenses/branding/firefox/wizWatermark.bmp differ
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 1c83ead66d6b..a780d2c880cd 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -102,7 +102,6 @@ TEST_HARNESS_BINS := \
 # the build, but that we need for the test harness.
 TEST_HARNESS_COMPONENTS := \
   test_necko.xpt \
-  TestGeolocationProvider.js \
   $(NULL)
 
 # We need the test plugin as some tests rely on it
diff --git a/testing/tests/l10n/web/code-base.js b/testing/tests/l10n/web/code-base.js
index 1fdc443917d2..9b0115476cd2 100644
--- a/testing/tests/l10n/web/code-base.js
+++ b/testing/tests/l10n/web/code-base.js
@@ -209,7 +209,7 @@ baseView = {
     return true;
   },
   onClickDisplay: function(event) {
-    if (event.target.localName != 'INPUT') {
+    if (event.target.localName != 'input') {
       return false;
     }
     var handler = function() {return function(){view.setTierDisplay(event.target)}};
diff --git a/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js b/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js
index f346e24f65bc..8741d7fbea81 100644
--- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js
@@ -1,250 +1,252 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Ehsan Akhgari.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- * 
- * ***** END LICENSE BLOCK ***** */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-function test() {
-    waitForExplicitFinish();
-
-    let pwmgr = Cc["@mozilla.org/login-manager;1"].
-                getService(Ci.nsILoginManager);
-    pwmgr.removeAllLogins();
-
-    // Add some initial logins
-    let urls = [
-        "http://example.com/",
-        "http://example.org/",
-        "http://mozilla.com/",
-        "http://mozilla.org/",
-        "http://spreadfirefox.com/",
-        "http://planet.mozilla.org/",
-        "https://developer.mozilla.org/",
-        "http://hg.mozilla.org/",
-        "http://mxr.mozilla.org/",
-        "http://feeds.mozilla.org/",
-    ];
-    let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
-                                                 Ci.nsILoginInfo, "init");
-    let logins = [
-        new nsLoginInfo(urls[0], urls[0], null, "user", "password", "u1", "p1"),
-        new nsLoginInfo(urls[1], urls[1], null, "username", "password", "u2", "p2"),
-        new nsLoginInfo(urls[2], urls[2], null, "ehsan", "mypass", "u3", "p3"),
-        new nsLoginInfo(urls[3], urls[3], null, "ehsan", "mypass", "u4", "p4"),
-        new nsLoginInfo(urls[4], urls[4], null, "john", "smith", "u5", "p5"),
-        new nsLoginInfo(urls[5], urls[5], null, "what?", "very secret", "u6", "p6"),
-        new nsLoginInfo(urls[6], urls[6], null, "really?", "super secret", "u7", "p7"),
-        new nsLoginInfo(urls[7], urls[7], null, "you sure?", "absolutely", "u8", "p8"),
-        new nsLoginInfo(urls[8], urls[8], null, "my user name", "mozilla", "u9", "p9"),
-        new nsLoginInfo(urls[9], urls[9], null, "my username", "mozilla.com", "u10", "p10"),
-    ];
-    logins.forEach(function (login) pwmgr.addLogin(login));
-
-    // Detect when the password manager window is opened
-    let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
-             getService(Ci.nsIWindowWatcher);
-    let obs = {
-        observe: function(aSubject, aTopic, aData) {
-            // unregister ourself
-            ww.unregisterNotification(this);
-
-            let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
-            win.addEventListener("load", function() {
-                win.removeEventListener("load", arguments.callee, true);
-                setTimeout(doTest, 0);
-            }, true);
-        }
-    };
-    ww.registerNotification(obs);
-
-    // Open the password manager dialog
-    const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
-    let pwmgrdlg = window.openDialog(PWMGR_DLG, "Toolkit:PasswordManager", "");
-
-    // the meat of the test
-    function doTest() {
-        let doc = pwmgrdlg.document;
-        let win = doc.defaultView;
-        let filter = doc.getElementById("filter");
-        let tree = doc.getElementById("signonsTree");
-        let view = tree.treeBoxObject.view;
-
-        is(filter.value, "", "Filter box should initially be empty");
-        is(view.rowCount, 10, "There should be 10 passwords initially");
-
-        // Prepare a set of tests
-        //   filter: the text entered in the filter search box
-        //   count: the number of logins which should match the respective filter
-        //   count2: the number of logins which should match the respective filter
-        //           if the passwords are being shown as well
-        //   Note: if a test doesn't have count2 set, count is used instead.
-        let tests = [
-            {filter: "pass", count: 0, count2: 4},
-            {filter: "", count: 10}, // test clearing the filter
-            {filter: "moz", count: 7},
-            {filter: "mozi", count: 7},
-            {filter: "mozil", count: 7},
-            {filter: "mozill", count: 7},
-            {filter: "mozilla", count: 7},
-            {filter: "mozilla.com", count: 1, count2: 2},
-            {filter: "user", count: 4},
-            {filter: "user ", count: 1},
-            {filter: " user", count: 2},
-            {filter: "http", count: 10},
-            {filter: "https", count: 1},
-            {filter: "secret", count: 0, count2: 2},
-            {filter: "secret!", count: 0},
-        ];
-
-        let toggleCalls = 0;
-        function toggleShowPasswords(func) {
-            let toggleButton = doc.getElementById("togglePasswords");
-            let showMode = (toggleCalls++ % 2) == 0;
-
-            // only watch for a confirmation dialog every other time being called
-            if (showMode) {
-                let obs = {
-                    observe: function(aSubject, aTopic, aData) {
-                        if (aTopic == "domwindowclosed")
-                            ww.unregisterNotification(this);
-                        else if (aTopic == "domwindowopened") {
-                            let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
-                            win.addEventListener("load", function() {
-                                win.removeEventListener("load", arguments.callee, true);
-                                setTimeout(function() {
-                                    EventUtils.synthesizeKey("VK_RETURN", {}, win)
-                                }, 0);
-                            }, true);
-                        }
-                    }
-                };
-                ww.registerNotification(obs);
-            }
-
-            let obsSvc = Cc["@mozilla.org/observer-service;1"].
-                         getService(Ci.nsIObserverService);
-            obsSvc.addObserver({
-                observe: function(aSubject, aTopic, aData) {
-                    if (aTopic == "passwordmgr-password-toggle-complete") {
-                        obsSvc.removeObserver(this, "passwordmgr-password-toggle-complete", false);
-                        func();
-                    }
-                }
-            }, "passwordmgr-password-toggle-complete", false);
-
-            EventUtils.synthesizeMouse(toggleButton, 1, 1, {}, win);
-        }
-
-        function runTests(mode, endFunction) {
-            let testCounter = 0;
-
-            function setFilter(string) {
-                filter.focus();
-                filter.value = string;
-                EventUtils.synthesizeKey("VK_RETURN", {}, win);
-            }
-
-            function runOneTest(test) {
-                function tester() {
-                    is(view.rowCount, expected, expected + " logins should match '" + test.filter + "'");
-                }
-
-                let expected;
-                switch (mode) {
-                case 1: // without showing passwords
-                    expected = test.count;
-                    break;
-                case 2: // showing passwords
-                    expected = ("count2" in test) ? test.count2 : test.count;
-                    break;
-                case 3: // toggle
-                    expected = test.count;
-                    tester();
-                    toggleShowPasswords(function () {
-                        expected = ("count2" in test) ? test.count2 : test.count;
-                        tester();
-                        toggleShowPasswords(proceed);
-                    });
-                    return;
-                }
-                tester();
-                proceed();
-            }
-
-            function proceed() {
-                // run the next test if necessary or proceed with the tests
-                if (testCounter != tests.length)
-                    runNextTest();
-                else
-                    endFunction();
-            }
-
-            function runNextTest() {
-                let test = tests[testCounter++];
-                setFilter(test.filter);
-                setTimeout(runOneTest, 0, test);
-            }
-
-            runNextTest();
-        }
-
-        function step1() {
-            runTests(1, step2);
-        }
-
-        function step2() {
-            toggleShowPasswords(function() {
-                runTests(2, step3);
-            });
-        }
-
-        function step3() {
-            toggleShowPasswords(function() {
-                runTests(3, lastStep);
-            });
-        }
-
-        function lastStep() {
-            // cleanup
-            pwmgrdlg.close();
-            pwmgr.removeAllLogins();
-            finish();
-        }
-
-        step1();
-    }
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ * 
+ * ***** END LICENSE BLOCK ***** */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+function test() {
+    waitForExplicitFinish();
+
+    let pwmgr = Cc["@mozilla.org/login-manager;1"].
+                getService(Ci.nsILoginManager);
+    pwmgr.removeAllLogins();
+
+    // Add some initial logins
+    let urls = [
+        "http://example.com/",
+        "http://example.org/",
+        "http://mozilla.com/",
+        "http://mozilla.org/",
+        "http://spreadfirefox.com/",
+        "http://planet.mozilla.org/",
+        "https://developer.mozilla.org/",
+        "http://hg.mozilla.org/",
+        "http://mxr.mozilla.org/",
+        "http://feeds.mozilla.org/",
+    ];
+    let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
+                                                 Ci.nsILoginInfo, "init");
+    let logins = [
+        new nsLoginInfo(urls[0], urls[0], null, "user", "password", "u1", "p1"),
+        new nsLoginInfo(urls[1], urls[1], null, "username", "password", "u2", "p2"),
+        new nsLoginInfo(urls[2], urls[2], null, "ehsan", "mypass", "u3", "p3"),
+        new nsLoginInfo(urls[3], urls[3], null, "ehsan", "mypass", "u4", "p4"),
+        new nsLoginInfo(urls[4], urls[4], null, "john", "smith", "u5", "p5"),
+        new nsLoginInfo(urls[5], urls[5], null, "what?", "very secret", "u6", "p6"),
+        new nsLoginInfo(urls[6], urls[6], null, "really?", "super secret", "u7", "p7"),
+        new nsLoginInfo(urls[7], urls[7], null, "you sure?", "absolutely", "u8", "p8"),
+        new nsLoginInfo(urls[8], urls[8], null, "my user name", "mozilla", "u9", "p9"),
+        new nsLoginInfo(urls[9], urls[9], null, "my username", "mozilla.com", "u10", "p10"),
+    ];
+    logins.forEach(function (login) pwmgr.addLogin(login));
+
+    // Detect when the password manager window is opened
+    let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+             getService(Ci.nsIWindowWatcher);
+    let obs = {
+        observe: function(aSubject, aTopic, aData) {
+            // unregister ourself
+            ww.unregisterNotification(this);
+
+            let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+            win.addEventListener("focus", function() {
+                win.removeEventListener("focus", arguments.callee, true);
+                setTimeout(doTest, 0);
+            }, true);
+        }
+    };
+    ww.registerNotification(obs);
+
+    // Open the password manager dialog
+    const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul";
+    let pwmgrdlg = window.openDialog(PWMGR_DLG, "Toolkit:PasswordManager", "");
+
+    // the meat of the test
+    function doTest() {
+        let doc = pwmgrdlg.document;
+        let win = doc.defaultView;
+        let filter = doc.getElementById("filter");
+        let tree = doc.getElementById("signonsTree");
+        let view = tree.treeBoxObject.view;
+
+        is(filter.value, "", "Filter box should initially be empty");
+        is(view.rowCount, 10, "There should be 10 passwords initially");
+
+        // Prepare a set of tests
+        //   filter: the text entered in the filter search box
+        //   count: the number of logins which should match the respective filter
+        //   count2: the number of logins which should match the respective filter
+        //           if the passwords are being shown as well
+        //   Note: if a test doesn't have count2 set, count is used instead.
+        let tests = [
+            {filter: "pass", count: 0, count2: 4},
+            {filter: "", count: 10}, // test clearing the filter
+            {filter: "moz", count: 7},
+            {filter: "mozi", count: 7},
+            {filter: "mozil", count: 7},
+            {filter: "mozill", count: 7},
+            {filter: "mozilla", count: 7},
+            {filter: "mozilla.com", count: 1, count2: 2},
+            {filter: "user", count: 4},
+            {filter: "user ", count: 1},
+            {filter: " user", count: 2},
+            {filter: "http", count: 10},
+            {filter: "https", count: 1},
+            {filter: "secret", count: 0, count2: 2},
+            {filter: "secret!", count: 0},
+        ];
+
+        let toggleCalls = 0;
+        function toggleShowPasswords(func) {
+            let toggleButton = doc.getElementById("togglePasswords");
+            let showMode = (toggleCalls++ % 2) == 0;
+
+            // only watch for a confirmation dialog every other time being called
+            if (showMode) {
+                let obs = {
+                    observe: function(aSubject, aTopic, aData) {
+                        if (aTopic == "domwindowclosed")
+                            ww.unregisterNotification(this);
+                        else if (aTopic == "domwindowopened") {
+                            let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+                            win.addEventListener("focus", function() {
+                                win.removeEventListener("focus", arguments.callee, true);
+                                setTimeout(function() {
+                                    EventUtils.synthesizeKey("VK_RETURN", {}, win)
+                                }, 0);
+                            }, true);
+                        }
+                    }
+                };
+                ww.registerNotification(obs);
+            }
+
+            let obsSvc = Cc["@mozilla.org/observer-service;1"].
+                         getService(Ci.nsIObserverService);
+            obsSvc.addObserver({
+                observe: function(aSubject, aTopic, aData) {
+                    if (aTopic == "passwordmgr-password-toggle-complete") {
+                        obsSvc.removeObserver(this, "passwordmgr-password-toggle-complete", false);
+                        func();
+                    }
+                }
+            }, "passwordmgr-password-toggle-complete", false);
+
+            EventUtils.synthesizeMouse(toggleButton, 1, 1, {}, win);
+        }
+
+        function runTests(mode, endFunction) {
+            let testCounter = 0;
+
+            function setFilter(string) {
+                // make sure that the the window is focused first
+                filter.ownerDocument.defaultView.focus();
+                filter.focus();
+                filter.value = string;
+                EventUtils.synthesizeKey("VK_RETURN", {}, win);
+            }
+
+            function runOneTest(test) {
+                function tester() {
+                    is(view.rowCount, expected, expected + " logins should match '" + test.filter + "'");
+                }
+
+                let expected;
+                switch (mode) {
+                case 1: // without showing passwords
+                    expected = test.count;
+                    break;
+                case 2: // showing passwords
+                    expected = ("count2" in test) ? test.count2 : test.count;
+                    break;
+                case 3: // toggle
+                    expected = test.count;
+                    tester();
+                    toggleShowPasswords(function () {
+                        expected = ("count2" in test) ? test.count2 : test.count;
+                        tester();
+                        toggleShowPasswords(proceed);
+                    });
+                    return;
+                }
+                tester();
+                proceed();
+            }
+
+            function proceed() {
+                // run the next test if necessary or proceed with the tests
+                if (testCounter != tests.length)
+                    runNextTest();
+                else
+                    endFunction();
+            }
+
+            function runNextTest() {
+                let test = tests[testCounter++];
+                setFilter(test.filter);
+                setTimeout(runOneTest, 0, test);
+            }
+
+            runNextTest();
+        }
+
+        function step1() {
+            runTests(1, step2);
+        }
+
+        function step2() {
+            toggleShowPasswords(function() {
+                runTests(2, step3);
+            });
+        }
+
+        function step3() {
+            toggleShowPasswords(function() {
+                runTests(3, lastStep);
+            });
+        }
+
+        function lastStep() {
+            // cleanup
+            pwmgrdlg.close();
+            pwmgr.removeAllLogins();
+            finish();
+        }
+
+        step1();
+    }
+}
diff --git a/toolkit/components/printing/content/printUtils.js b/toolkit/components/printing/content/printUtils.js
index 9b4f025508bd..3a6557d78a24 100644
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -285,23 +285,13 @@ var PrintUtils = {
     var printPreviewTB = document.getElementById("print-preview-toolbar");
     getNavToolbox().parentNode.removeChild(printPreviewTB);
 
-    var contentWindow = aWindow || window.content;
-    contentWindow.focus();
-
-    var cmdDispatcher = document.commandDispatcher;
-    cmdDispatcher.suppressFocusScroll = true;
-    if (gFocusedElement instanceof HTMLElement ||
-        gFocusedElement instanceof XULElement ||
-        gFocusedElement instanceof Window) {
-      gFocusedElement.focus();
-    }
-    else if (gFocusedElement instanceof Node) {
-      var content = window.content;
-      if (content instanceof Components.interfaces.nsIInterfaceRequestor)
-        content.getInterface(Components.interfaces.nsIDOMWindowUtils).focus(gFocusedElement);
-      }
+    var fm = Components.classes["@mozilla.org/focus-manager;1"]
+                       .getService(Components.interfaces.nsIFocusManager);
+    if (gFocusedElement)
+      fm.setFocus(gFocusedElement, fm.FLAG_NOSCROLL);
+    else
+      (aWindow || window.content).focus();
     gFocusedElement = null;
-    cmdDispatcher.suppressFocusScroll = false;
 
     // on Exit PP Call back
     if (this._onExitPP) {
diff --git a/toolkit/components/satchel/src/nsStorageFormHistory.cpp b/toolkit/components/satchel/src/nsStorageFormHistory.cpp
index af4f8a1994a5..43bee071907a 100644
--- a/toolkit/components/satchel/src/nsStorageFormHistory.cpp
+++ b/toolkit/components/satchel/src/nsStorageFormHistory.cpp
@@ -509,6 +509,7 @@ nsFormHistory::Notify(nsIDOMHTMLFormElement* formElt, nsIDOMWindowInternal* aWin
         // If this input has a name/id and value, add it to the database
         nsAutoString value;
         inputElt->GetValue(value);
+        value.Trim(" \t", PR_TRUE, PR_TRUE);
         if (!value.IsEmpty()) {
           // Ignore the input if the value hasn't been changed from the
           // default. We only want to save data entered by the user.
diff --git a/toolkit/components/satchel/test/test_form_submission.html b/toolkit/components/satchel/test/test_form_submission.html
index 34c313df07fb..0ac1c383d26c 100644
--- a/toolkit/components/satchel/test/test_form_submission.html
+++ b/toolkit/components/satchel/test/test_form_submission.html
@@ -78,6 +78,12 @@
     <button type="submit">Submit</button>
   </form>
 
+  <!-- input with value of one space (which should be trimmed) -->
+  <form id="form12" onsubmit="return checkSubmit(12)">
+    <input type="text" name="test1">
+    <button type="submit">Submit</button>
+  </form>
+
   <!-- ===== Things that should be saved ===== -->
 
 
@@ -99,6 +105,18 @@
     <button type="submit">Submit</button>
   </form>
 
+  <!-- input with leading and trailing space -->
+  <form id="form104" onsubmit="return checkSubmit(104)">
+    <input type="text" name="test4">
+    <button type="submit">Submit</button>
+  </form>
+
+  <!-- input with leading and trailing whitespace -->
+  <form id="form105" onsubmit="return checkSubmit(105)">
+    <input type="text" name="test5">
+    <button type="submit">Submit</button>
+  </form>
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -126,10 +144,13 @@ function startTest() {
   // Form 9 has nothing to modify.
   $_(10, "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890").value = "dontSaveThis";
   $_(11, "test1").value = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
+  $_(12, "test1").value = " ";
 
   $_(101, "test1").value = "savedValue";
   $_(102, "test2").value = "savedValue";
   $_(103, "test3").value = "savedValue";
+  $_(104, "test4").value = " trimTrailingAndLeadingSpace ";
+  $_(105, "test5").value = "\t trimTrailingAndLeadingWhitespace\t ";
 
   // submit the first form.
   var button = getFormSubmitButton(1);
@@ -147,7 +168,7 @@ function checkSubmit(formNum) {
   
   // Check for expected storage state.
   switch (formNum) {
-    // Test 1-9 should not save anything.
+    // Test 1-12 should not save anything.
     case 1:
     case 2:
     case 3:
@@ -159,6 +180,7 @@ function checkSubmit(formNum) {
     case 9:
     case 10:
     case 11:
+    case 12:
         ok(!fh.hasEntries, "checking for empty storage");
         break;
     // The other tests do save data...
@@ -171,20 +193,26 @@ function checkSubmit(formNum) {
     case 103:
         ok(fh.entryExists("test3", "savedValue"), "checking saved value");
         break;
+    case 104:
+        ok(fh.entryExists("test4", "trimTrailingAndLeadingSpace"), "checking saved value is trimmed on both sides");
+        break;
+    case 105:
+        ok(fh.entryExists("test5", "trimTrailingAndLeadingWhitespace"), "checking saved value is trimmed on both sides");
+        break;
     default:
         ok(false, "Unexpected form submission");
         break;
   }
 
   // End the test at the last form.
-  if (formNum == 103) {
-    is(numSubmittedForms, 14, "Ensuring all forms were submitted.");
+  if (formNum == 105) {
+    is(numSubmittedForms, 17, "Ensuring all forms were submitted.");
     SimpleTest.finish();
     return false; // return false to cancel current form submission
   }
 
   // submit the next form.
-  var button = getFormSubmitButton(formNum == 11 ? 101 : (formNum + 1));
+  var button = getFormSubmitButton(formNum == 12 ? 101 : (formNum + 1));
   button.click();
 
   return false; // cancel current form submission
diff --git a/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
index aa9b9d4e639c..d059ad566c1a 100644
--- a/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
@@ -70,7 +70,6 @@
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIEventStateManager.h"
-#include "nsIFocusController.h"
 #include "nsIViewManager.h"
 #include "nsIScrollableView.h"
 #include "nsIDocument.h"
@@ -93,6 +92,7 @@
 #include "nsINameSpaceManager.h"
 #include "nsIWindowWatcher.h"
 #include "nsIObserverService.h"
+#include "nsFocusManager.h"
 
 #include "nsTypeAheadFind.h"
 
@@ -462,15 +462,15 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, PRBool aIsLinksOnly,
       if (!window)
         return NS_ERROR_UNEXPECTED;
 
+      nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
       if (usesIndependentSelection) {
         /* If a search result is found inside an editable element, we'll focus
          * the element only if focus is in our content window, i.e.
          * |if (focusedWindow.top == ourWindow.top)| */
         PRBool shouldFocusEditableElement = false;
-        nsIFocusController* focusController = window->GetRootFocusController();
-        if (focusController) {
-          nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-          nsresult rv = focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
+        if (fm) {
+          nsCOMPtr<nsIDOMWindow> focusedWindow;
+          nsresult rv = fm->GetFocusedWindow(getter_AddRefs(focusedWindow));
           if (NS_SUCCEEDED(rv)) {
             nsCOMPtr<nsPIDOMWindow> fwPI(do_QueryInterface(focusedWindow, &rv));
             if (NS_SUCCEEDED(rv)) {
@@ -515,11 +515,8 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, PRBool aIsLinksOnly,
               break;
 
             // Otherwise move focus/caret to editable element
-            nsCOMPtr<nsIContent> content = do_QueryInterface(mFoundEditable);
-            if (content) {
-              content->SetFocus(presContext);
-              presContext->EventStateManager()->MoveCaretToFocus();
-            }
+            if (fm)
+              fm->SetFocus(mFoundEditable, 0);
             break;
           }
           nsIDOMNode* tmp = node;
@@ -550,26 +547,16 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, PRBool aIsLinksOnly,
         selection->AddRange(returnRange);
       }
 
-      if (!mFoundEditable) {
-        currentDocShell->SetHasFocus(PR_TRUE);  // What does this do?
-
-        // Keep track of whether we've found a link, so we can focus it, jump
-        // to its target, etc.
-        nsIEventStateManager *esm = presContext->EventStateManager();
-        PRBool isSelectionWithFocus;
-        esm->MoveFocusToCaret(PR_TRUE, &isSelectionWithFocus);
-        if (isSelectionWithFocus) {
-          nsCOMPtr<nsIContent> lastFocusedContent;
-          esm->GetLastFocusedContent(getter_AddRefs(lastFocusedContent));
-          nsCOMPtr<nsIDOMElement>
-            lastFocusedElement(do_QueryInterface(lastFocusedContent));
-          mFoundLink = lastFocusedElement;
-        }
+      if (!mFoundEditable && fm) {
+        nsCOMPtr<nsIDOMWindow> win = do_QueryInterface(window);
+        fm->MoveFocus(win, nsnull, nsIFocusManager::MOVEFOCUS_CARET,
+                      nsIFocusManager::FLAG_NOSCROLL | nsIFocusManager::FLAG_NOSWITCHFRAME,
+                      getter_AddRefs(mFoundLink));
       }
 
       // Change selection color to ATTENTION and scroll to it.  Careful: we
       // must wait until after we goof with focus above before changing to
-      // ATTENTION, or when we MoveFocusToCaret() and the selection is not on a
+      // ATTENTION, or when we MoveFocus() and the selection is not on a
       // link, we'll blur, which will lose the ATTENTION.
       if (selectionController) {
         // Beware! This may flush notifications via synchronous
@@ -1003,14 +990,19 @@ nsTypeAheadFind::Find(const nsAString& aSearchString, PRBool aLinksOnly,
       // Get focused content from esm. If it's null, the document is focused.
       // If not, make sure the selection is in sync with the focus, so we can 
       // start our search from there.
-      nsCOMPtr<nsIContent> focusedContent;
       nsPresContext* presContext = presShell->GetPresContext();
       NS_ENSURE_TRUE(presContext, NS_OK);
 
-      nsIEventStateManager *esm = presContext->EventStateManager();
-      esm->GetFocusedContent(getter_AddRefs(focusedContent));
-      if (focusedContent) {
-        esm->MoveCaretToFocus();
+      nsCOMPtr<nsIDocument> document =
+        do_QueryInterface(presShell->GetDocument());
+      if (!document)
+        return NS_ERROR_UNEXPECTED;
+
+      nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(document->GetWindow());
+
+      nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+      if (fm) {
+        fm->MoveCaretToFocus(window);
         isFirstVisiblePreferred = PR_FALSE;
       }
     }
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 6d830bb8768c..7e6f9294cf4c 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -741,21 +741,24 @@ under either the MPL or the [___] License."
     </p>
     
     <p>
-<!-- This list created from the entire Mozilla source tree on 2007-05-30.
+<!-- This list created from mozilla-1.9.1 and comm-central on 2009-06-09.
      It was created using a modified version of the "relic" script in
-     tools/relic, along with the make-id-list script in the same directory. -->    
+     tools/relic, along with the make-id-list script in the same directory.
+     See the comments in make-id-list for instructions on how to regenerate.
+ -->    
 
 Aaron Leventhal,
-Aaron Schulman,
+Aaron Nowack,
+Aaron Train,
 ActiveState Tool Corp,
+Adobe System Incorporated,
 Akkana Peck,
 Alex Fritze,
-Alexa Internet,
 Alexander J. Vincent,
-Alexander Surkov,
+Alfred Peng,
 Alice Nodelman,
+Andreas Gal,
 Andreas Otte,
-Andreas Premstaller,
 Andrew Thompson,
 ArentJan Banck,
 Asaf Romano,
@@ -764,35 +767,39 @@ Ben Bucksch,
 Ben Goodger,
 Ben Turner,
 Benjamin Smedberg,
+Berend Cornelius,
 Bernd Mielke,
 Bj&ouml;rn Jacke,
 Blake Ross,
-Bob Clary,
+Blue Static,
 Boris Zbarsky,
+Brad Lassey,
 Bradley Baetz,
 Brendan Eich,
 Brian Bober,
+Brian Crowder,
 Brian Ryner,
-Bruce Davidson,
+Bruno Browning,
+Bruno Escherl,
 Bruno Haible,
-Bryan Atwood,
-Calum Robinson,
-Cedric Chantepie,
-Chiaki Koufugata,
+Caio Tiago Oliveira,
+Chinmay Deepakbhai Patel,
+Chris Double,
 Chris McAfee,
 Christian Biesinger,
 Christopher A. Aillon,
 Christopher Blizzard,
 Christopher Hoess,
 Christopher Seawood,
-Clayton Donley,
 Clint Talbert,
-Collabnet,
+Craig Topper,
 Crocodile Clips Ltd,
+CSIRO,
 Cyrus Patel,
 D&atilde;o Gottwald,
 Dainis Jonitis,
 Dan Mosedale,
+Daniel Boelzle,
 Daniel Brooks,
 Daniel Glazman,
 Daniel Kouril,
@@ -801,13 +808,14 @@ Dantifer Dang,
 Darin Fisher,
 Dave Liebreich,
 Dave Townsend,
+David Ascher,
 David Bienvenu,
 David Bradley,
 David Einstein,
 David Hamp-Gonsalves,
 David Hyatt,
 David P. Caldwell,
-Deogtae Kim,
+Diane Trout,
 Dietrich Ayala,
 Digital Creations 2 Inc,
 Disruptive Innovations SARL,
@@ -821,91 +829,101 @@ Eric Hodel,
 Esben Mose Hansen,
 Florian Queze,
 Frank Sch&ouml;nheit,
+Fred Jendrzejewski,
 Fredrik Holmqvist,
 Gavin Sharp,
-Geocast Network Systems,
-Geoff Beier,
 Gervase Markham,
 Gijs Kruitbosch,
 Giorgio Maone,
 Google Inc,
+Graeme McCutcheon,
 H&aring;kan Waara,
 Heriot-Watt University,
 Hewlett-Packard Company,
+Honza Bambas,
 i-DNS.net International,
 Ian Hickson,
+Ian Neal,
 Ian Oeschger,
 IBM Corporation,
 Igor Bukanov,
 InnoTek Systemberatung GmbH,
 Intel Corporation,
+James Boston,
 James L. Nance,
-James Ross,
 Jamie Zawinski,
 Jan Varga,
+Jan Wrobel,
 Jason Barnabe,
+Jason Orendorff,
 Jean-Francois Ducarroz,
 Jeff Tsai,
 Jeff Walden,
-Jefferson Software Inc,
+Jim Blandy,
 Jim Mathies,
 Joe Hewitt,
 Joey Minta,
 John B. Keiser,
+John C. Griggs,
 John Fairhurst,
 John Wolfe,
 Jonas Sicking,
 Jonathan Watt,
-Josh Aas,
+Josh Geenen,
 Josh Soref,
+Joshua Cranmer,
 Juan Lang,
 Jungshik Shin,
 Jussi Kukkonen,
 Karsten D&uuml;sterloh,
+Kathleen Brade,
 Keith Visco,
 Ken Herron,
+Kent James,
 Kevin Gerich,
 Kevin Hendricks,
 Kipp E.B. Hickman,
+KISA,
 L&aacute;szl&oacute; N&eacute;meth,
 L. David Baron,
-Leif Hedstrom,
 Lev Serebryakov,
+Magnus Melin,
 Makoto Kato,
 Marc Bevand,
-Marcio S. Galli,
-Marco Manfredini,
 Marco Pesenti Gritti,
+Mark 'Mook' Yen,
 Mark Banner,
+Mark Finkle,
 Mark Hammond,
 Mark Mentovai,
 Markus G. Kuhn,
+Markus Stange,
 Mats Palmgren,
-Matt Judy,
 Matthew Willis,
-Merle Sterling,
 Michael J. Fromberger,
+Michael Johnston,
+Michael Ventnor,
 Michal Ceresna,
-Michel C. C. Buijsman,
 Michiel van Leeuwen,
 Mike Connor,
 Mike Pinkerton,
 Mike Potter,
 Mike Shaver,
 MITRE Corporation,
-Mook,
 Mozdev Group,
 Mozilla Corporation,
 Mozilla Foundation,
 Mozilla Japan,
+Mozilla Messaging,
 Naoki Hotta,
 Neil Deakin,
 Neil Rashbrook,
 Nelson B. Bolyard,
 Netscape Communications Corporation,
-New Dimensions Consulting,
 Nick Kreeger,
 Nickolay Ponomarev,
+Nochum Sossonko,
+Nokia,
 Novell Inc,
 NTT,
 OEone Corporation,
@@ -913,6 +931,7 @@ Oleg Romashin,
 Olivier Parniere,
 Olli Pettay,
 Oracle Corporation,
+Paolo Amadini,
 Pattara Kiatisevi,
 Paul Ashford,
 Paul Kocher,
@@ -931,65 +950,61 @@ R.J. Keller,
 Rajiv Dayal,
 Ramalingam Saravanan,
 Red Hat Inc,
-Rich Megginson,
 Rich Salz,
 Richard C. Swift,
 Richard L. Walsh,
 Richard Verhoeven,
-Rick Gessner,
 Robert Accettura,
-Robert G. Ginda,
 Robert John Churchill,
 Robert Kaiser,
 Robert Longson,
-Robert Marshall,
 Robert O'Callahan,
 Robert Relyea,
 Robert Sayre,
 Robert Strong,
 Roland Mainz,
 RSA Security Inc,
-Rusty Lynch,
 Ryan Cassin,
 Ryan VanderMeulen,
 Samphan Raruenrom,
 Scooter Morris,
 Scott MacGregor,
-Sean Murphy,
 Sebastian Schwieger,
 Sergei Dolgov,
 Seth Spitzer,
 Shawn Wilsher,
 Shy Shalom,
-Silverstone Interactive,
+Siddharth Agarwal,
 Simdesk Technologies Inc,
 Simmule Turner,
 Simon B&uuml;nzli,
-Simon Fraser,
 Simon Montagu,
 Simon Paquet,
 Simon Wilkinson,
 Sqlite Project,
 Srilatha Moturi,
+Stanford University,
 Stefan Sitter,
 Stephen Horlander,
 Steve Swanson,
-Stuart Morgan,
 Stuart Parmenter,
 Sun Microsystems Inc,
 Sylvain Pasche,
 Ted Mielczarek,
 Theppitak Karoonboonyanan,
+Thomas K. Dyas,
 Tim Copperfield,
-Tomas M&uuml;ller,
+Tom St Denis,
 University of Queensland,
-Vasiliy Potapenko,
 Vee Satayamas,
 Vincent B&eacute;ron,
 Vladimir Vukicevic,
+Wladimir Palant,
 Wolfgang Rosenauer,
 YAMASHITA Makoto,
-Zero-Knowledge Systems.
+Zack Rusin,
+Zero-Knowledge Systems,
+&#x017d;iga Sancin.
     </p>
 
     <hr>
diff --git a/toolkit/content/plugins.html b/toolkit/content/plugins.html
index d092201bd3aa..70b0479f1ff4 100644
--- a/toolkit/content/plugins.html
+++ b/toolkit/content/plugins.html
@@ -116,7 +116,7 @@
       document.write(plugin.name);
       document.writeln("<\/h2>");
 
-      document.writeln("<dl><dd><span class=\"label\">" + pluginsbundle.GetStringFromName("filename_label") + "<\/span> ");
+      document.writeln("<dl><dd><span class=\"label\">" + pluginsbundle.GetStringFromName("file_label") + "<\/span> ");
       document.write(plugin.filename);
       document.writeln("<\/dd><dd><span class=\"label\">" + pluginsbundle.GetStringFromName("version_label") + "<\/span> ");
       document.write(plugin.version);
diff --git a/toolkit/content/tests/chrome/test_autocomplete2.xul b/toolkit/content/tests/chrome/test_autocomplete2.xul
index f18bba1d5bcd..ffa696c7f25e 100644
--- a/toolkit/content/tests/chrome/test_autocomplete2.xul
+++ b/toolkit/content/tests/chrome/test_autocomplete2.xul
@@ -118,6 +118,9 @@ function check() {
   // Toggle this value, so we can re-use the one function.
   returnResult = !returnResult;
 
+  // blur the field to ensure that the popup is closed and that the previous
+  // search has stopped, then start a new search.
+  autocomplete.blur();
   autocomplete.focus();
   synthesizeKey("r", {});
 }
diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in
index 17a1ab48b5ac..6d78e04d7037 100644
--- a/toolkit/content/tests/widgets/Makefile.in
+++ b/toolkit/content/tests/widgets/Makefile.in
@@ -103,6 +103,7 @@ _TEST_FILES = 	test_bug360220.xul \
 		test_menu.xul \
 		test_menu_hide.xul \
 		test_focus.xul \
+		test_focus_anons.xul \
 		test_tabindex.xul \
  		test_mousescroll.xul \
 		test_scrollbar.xul \
diff --git a/toolkit/content/tests/widgets/test_focus_anons.xul b/toolkit/content/tests/widgets/test_focus_anons.xul
new file mode 100644
index 000000000000..01265c4c64ab
--- /dev/null
+++ b/toolkit/content/tests/widgets/test_focus_anons.xul
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+
+<window title="Tests for focus on elements with anonymous focusable children"
+        onload="setTimeout(runTests, 0);"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>      
+
+<label accesskey="a" control="menulist"/>
+<label accesskey="b" control="textbox"/>
+<label accesskey="c" control="scale"/>
+
+<menulist id="menulist" editable="true">
+  <menupopup>
+    <menuitem label="One"/>
+  </menupopup>
+</menulist>
+<textbox id="textbox"/>
+<scale id="scale"/>
+
+<script class="testbody" type="application/javascript">
+<![CDATA[
+
+SimpleTest.waitForExplicitFinish();
+
+var gBlurs = 0, gFocuses = 0;
+var gExpectedBlur = "";
+var gExpectedFocus = "";
+
+function blurOccured(event) {
+  gBlurs++;
+  is(event.originalTarget, gExpectedBlur, "blur " + gBlurs + "," + event.originalTarget.localName);
+}
+
+function focusOccured(event) {
+  gFocuses++;
+  is(event.originalTarget, gExpectedFocus, "focus " + gFocuses + "," + event.originalTarget.localName);
+}
+
+function runTests()
+{
+  addEventListener("focus", focusOccured, true);
+  addEventListener("blur", blurOccured, true);
+
+  gExpectedBlur = null;
+  gExpectedFocus = $("menulist").inputField;
+  $("menulist").focus();
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = $("textbox").inputField;
+  $("textbox").focus();
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = document.getAnonymousNodes($("scale"))[0];
+  $("scale").focus();
+
+  var accessKeyDetails = (navigator.platform.indexOf("Mac") >= 0) ?
+                         { ctrlKey : true } : { altKey : true, shiftKey: true };
+
+  gExpectedBlur = document.getAnonymousNodes($("scale"))[0];
+  gExpectedFocus = $("menulist").inputField;
+  synthesizeKey("a", accessKeyDetails);
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = $("textbox").inputField;
+  synthesizeKey("b", accessKeyDetails);
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = document.getAnonymousNodes($("scale"))[0];
+  synthesizeKey("c", accessKeyDetails);
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = $("textbox").inputField;
+  synthesizeKey("VK_TAB", { shiftKey: true });
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = $("menulist").inputField;
+  synthesizeKey("VK_TAB", { shiftKey: true });
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = $("textbox").inputField;
+  synthesizeKey("VK_TAB", { });
+
+  gExpectedBlur = gExpectedFocus;
+  gExpectedFocus = document.getAnonymousNodes($("scale"))[0];
+  synthesizeKey("VK_TAB", { });
+
+  is(gBlurs, 9, "correct number of blurs");
+  is(gFocuses, 10, "correct number of focuses");
+
+  SimpleTest.finish();
+}
+
+]]>
+</script>
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+<p id="display">
+</p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+</pre>
+</body>
+
+</window>
diff --git a/toolkit/content/tests/widgets/test_tabindex.xul b/toolkit/content/tests/widgets/test_tabindex.xul
index 8ad0922b9185..2f11455fe6d5 100644
--- a/toolkit/content/tests/widgets/test_tabindex.xul
+++ b/toolkit/content/tests/widgets/test_tabindex.xul
@@ -109,8 +109,6 @@ function runTests()
     }
   }, true);
 
-  synthesizeMouse(document.documentElement, 1, 1, { });
-
   for (t = 1; t <= gTestCount; t++)
     synthesizeKey("VK_TAB", { });
 
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 3578f928b85d..12a73b2b84cc 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -616,14 +616,6 @@
         false
       </field>
       
-      <field name="focusedWindow">
-        null
-      </field>
-
-      <field name="focusedElement">
-        null
-      </field>
-      
       <field name="isShowingMessage">
         false
       </field>
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index 4ebc75782b10..53b0c2ad2ec5 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -1151,37 +1151,23 @@
         -->
       <method name="close">
         <body><![CDATA[
-          var ww =
-            Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                      .getService(Components.interfaces.nsIWindowWatcher);
-          if (window == ww.activeWindow) {
-            var focusedElement = document.commandDispatcher.focusedElement;
+          var fm =
+            Components.classes["@mozilla.org/focus-manager;1"]
+                      .getService(Components.interfaces.nsIFocusManager);
+          if (window == fm.focusedWindow) {
+            var focusedElement = fm.focusedElement;
             if (focusedElement) {
               var bindingParent = document.getBindingParent(focusedElement);
               if (bindingParent == this || bindingParent == this._findField) {
                 // block scrolling on focus since find already scrolls, further
                 // scrolling is due to user action, so don't override this
-                var suppressedScroll = document.commandDispatcher.suppressFocusScroll;
-                document.commandDispatcher.suppressFocusScroll = true;
-                // We MUST reset suppressFocusScroll.
-                try {
-                  if (this._foundLink)
-                    this._foundLink.focus();
-                  else if (this._foundEditable)
-                    this._foundEditable.focus();
-                  else if (this._currentWindow)
+                var element = this._foundLink || this._foundEditable;
+                if (element)
+                  fm.setFocus(element, fm.FLAG_NOSCROLL);
+                else if (this._currentWindow)
                     this._currentWindow.focus();
-                  else
-                    this.browser.contentWindow.focus();
-                }
-                catch(ex) {
-                  // Retry to set focus.
-                  try {
-                    this.browser.contentWindow.focus();
-                  }
-                  catch(e) { /* We lose focused element! */ }
-                }
-                document.commandDispatcher.suppressFocusScroll = suppressedScroll;
+                else
+                  this.browser.contentWindow.focus();
               }
             }
           }
diff --git a/toolkit/content/widgets/menulist.xml b/toolkit/content/widgets/menulist.xml
index 373546d47ad9..92e6d4af434b 100644
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -559,11 +559,7 @@
     <handlers>
       <handler event="focus" phase="capturing">
         <![CDATA[
-          if (!this.hasAttribute('focused')) {
-            if (event.originalTarget != this.inputField)
-              this.inputField.focus();
-            this.setAttribute('focused','true');
-          }
+          this.setAttribute('focused','true');
         ]]>
       </handler>
 
diff --git a/toolkit/content/widgets/scale.xml b/toolkit/content/widgets/scale.xml
index a4c789f48c3f..91092104f78e 100644
--- a/toolkit/content/widgets/scale.xml
+++ b/toolkit/content/widgets/scale.xml
@@ -182,7 +182,6 @@
         <parameter name="isDragging"/>
         <body/>
       </method>
-
     </implementation>
 
     <handlers>
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 34c9bbf80180..a17084c0549b 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -39,6 +39,7 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+relativesrcdir  = toolkit/crashreporter/test
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -114,3 +115,13 @@ ifndef MOZ_ENABLE_LIBXUL
 #check:: $(PROGRAM)
 #	$(RUN_TEST_PROGRAM) $(DIST)/bin/TestCrashReporterAPI
 endif
+
+_BROWSER_FILES = \
+  browser/aboutcrashes_utils.js \
+  browser/browser_aboutCrashes.js \
+  browser/browser_bug471404.js \
+  $(NULL)
+
+
+libs::  $(_BROWSER_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/browser
diff --git a/toolkit/crashreporter/test/browser/aboutcrashes_utils.js b/toolkit/crashreporter/test/browser/aboutcrashes_utils.js
new file mode 100644
index 000000000000..4d4568eae957
--- /dev/null
+++ b/toolkit/crashreporter/test/browser/aboutcrashes_utils.js
@@ -0,0 +1,92 @@
+function create_subdir(dir, subdirname) {
+  let subdir = dir.clone();
+  subdir.append(subdirname);
+  if (subdir.exists()) {
+    subdir.remove(true);
+  }
+  subdir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
+  return subdir;
+}
+
+// need to hold on to this to unregister for cleanup
+let _provider = null;
+
+function make_fake_appdir() {
+  // Create a directory inside the profile and register it as UAppData, so
+  // we can stick fake crash reports inside there. We put it inside the profile
+  // just because we know that will get cleaned up after the mochitest run.
+  let dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
+                         .getService(Components.interfaces.nsIProperties);
+  let profD = dirSvc.get("ProfD", Components.interfaces.nsILocalFile);
+  // create a subdir just to keep our files out of the way
+  let appD = create_subdir(profD, "UAppData");
+
+  let crashesDir = create_subdir(appD, "Crash Reports");
+  create_subdir(crashesDir, "pending");
+  create_subdir(crashesDir, "submitted");
+
+  _provider = {
+    getFile: function(prop, persistent) {
+      persistent.value = true;
+      if (prop == "UAppData") {
+        return appD.clone();
+      }
+      throw Components.results.NS_ERROR_FAILURE;
+    },
+    QueryInterface: function(iid) {
+      if (iid.equals(Components.interfaces.nsIDirectoryProvider) ||
+          iid.equals(Components.interfaces.nsISupports)) {
+        return this;
+      }
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+  };
+  // register our new provider
+  dirSvc.QueryInterface(Components.interfaces.nsIDirectoryService)
+        .registerProvider(_provider);
+  // and undefine the old value
+  try {
+    dirSvc.undefine("UAppData");
+  } catch(ex) {} // it's ok if this fails, the value might not be cached yet
+  return appD.clone();
+}
+
+function cleanup_fake_appdir() {
+  let dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
+                         .getService(Components.interfaces.nsIProperties);
+  dirSvc.unregisterProvider(_provider);
+  // undefine our value so future calls get the real value
+  try {
+    dirSvc.undefine("UAppData");
+  } catch(ex) {
+    dump("cleanup_fake_appdir: dirSvc.undefine failed: " + ex.message +"\n");
+  }
+}
+
+function add_fake_crashes(crD, count) {
+  let results = [];
+  let uuidGenerator = Components.classes["@mozilla.org/uuid-generator;1"]
+                        .getService(Components.interfaces.nsIUUIDGenerator);
+  let submitdir = crD.clone();
+  submitdir.append("submitted");
+  // create them from oldest to newest, to ensure that about:crashes
+  // displays them in the correct order
+  let date = Date.now() - count * 60000;
+  for (let i = 0; i < count; i++) {
+    let uuid = uuidGenerator.generateUUID().toString();
+    // ditch the {}
+    uuid = uuid.substring(1,uuid.length-2);
+    let fn = "bp-" + uuid + ".txt";
+    let file = submitdir.clone();
+    file.append(fn);
+    file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);
+    file.lastModifiedTime = date;
+    results.push({'id': uuid, 'date': date, 'pending': false});
+
+    date += 60000;
+  }
+  // we want them sorted newest to oldest, since that's the order
+  // that about:crashes lists them in
+  results.sort(function(a,b) b.date - a.date);
+  return results;
+}
diff --git a/toolkit/crashreporter/test/browser/browser_aboutCrashes.js b/toolkit/crashreporter/test/browser/browser_aboutCrashes.js
new file mode 100644
index 000000000000..5471a7a81d62
--- /dev/null
+++ b/toolkit/crashreporter/test/browser/browser_aboutCrashes.js
@@ -0,0 +1,36 @@
+// load our utility script
+var scriptLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                             .getService(Components.interfaces.mozIJSSubScriptLoader);
+scriptLoader.loadSubScript("chrome://mochikit/content/browser/toolkit/crashreporter/test/browser/aboutcrashes_utils.js", this);
+
+function check_crash_list(tab, crashes) {
+  let doc = gBrowser.getBrowserForTab(tab).contentDocument;
+  let crashlinks = doc.getElementById("tbody").getElementsByTagName("a");
+  is(crashlinks.length, crashes.length, "about:crashes lists correct number of crash reports");
+  for(let i = 0; i < crashes.length; i++) {
+    is(crashes[i].id, crashlinks[i].firstChild.textContent, i + ": crash ID is correct");
+  }
+  cleanup_fake_appdir();
+  gBrowser.removeTab(tab);
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  let appD = make_fake_appdir();
+  let crD = appD.clone();
+  crD.append("Crash Reports");
+  let crashes = add_fake_crashes(crD, 5);
+  // sanity check
+  let dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
+                         .getService(Components.interfaces.nsIProperties);
+  let appDtest = dirSvc.get("UAppData", Components.interfaces.nsILocalFile);
+  ok(appD.equals(appDtest), "directory service provider registered ok");
+  let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
+  let browser = gBrowser.getBrowserForTab(tab);
+  browser.addEventListener("load", function() {
+      ok(true, "about:crashes loaded");
+      executeSoon(function() { check_crash_list(tab, crashes); });
+    }, true);
+  browser.loadURI("about:crashes", null, null);
+}
diff --git a/toolkit/crashreporter/test/browser/browser_bug471404.js b/toolkit/crashreporter/test/browser/browser_bug471404.js
new file mode 100644
index 000000000000..89616b5c44b5
--- /dev/null
+++ b/toolkit/crashreporter/test/browser/browser_bug471404.js
@@ -0,0 +1,68 @@
+// load our utility script
+var scriptLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                             .getService(Components.interfaces.mozIJSSubScriptLoader);
+scriptLoader.loadSubScript("chrome://mochikit/content/browser/toolkit/crashreporter/test/browser/aboutcrashes_utils.js", this);
+
+function check_clear_visible(tab, aVisible) {
+  let doc = gBrowser.getBrowserForTab(tab).contentDocument;
+  let visible = false;
+  let button = doc.getElementById("clear-reports");
+  if (button) {
+    let style = doc.defaultView.getComputedStyle(button, "");
+    if (style.display != "none" &&
+        style.visibility == "visible")
+      visible = true;
+  }
+  is(visible, aVisible,
+     "clear reports button is " + (aVisible ? "visible" : "hidden"));
+}
+
+// each test here has a setup (run before loading about:crashes) and onload (run after about:crashes loads)
+let _tests = [{setup: null, onload: function(tab) { check_clear_visible(tab, false); }},
+              {setup: function(crD) { add_fake_crashes(crD, 1); },
+               onload: function(tab) { check_clear_visible(tab, true); }}
+              ];
+let _current_test = 0;
+
+function run_test_setup(crD) {
+  if (_tests[_current_test].setup) {
+    _tests[_current_test].setup(crD);
+  }
+}
+
+function run_test_onload(tab) {
+  if (_tests[_current_test].onload) {
+    _tests[_current_test].onload(tab);
+  }
+  _current_test++;
+
+  if (_current_test == _tests.length) {
+    cleanup_fake_appdir();
+    gBrowser.removeTab(tab);
+    finish();
+    return false;
+  }
+  return true;
+}
+
+function test() {
+  waitForExplicitFinish();
+  let appD = make_fake_appdir();
+  let crD = appD.clone();
+  crD.append("Crash Reports");
+
+  let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
+  let browser = gBrowser.getBrowserForTab(tab);
+  browser.addEventListener("load", function() {
+      executeSoon(function() {
+          if (run_test_onload(tab)) {
+            // prep and run the next test
+            run_test_setup(crD);
+            executeSoon(function() { browser.loadURI("about:crashes", null, null); });
+          }
+        });
+    }, true);
+  // kick things off
+  run_test_setup(crD);
+  browser.loadURI("about:crashes", null, null);
+}
diff --git a/toolkit/mozapps/downloads/tests/chrome/test_select_all.xul b/toolkit/mozapps/downloads/tests/chrome/test_select_all.xul
index 8189d9a0f183..cbe42978d6f9 100644
--- a/toolkit/mozapps/downloads/tests/chrome/test_select_all.xul
+++ b/toolkit/mozapps/downloads/tests/chrome/test_select_all.xul
@@ -116,24 +116,41 @@ function test()
         return;
 
       let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
-      let $ = function(aId) win.document.getElementById(aId);
-      let downloadView = $("downloadView");
 
-      is(downloadView.itemCount, sites.length, "All downloads displayed");
+      var checkSelectAndRemove = function(alreadyFocused)
+      {
+        if (!alreadyFocused) {
+          win.removeEventListener("focus", checkSelectAndRemove, true);
+        }
 
-      // Select all downloads
-      let isMac = navigator.platform.search("Mac") == 0;
-      synthesizeKey("a", { metaKey: isMac, ctrlKey: !isMac }, win);
-      is(downloadView.selectedCount, sites.length, "All downloads selected");
+        let $ = function(aId) win.document.getElementById(aId);
+        let downloadView = $("downloadView");
+        is(downloadView.itemCount, sites.length, "All downloads displayed");
 
-      // Delete all downloads
-      synthesizeKey("VK_DELETE", {}, win);
-      is(downloadView.itemCount, 0, "All downloads removed");
+        // Select all downloads
+        let isMac = navigator.platform.search("Mac") == 0;
+        synthesizeKey("a", { metaKey: isMac, ctrlKey: !isMac }, win);
+        is(downloadView.selectedCount, sites.length, "All downloads selected");
 
-      // We're done!
-      win.close();
-      obs.removeObserver(testObs, DLMGR_UI_DONE);
-      SimpleTest.finish();
+        // Delete all downloads
+        synthesizeKey("VK_DELETE", {}, win);
+        is(downloadView.itemCount, 0, "All downloads removed");
+
+        // We're done!
+        win.close();
+        obs.removeObserver(testObs, DLMGR_UI_DONE);
+        SimpleTest.finish();
+      }
+
+      // if the downloads window is focused, continue, otherwise, wait until it is focused
+      var fm = Components.classes["@mozilla.org/focus-manager;1"].
+                          getService(Components.interfaces.nsIFocusManager);
+      if (fm.activeWindow == win) {
+        checkSelectAndRemove(true);
+      }
+      else {
+        win.addEventListener("focus", checkSelectAndRemove, true);
+      }
     }
   };
   obs.addObserver(testObs, DLMGR_UI_DONE, false);
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 695f559d7bdc..1d30f66d7ff7 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -1166,8 +1166,51 @@ function Startup()
 
   gPref.setBoolPref(PREF_UPDATE_NOTIFYUSER, false);
 
-  if (gUpdatesOnly && gExtensionsView.children.length == 0)
+  if (gUpdatesOnly && gExtensionsView.children.length == 0) {
     window.close();
+    return;
+  }
+
+  // Left/right switches panes, up/down/pageUp/pageDown/home/end switches items in
+  // the current pane, whenever either the radiogroup or the richlistbox is focused.
+  window.addEventListener("keypress", function (event) {
+    if (event.target != viewGroup &&
+        event.target != gExtensionsView)
+      return;
+
+    switch (event.keyCode) {
+      case event.DOM_VK_LEFT:
+      case event.DOM_VK_RIGHT:
+        let nextFlag = (event.keyCode == event.DOM_VK_RIGHT);
+        if (getComputedStyle(viewGroup, "").direction == "rtl")
+          nextFlag = !nextFlag;
+        viewGroup.checkAdjacentElement(nextFlag);
+        break;
+      case event.DOM_VK_UP:
+        gExtensionsView._moveByOffsetFromUserEvent(-1, event);
+        break;
+      case event.DOM_VK_DOWN:
+        gExtensionsView._moveByOffsetFromUserEvent(1, event);
+        break;
+      case event.DOM_VK_PAGE_UP:
+        gExtensionsView._moveByOffsetFromUserEvent(gExtensionsView.scrollOnePage(-1), event);
+        break;
+      case event.DOM_VK_PAGE_DOWN:
+        gExtensionsView._moveByOffsetFromUserEvent(gExtensionsView.scrollOnePage(1), event);
+        break;
+      case event.DOM_VK_HOME:
+        gExtensionsView._moveByOffsetFromUserEvent(-gExtensionsView.currentIndex, event);
+        break;
+      case event.DOM_VK_END:
+        gExtensionsView._moveByOffsetFromUserEvent(gExtensionsView.getRowCount() -
+                                                   gExtensionsView.currentIndex - 1, event);
+        break;
+      default:
+        return; // don't consume the event
+    }
+    event.stopPropagation();
+    event.preventDefault();
+  }, true);
 }
 
 function Shutdown()
diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/mozapps/extensions/content/update.js
index 447d9e2c148d..591fb22bf279 100644
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -50,6 +50,9 @@ var gUpdateWizard = {
   // add-ons. When checking for compatible versions this contains only
   // incompatible add-ons.
   items: [],
+  // Contains a list of items that were disabled prior to the application
+  // upgrade.
+  inactiveItemIDs: [],
   // The items that we found updates available for
   itemsToUpdate: [],
   shouldSuggestAutoChecking: false,
@@ -63,6 +66,7 @@ var gUpdateWizard = {
                         .getService(nsIExtensionManager);
     // Retrieve all items in order to sync their app compatibility information
     this.items = em.getItemList(nsIUpdateItem.TYPE_ANY, { });
+    this.inactiveItemIDs = window.arguments[0];
     var pref =
         Components.classes["@mozilla.org/preferences-service;1"].
         getService(Components.interfaces.nsIPrefBranch);
@@ -203,6 +207,10 @@ var gVersionInfoPage = {
     gUpdateWizard.items = em.getIncompatibleItemList(null, null, null,
                                                      nsIUpdateItem.TYPE_ANY,
                                                      true, { });
+    gUpdateWizard.items = gUpdateWizard.items.filter(function(item) {
+      return gUpdateWizard.inactiveItemIDs.indexOf(item.id) < 0;
+    });
+
     if (gUpdateWizard.items.length > 0) {
       // There are still incompatible addons, inform the user.
       document.documentElement.currentPage =
diff --git a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index b9ac478e0a8b..aec5343ea3ba 100644
--- a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -3618,10 +3618,23 @@ ExtensionManager.prototype = {
     if (PendingOperations.size != 0)
       isDirty = true;
 
+    var ds = this.datasource;
+    var inactiveItemIDs = [];
+    var ctr = getContainer(ds, ds._itemRoot);
+    var elements = ctr.GetElements();
+    while (elements.hasMoreElements()) {
+      var itemResource = elements.getNext().QueryInterface(Ci.nsIRDFResource);
+      var id = stripPrefix(itemResource.Value, PREFIX_ITEM_URI);
+      var appDisabled = ds.getItemProperty(id, "appDisabled");
+      var userDisabled = ds.getItemProperty(id, "userDisabled")
+      if (appDisabled == "true" || appDisabled == OP_NEEDS_DISABLE ||
+          userDisabled == "true" || userDisabled == OP_NEEDS_DISABLE)
+        inactiveItemIDs.push(id);
+    }
+
     if (isDirty)
       this._finishOperations();
 
-    var ds = this.datasource;
     // During app upgrade cleanup invalid entries in the extensions datasource.
     ds.beginUpdateBatch();
     var allResources = ds.GetAllResources();
@@ -3636,8 +3649,7 @@ ExtensionManager.prototype = {
 
     var badItems = [];
     var allAppManaged = true;
-    var ctr = getContainer(ds, ds._itemRoot);
-    var elements = ctr.GetElements();
+    elements = ctr.GetElements();
     while (elements.hasMoreElements()) {
       var itemResource = elements.getNext().QueryInterface(Ci.nsIRDFResource);
       var id = stripPrefix(itemResource.Value, PREFIX_ITEM_URI);
@@ -3729,7 +3741,7 @@ ExtensionManager.prototype = {
     // Always check for compatibility updates when upgrading if we have add-ons
     // that aren't managed by the application.
     if (!allAppManaged)
-      this._showMismatchWindow();
+      this._showMismatchWindow(inactiveItemIDs);
 
     // Finish any pending upgrades from the compatibility update to avoid an
     // additional restart.
@@ -3763,6 +3775,9 @@ ExtensionManager.prototype = {
 
   /**
    * Shows the "Compatibility Updates" UI
+   * @param   items
+   *          an array of item IDs that were not enabled in the previous version
+   *          of the application.
    */
   _showMismatchWindow: function EM__showMismatchWindow(items) {
     var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
@@ -3771,12 +3786,15 @@ ExtensionManager.prototype = {
     if (wizard)
       wizard.focus();
     else {
+      var variant = Cc["@mozilla.org/variant;1"].
+                    createInstance(Ci.nsIWritableVariant);
+      variant.setFromVariant(items);
       var features = "chrome,centerscreen,dialog,titlebar,modal";
       // This *must* be modal so as not to break startup! This code is invoked before
       // the main event loop is initiated (via checkForMismatches).
       var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
                getService(Ci.nsIWindowWatcher);
-      ww.openWindow(null, URI_EXTENSION_UPDATE_DIALOG, "", features, null);
+      ww.openWindow(null, URI_EXTENSION_UPDATE_DIALOG, "", features, variant);
     }
   },
 
diff --git a/toolkit/themes/gnomestripe/global/global.css b/toolkit/themes/gnomestripe/global/global.css
index f859c3f298b2..bfaa2453c4a9 100644
--- a/toolkit/themes/gnomestripe/global/global.css
+++ b/toolkit/themes/gnomestripe/global/global.css
@@ -296,6 +296,11 @@ label[disabled="true"] {
   border: 1px dotted -moz-DialogText;
 }
 
+notification > button {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {
diff --git a/toolkit/themes/gnomestripe/global/notification.css b/toolkit/themes/gnomestripe/global/notification.css
index 7231fcaaf178..be013276c2a7 100644
--- a/toolkit/themes/gnomestripe/global/notification.css
+++ b/toolkit/themes/gnomestripe/global/notification.css
@@ -15,6 +15,16 @@ notification[type="critical"] {
   color: white;
 }
 
+.notification-inner {
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+
+.messageText {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
 .messageImage {
   width: 16px;
   height: 16px;
@@ -38,4 +48,6 @@ notification[type="critical"] .messageImage {
 
 .messageCloseButton {
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+  margin-top: 0;
+  margin-bottom: 0;
 }
diff --git a/toolkit/themes/pinstripe/global/menulist.css b/toolkit/themes/pinstripe/global/menulist.css
index c8c8fbc76030..6e020867b160 100644
--- a/toolkit/themes/pinstripe/global/menulist.css
+++ b/toolkit/themes/pinstripe/global/menulist.css
@@ -93,7 +93,6 @@ menulist[disabled="true"] > .menulist-dropmarker {
 /* ::::: editable menulists ::::: */
 
 menulist[editable="true"] {
-  -moz-user-focus: normal;
   -moz-appearance: menulist-textfield;
   margin: 2px 4px;
 }
diff --git a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png
index 0eb7b186cfe4..edc21b620dd1 100644
Binary files a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png and b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png differ
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index deb1b697806b..b3423d6f9ee0 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -200,23 +200,6 @@ nsView::~nsView()
 {
   MOZ_COUNT_DTOR(nsView);
 
-  if (this == nsViewManager::GetViewFocusedBeforeSuppression()) {
-#ifdef DEBUG_FOCUS_SUPPRESSION
-    if (GetViewManager()->IsFocusSuppressed()) {
-      printf("*** 0 INFO TODO [CPEARCE] destroying view focused before suppression, while suppressed\n");
-    }
-#endif
-    nsViewManager::SetViewFocusedBeforeSuppression(nsnull);
-  }
-  if (this == nsViewManager::GetCurrentlyFocusedView()) {
-#ifdef DEBUG_FOCUS_SUPPRESSION
-    if (GetViewManager()->IsFocusSuppressed()) {
-      printf("*** 0 INFO TODO [CPEARCE] destroying view currently focused, while suppressed\n");
-    }
-#endif
-    nsViewManager::SetCurrentlyFocusedView(nsnull);
-  }
-
   while (GetFirstChild())
   {
     nsView* child = GetFirstChild();
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 5252dd3508ef..a7f44d57efc3 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -63,8 +63,6 @@
 #include "nsThreadUtils.h"
 #include "nsContentUtils.h"
 #include "gfxContext.h"
-#define NS_STATIC_FOCUS_SUPPRESSOR
-#include "nsIFocusEventSuppressor.h"
 
 static NS_DEFINE_IID(kBlenderCID, NS_BLENDER_CID);
 static NS_DEFINE_IID(kRegionCID, NS_REGION_CID);
@@ -94,10 +92,6 @@ static NS_DEFINE_IID(kRenderingContextCID, NS_RENDERING_CONTEXT_CID);
 #include "nsITimeRecorder.h"
 #endif
 
-#ifdef DEBUG_smaug
-#define DEBUG_FOCUS_SUPPRESSION
-#endif
-
 //-------------- Begin Invalidate Event Definition ------------------------
 
 class nsInvalidateEvent : public nsViewManagerEvent {
@@ -175,9 +169,8 @@ nsViewManager::nsViewManager()
 
   gViewManagers->AppendElement(this);
 
-  if (++mVMCount == 1) {
-    NS_AddFocusSuppressorCallback(&nsViewManager::SuppressFocusEvents);
-  }
+  ++mVMCount;
+
   // NOTE:  we use a zeroing operator new, so all data members are
   // assumed to be cleared here.
   mHasPendingUpdates = PR_FALSE;
@@ -922,61 +915,6 @@ void nsViewManager::UpdateViews(nsView *aView, PRUint32 aUpdateFlags)
   }
 }
 
-nsView *nsViewManager::sCurrentlyFocusView = nsnull;
-nsView *nsViewManager::sViewFocusedBeforeSuppression = nsnull;
-PRBool nsViewManager::sFocusSuppressed = PR_FALSE;
-
-void nsViewManager::SuppressFocusEvents(PRBool aSuppress)
-{
-  if (aSuppress) {
-    sFocusSuppressed = PR_TRUE;
-    SetViewFocusedBeforeSuppression(GetCurrentlyFocusedView());
-    return;
-  }
-
-  sFocusSuppressed = PR_FALSE;
-  if (GetCurrentlyFocusedView() == GetViewFocusedBeforeSuppression()) {
-    return;
-  }
-  
-  // We're turning off suppression, synthesize LOSTFOCUS/GOTFOCUS.
-  nsIWidget *widget = nsnull;
-  nsEventStatus status;
-
-  // Backup what is focused before we send the blur. If the
-  // blur causes a focus change, keep that new focus change,
-  // don't overwrite with the old "currently focused view".
-  nsIView *currentFocusBeforeBlur = GetCurrentlyFocusedView();
-
-  // Send NS_LOSTFOCUS to widget that was focused before
-  // focus/blur suppression.
-  if (GetViewFocusedBeforeSuppression()) {
-    widget = GetViewFocusedBeforeSuppression()->GetWidget();
-    if (widget) {
-#ifdef DEBUG_FOCUS_SUPPRESSION
-      printf("*** 0 INFO TODO [CPEARCE] Unsuppressing, dispatching NS_LOSTFOCUS\n");
-#endif
-      nsGUIEvent event(PR_TRUE, NS_LOSTFOCUS, widget);
-      widget->DispatchEvent(&event, status);
-    }
-  }
-
-  // Send NS_GOTFOCUS to the widget that we think should be focused.
-  if (GetCurrentlyFocusedView() &&
-      currentFocusBeforeBlur == GetCurrentlyFocusedView())
-  {
-    widget = GetCurrentlyFocusedView()->GetWidget();
-    if (widget) {
-#ifdef DEBUG_FOCUS_SUPPRESSION
-      printf("*** 0 INFO TODO [CPEARCE] Unsuppressing, dispatching NS_GOTFOCUS\n");
-#endif
-      nsGUIEvent event(PR_TRUE, NS_GOTFOCUS, widget);
-      widget->DispatchEvent(&event, status); 
-    }
-  }
-
-}
-
 NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, nsEventStatus *aStatus)
 {
   *aStatus = nsEventStatus_eIgnore;
@@ -1191,23 +1129,6 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, nsEventStatus *aS
 
     default:
       {
-        if (aEvent->message == NS_GOTFOCUS) {
-#ifdef DEBUG_FOCUS_SUPPRESSION
-          printf("*** 0 INFO TODO [CPEARCE] Focus changing%s\n",
-            (nsViewManager::IsFocusSuppressed() ? " while suppressed" : ""));
-#endif
-          SetCurrentlyFocusedView(nsView::GetViewFor(aEvent->widget));
-        }
-        if ((aEvent->message == NS_GOTFOCUS || aEvent->message == NS_LOSTFOCUS) &&
-             nsViewManager::IsFocusSuppressed())
-        {
-#ifdef DEBUG_FOCUS_SUPPRESSION
-          printf("*** 0 INFO TODO [CPEARCE] Suppressing %s\n",
-            (aEvent->message == NS_GOTFOCUS ? "NS_GOTFOCUS" : "NS_LOSTFOCUS"));
-#endif          
-          break;
-        }
-        
         if ((NS_IS_MOUSE_EVENT(aEvent) &&
              // Ignore moves that we synthesize.
              static_cast<nsMouseEvent*>(aEvent)->reason ==
diff --git a/view/src/nsViewManager.h b/view/src/nsViewManager.h
index c34ed20a93a2..bed8d08c8ff4 100644
--- a/view/src/nsViewManager.h
+++ b/view/src/nsViewManager.h
@@ -199,54 +199,11 @@ public:
   /* Update the cached RootViewManager pointer on this view manager. */
   void InvalidateHierarchy();
 
-  /**
-   * Enables/disables focus/blur event suppression.
-   * Enabling stops focus/blur events from reaching the widgets.
-   * This should be enabled when we're messing with the frame tree,
-   * so focus/blur handlers don't mess with stuff while we are.
-   *
-   * Disabling "reboots" the focus by sending a blur to what was focused
-   * before suppression began, and by sending a focus event to what should
-   * be currently focused. Note this can run arbitrary code, and could
-   * even destroy the view manager.
-   * See Bug 399852.
-   */
-  static void SuppressFocusEvents(PRBool aSuppress);
-
-  PRBool IsFocusSuppressed()
-  {
-    return sFocusSuppressed;
-  }
-
-  static void SetCurrentlyFocusedView(nsView *aView)
-  {
-    sCurrentlyFocusView = aView;
-  }
-  
-  static nsView* GetCurrentlyFocusedView()
-  {
-    return sCurrentlyFocusView;
-  }
-
-  static void SetViewFocusedBeforeSuppression(nsView *aView)
-  {
-    sViewFocusedBeforeSuppression = aView;
-  }
-
-  static nsView* GetViewFocusedBeforeSuppression()
-  {
-    return sViewFocusedBeforeSuppression;
-  }
-
 protected:
   virtual ~nsViewManager();
 
 private:
 
-  static nsView *sCurrentlyFocusView;
-  static nsView *sViewFocusedBeforeSuppression;
-  static PRBool sFocusSuppressed;
-
   void FlushPendingInvalidates();
   void ProcessPendingUpdates(nsView *aView, PRBool aDoInvalidate);
   void ReparentChildWidgets(nsIView* aView, nsIWidget *aNewWidget);
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index 5328579e9163..a48e246848fa 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -87,7 +87,6 @@ class nsHashKey;
 #define NS_MUTATION_EVENT                 19 // |nsMutationEvent| in content
 #define NS_ACCESSIBLE_EVENT               20
 #define NS_FORM_EVENT                     21
-#define NS_FOCUS_EVENT                    22
 #define NS_POPUP_EVENT                    23
 #define NS_COMMAND_EVENT                  24
 #define NS_POPUPBLOCKED_EVENT             25
@@ -157,10 +156,6 @@ class nsHashKey;
 #define NS_SIZE                         (NS_WINDOW_START + 3)
 // Widget size mode was changed
 #define NS_SIZEMODE                     (NS_WINDOW_START + 4)
-// Widget gained focus
-#define NS_GOTFOCUS                     (NS_WINDOW_START + 5)
-// Widget lost focus
-#define NS_LOSTFOCUS                    (NS_WINDOW_START + 6)
 // Widget got activated
 #define NS_ACTIVATE                     (NS_WINDOW_START + 7)
 // Widget got deactivated
@@ -1190,21 +1185,6 @@ public:
   nsIContent *originator;
 };
 
-/**
-* Focus event
-*/
-class nsFocusEvent : public nsGUIEvent
-{
-public:
-  nsFocusEvent(PRBool isTrusted, PRUint32 msg, nsIWidget *w)
-    : nsGUIEvent(isTrusted, msg, w, NS_FOCUS_EVENT),
-      isMozWindowTakingFocus(PR_FALSE)
-  {
-  }
-
-  PRBool isMozWindowTakingFocus;
-};
-
 /**
  * Command event
  *
@@ -1380,9 +1360,7 @@ enum nsDragDropEventStatus {
         ((evnt)->message == NS_COMPOSITION_QUERY))
 
 #define NS_IS_FOCUS_EVENT(evnt) \
-       (((evnt)->message == NS_GOTFOCUS) ||  \
-        ((evnt)->message == NS_LOSTFOCUS) ||  \
-        ((evnt)->message == NS_ACTIVATE) || \
+       (((evnt)->message == NS_ACTIVATE) || \
         ((evnt)->message == NS_DEACTIVATE) || \
         ((evnt)->message == NS_PLUGIN_ACTIVATE))
 
diff --git a/widget/src/beos/nsWindow.cpp b/widget/src/beos/nsWindow.cpp
index 5c88a6a4727f..a2ef2cbfa0ad 100644
--- a/widget/src/beos/nsWindow.cpp
+++ b/widget/src/beos/nsWindow.cpp
@@ -1192,7 +1192,6 @@ NS_METHOD nsWindow::SetFocus(PRBool aRaise)
 			
 		mView->MakeFocus(true);
 		mView->UnlockLooper();
-		DispatchFocus(NS_GOTFOCUS);
 	}
 
 	return NS_OK;
@@ -1781,9 +1780,6 @@ bool nsWindow::CallMethod(MethodInfo *info)
 		break;
 #endif
 	case nsSwitchToUIThread::KILL_FOCUS:
-		NS_ASSERTION(info->nArgs == 1, "Wrong number of arguments to CallMethod");
-		if ((uint32)info->args[0] == (uint32)mView)
-			DispatchFocus(NS_LOSTFOCUS);
 #ifdef DEBUG_FOCUS
 		else
 			printf("Wrong view to de-focus\n");
diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h
index 0bb8dcf38953..e4dd54c46311 100644
--- a/widget/src/cocoa/nsChildView.h
+++ b/widget/src/cocoa/nsChildView.h
@@ -457,8 +457,6 @@ protected:
   PRPackedBool          mPluginDrawing;
   PRPackedBool          mPluginIsCG; // true if this is a CoreGraphics plugin
 
-  PRPackedBool          mInSetFocus;
-
   nsPluginPort          mPluginPort;
   nsIPluginInstanceOwner* mPluginInstanceOwner; // [WEAK]
 
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index dd3f8b1cf3da..fa02f4d977bd 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -125,7 +125,6 @@ CFStringRef kOurTISPropertyInputSourceID = NULL;
 CFStringRef kOurTISPropertyInputSourceLanguages = NULL;
 
 // these are defined in nsCocoaWindow.mm
-extern PRBool gCocoaWindowMethodsSwizzled;
 extern PRBool gConsumeRollupEvent;
 
 PRBool gChildViewMethodsSwizzled = PR_FALSE;
@@ -492,7 +491,6 @@ nsChildView::nsChildView() : nsBaseWidget()
 , mIsPluginView(PR_FALSE)
 , mPluginDrawing(PR_FALSE)
 , mPluginIsCG(PR_FALSE)
-, mInSetFocus(PR_FALSE)
 {
 #ifdef PR_LOGGING
   if (!sCocoaLog) {
@@ -580,12 +578,6 @@ nsresult nsChildView::StandardCreate(nsIWidget *aParent,
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // See NSWindow (MethodSwizzling) in nsCocoaWindow.mm.
-  if (!gCocoaWindowMethodsSwizzled) {
-    nsToolkit::SwizzleMethods([NSWindow class], @selector(sendEvent:),
-                              @selector(nsCocoaWindow_NSWindow_sendEvent:));
-    gCocoaWindowMethodsSwizzled = PR_TRUE;
-  }
   // See NSView (MethodSwizzling) below.
   if (nsToolkit::OnLeopardOrLater() && !gChildViewMethodsSwizzled) {
     nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow),
@@ -674,7 +666,7 @@ void nsChildView::TearDownView()
 
   NSWindow* win = [mView window];
   NSResponder* responder = [win firstResponder];
-  
+
   // We're being unhooked from the view hierarchy, don't leave our view
   // or a child view as the window first responder.
   if (responder && [responder isKindOfClass:[NSView class]] &&
@@ -1072,55 +1064,9 @@ NS_IMETHODIMP nsChildView::SetFocus(PRBool aRaise)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Don't do anything if SetFocus() has been called reentrantly on the same
-  // object.  Sometimes calls to nsChildView::DispatchEvent() can get
-  // temporarily stuck, causing calls to [ChildView sendFocusEvent:] and
-  // SetFocus() to be reentered.  These reentrant calls are probably the
-  // result of one or more bugs, and doing things on a reentrant call can
-  // cause problems:  For example if mView is already the first responder and
-  // we send it an NS_GOTFOCUS event (see below), this causes the Mochitests
-  // to get stuck in the toolkit/content/tests/widgets/test_popup_button.xul
-  // test.
-  if (mInSetFocus)
-    return NS_OK;
-  mInSetFocus = PR_TRUE;
   NSWindow* window = [mView window];
-  if (window) {
-    nsAutoRetainCocoaObject kungFuDeathGrip(mView);
-    // For reasons that aren't yet clear, focus changes within a window (as
-    // opposed to those between windows or between apps) should only trigger
-    // NS_LOSTFOCUS and NS_GOTFOCUS events (sent to Gecko) in the context of
-    // a call to nsChildView::SetFocus() (or nsCocoaWindow::SetFocus(), which
-    // in any case re-routes to nsChildView::SetFocus()).  If we send these
-    // events on every intra-window focus change (on every call to
-    // [ChildView becomeFirstResponder:] or [ChildView resignFirstResponder:]),
-    // the result will be strange focus bugs (like bmo bugs 399471, 403232,
-    // 404433 and 408266).
-    NSResponder* firstResponder = [window firstResponder];
-    if ([mView isEqual:firstResponder]) {
-      // Sometimes SetFocus() is called on an nsChildView object that's
-      // already focused.  In principle this shouldn't happen, and in any
-      // case we shouldn't have to dispatch any events.  But if we don't, we
-      // sometimes get text-input cursors blinking in more than one text
-      // field, or still blinking when the browser is no longer active.  For
-      // reasons that aren't at all clear, this problem can be avoided by
-      // always sending an NS_GOTFOCUS message here.
-      if ([mView isKindOfClass:[ChildView class]])
-        [(ChildView *)mView sendFocusEvent:NS_GOTFOCUS];
-    } else {
-      // Retain and release firstResponder around the call to
-      // makeFirstResponder.
-      [firstResponder retain];
-      if ([window makeFirstResponder:mView]) {
-        if ([firstResponder isKindOfClass:[ChildView class]])
-          [(ChildView *)firstResponder sendFocusEvent:NS_LOSTFOCUS];
-        if ([mView isKindOfClass:[ChildView class]])
-          [(ChildView *)mView sendFocusEvent:NS_GOTFOCUS];
-      }
-      [firstResponder release];
-    }
-  }
-  mInSetFocus = PR_FALSE;
+  if (window)
+    [window makeFirstResponder:mView];
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -2443,12 +2389,6 @@ NSEvent* gLastDragEvent = nil;
   mGeckoChild = nsnull;
   mWindow = nil;
 
-  // A child widget can be destroyed without being unfocused (by Gecko).
-  WindowDataMap* windowMap = [WindowDataMap sharedWindowDataMap];
-  TopLevelWindowData* windowData = [windowMap dataForWindow:[self window]];
-  if (windowData)
-    [windowData markShouldUnfocus:self];
-
   // Just in case we're destroyed abruptly and missed the draggingExited
   // or performDragOperation message.
   NS_IF_RELEASE(mDragService);
@@ -2764,22 +2704,6 @@ NSEvent* gLastDragEvent = nil;
   if (!mGeckoChild)
     return;
 
-  // Keep track of the results of calling sendFocusEvent: in our NSWindow.
-  WindowDataMap* windowMap = [WindowDataMap sharedWindowDataMap];
-  TopLevelWindowData* windowData = [windowMap dataForWindow:[self window]];
-  if (windowData) {
-    switch (eventType) {
-      case NS_LOSTFOCUS:
-        [windowData markShouldUnfocus:self];
-        break;
-      case NS_GOTFOCUS:
-        [windowData markShouldFocus:self];
-        break;
-      default:
-        break;
-    }
-  }
-
   nsEventStatus status = nsEventStatus_eIgnore;
   nsGUIEvent focusGuiEvent(PR_TRUE, eventType, mGeckoChild);
   focusGuiEvent.time = PR_IntervalNow();
@@ -6079,13 +6003,12 @@ static BOOL keyUpAlreadySentKeyDown = NO;
 
   // check to see if the window implements the mozWindow protocol. This
   // allows embedders to avoid re-entrant calls to -makeKeyAndOrderFront,
-  // which can happen because these activate/focus calls propagate out
+  // which can happen because these activate calls propagate out
   // to the embedder via nsIEmbeddingSiteWindow::SetFocus().
   BOOL isMozWindow = [[self window] respondsToSelector:@selector(setSuppressMakeKeyFront:)];
   if (isMozWindow)
     [[self window] setSuppressMakeKeyFront:YES];
 
-  [self sendFocusEvent:NS_GOTFOCUS];
   [self sendFocusEvent:NS_ACTIVATE];
 
   if (isMozWindow)
@@ -6103,7 +6026,6 @@ static BOOL keyUpAlreadySentKeyDown = NO;
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
 
   [self sendFocusEvent:NS_DEACTIVATE];
-  [self sendFocusEvent:NS_LOSTFOCUS];
 }
 
 
diff --git a/widget/src/cocoa/nsCocoaWindow.h b/widget/src/cocoa/nsCocoaWindow.h
index 524403afdb84..cd699d9f261e 100644
--- a/widget/src/cocoa/nsCocoaWindow.h
+++ b/widget/src/cocoa/nsCocoaWindow.h
@@ -103,8 +103,8 @@ typedef struct _nsCocoaWindowList {
 @interface WindowDelegate : NSObject
 {
   nsCocoaWindow* mGeckoWindow; // [WEAK] (we are owned by the window)
-  // Used to avoid duplication when we send NS_ACTIVATE/NS_GOTFOCUS and
-  // NS_DEACTIVATE/NS_LOSTFOCUS to Gecko for toplevel widgets.  Starts out
+  // Used to avoid duplication when we send NS_ACTIVATE and
+  // NS_DEACTIVATE to Gecko for toplevel widgets.  Starts out
   // PR_FALSE.
   PRBool mToplevelActiveState;
 }
diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm
index b2a9df9363bf..e7dc8c42ee54 100644
--- a/widget/src/cocoa/nsCocoaWindow.mm
+++ b/widget/src/cocoa/nsCocoaWindow.mm
@@ -57,6 +57,10 @@
 #include "nsIPrefBranch.h"
 #include "nsToolkit.h"
 #include "nsPrintfCString.h"
+#include "nsIServiceManager.h"
+#include "nsIDOMWindow.h"
+#include "nsPIDOMWindow.h"
+#include "nsIDOMElement.h"
 #include "nsThreadUtils.h"
 #include "nsMenuBarX.h"
 #include "nsMenuUtilsX.h"
@@ -79,8 +83,6 @@ PRInt32 gXULModalLevel = 0;
 // also made app-modal.)  See nsCocoaWindow::SetModal().
 nsCocoaWindowList *gGeckoAppModalWindowList = NULL;
 
-PRBool gCocoaWindowMethodsSwizzled = PR_FALSE;
-
 PRBool gConsumeRollupEvent;
 
 // defined in nsMenuBarX.mm
@@ -1239,18 +1241,28 @@ void nsCocoaWindow::SetMenuBar(nsMenuBarX *aMenuBar)
   if (mMenuBar)
     mMenuBar->SetParent(nsnull);
   mMenuBar = aMenuBar;
-  
-  // We paint the hidden window menu bar if no other menu bar has been painted
-  // yet so that some reasonable menu bar is displayed when the app starts up.
-  if (!gSomeMenuBarPainted && mMenuBar && (nsMenuUtilsX::GetHiddenWindowMenuBar() == mMenuBar))
+
+  // Only paint for active windows, or paint the hidden window menu bar if no
+  // other menu bar has been painted yet so that some reasonable menu bar is
+  // displayed when the app starts up.
+  id windowDelegate = [mWindow delegate];
+  if (mMenuBar &&
+      ((!gSomeMenuBarPainted && nsMenuUtilsX::GetHiddenWindowMenuBar() == mMenuBar) ||
+       (windowDelegate && [windowDelegate toplevelActiveState])))
     mMenuBar->Paint();
 }
 
 
 NS_IMETHODIMP nsCocoaWindow::SetFocus(PRBool aState)
 {
-  if (mPopupContentView)
+  if (mPopupContentView) {
     mPopupContentView->SetFocus(aState);
+  }
+  else if (aState) {
+    [mWindow setAcceptsMouseMovedEvents:YES];
+    [mWindow makeKeyAndOrderFront:nil];
+    SendSetZLevelEvent();
+  }
 
   return NS_OK;
 }
@@ -1689,7 +1701,6 @@ nsCocoaWindow::UnifiedShading(void* aInfo, const float* aIn, float* aOut)
 - (void)sendToplevelActivateEvents
 {
   if (!mToplevelActiveState) {
-    [self sendFocusEvent:NS_GOTFOCUS];
     [self sendFocusEvent:NS_ACTIVATE];
     mToplevelActiveState = PR_TRUE;
   }
@@ -1700,7 +1711,6 @@ nsCocoaWindow::UnifiedShading(void* aInfo, const float* aIn, float* aOut)
 {
   if (mToplevelActiveState) {
     [self sendFocusEvent:NS_DEACTIVATE];
-    [self sendFocusEvent:NS_LOSTFOCUS];
     mToplevelActiveState = PR_FALSE;
   }
 }
@@ -2151,58 +2161,6 @@ void patternDraw(void* aInfo, CGContextRef aContext)
 @end
 
 
-@interface NSWindow (MethodSwizzling)
-- (void)nsCocoaWindow_NSWindow_sendEvent:(NSEvent *)anEvent;
-@end
-
-@implementation NSWindow (MethodSwizzling)
-
-// An NSLeftMouseDown event can change the focus, but it doesn't always do
-// this correctly/appropriately.  As a result, Gecko keyboard events may be
-// sent to the wrong nsChildView object, and thereby "lost".  So if we know
-// which ChildView object should have the focus in our NSWindow, and if
-// processing an NSLeftMouseDown event has caused the focus to be set
-// incorrectly, we change the focus back to where it belongs.  This resolves
-// bmo bugs 314160, 403232, 404433 and 357535/418031.
-//
-// Only check for incorrect focus if our NSWindow's "new" first responder is
-// also a ChildView object:  Embedders (like Camino) sometimes legitimately
-// use NSView objects which are not ChildView objects (which don't have
-// corresponding child widgets), and expect them to be focusable via an
-// NSLeftMouseDown event.
-//
-// For non-embedders (e.g. Firefox, Thunderbird and Seamonkey), it would
-// probably only be necessary to add a sendEvent: method to the ToolbarWindow
-// class.  But embedders (like Camino) generally create their own NSWindows.
-// So in order to fix this problem everywhere, it's necessary to "hook"
-// NSWindow's own sendEvent: method.
-- (void)nsCocoaWindow_NSWindow_sendEvent:(NSEvent *)anEvent
-{
-  // Since we've hooked a "system call" ([NSWindow sendEvent:]), we're always
-  // called from system code (not browser code).  So avoid crashing on any
-  // Objective-C exceptions that occur here.
-  NS_OBJC_BEGIN_TRY_LOGONLY_BLOCK;
-
-  [self nsCocoaWindow_NSWindow_sendEvent:anEvent];
-
-  if ([anEvent type] == NSLeftMouseDown) {
-    NSResponder *newFirstResponder = [self firstResponder];
-    if ([newFirstResponder isKindOfClass:[ChildView class]]) {
-      WindowDataMap *windowMap = [WindowDataMap sharedWindowDataMap];
-      TopLevelWindowData *windowData = [windowMap dataForWindow:self];
-      if (windowData) {
-        ChildView *shouldFocusView = [windowData getShouldFocusView];
-        if (shouldFocusView && (shouldFocusView != newFirstResponder))
-          [self makeFirstResponder:shouldFocusView];
-      }
-    }
-  }
-
-  NS_OBJC_END_TRY_LOGONLY_BLOCK;
-}
-
-@end
-
 @implementation PopupWindow
 
 // The OS treats our custom popup windows very strangely -- many mouse events
diff --git a/widget/src/cocoa/nsWindowMap.h b/widget/src/cocoa/nsWindowMap.h
index 263d30786392..a11b5b6a3add 100644
--- a/widget/src/cocoa/nsWindowMap.h
+++ b/widget/src/cocoa/nsWindowMap.h
@@ -86,13 +86,9 @@
 @interface TopLevelWindowData : NSObject
 {
 @private
-  ChildView *mShouldFocusView; // Strong
 }
 
 - (id)initWithWindow:(NSWindow*)inWindow;
-- (ChildView *)getShouldFocusView;
-- (void)markShouldFocus:(ChildView *)aView;
-- (void)markShouldUnfocus:(ChildView *)aView;
 + (void)activateInWindow:(NSWindow*)aWindow;
 + (void)deactivateInWindow:(NSWindow*)aWindow;
 + (void)activateInWindowViews:(NSWindow*)aWindow;
diff --git a/widget/src/cocoa/nsWindowMap.mm b/widget/src/cocoa/nsWindowMap.mm
index 955a16c3b798..3912bb7b5312 100644
--- a/widget/src/cocoa/nsWindowMap.mm
+++ b/widget/src/cocoa/nsWindowMap.mm
@@ -146,7 +146,6 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   if ((self = [super init])) {
-    mShouldFocusView = nil;
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(windowBecameKey:)
                                                  name:NSWindowDidBecomeKeyNotification
@@ -181,51 +180,12 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  if (mShouldFocusView)
-    [mShouldFocusView release];
-
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
-// mShouldFocusView (if non-nil) is the ChildView object that *should* be
-// focused in our NSWindow -- even if it isn't the one that's actually
-// currently focused.  (By "focused" I mean "is our NSWindow's first
-// responder, which takes keyboard input".)  We assume that [ChildView
-// sendFocusEvent:] is sent (to a ChildView object) if and only if that
-// ChildView object is about to be (or has just been) appropriately focused
-// or unfocused.  And mShouldFocusView keeps track of the results of calls
-// to [ChildView sendFocusEvent:] on ChildView objects in our NSWindow.
-- (ChildView *)getShouldFocusView
-{
-  // A ChildView that's been detached from its window should never be made
-  // first responder (it should have been unfocused, but wasn't).
-  if (![mShouldFocusView window]) {
-    [mShouldFocusView release];
-    mShouldFocusView = nil;
-  }
-  return mShouldFocusView;
-}
-
-- (void)markShouldFocus:(ChildView *)aView
-{
-  if (aView == mShouldFocusView)
-    return;
-  if (mShouldFocusView)
-    [mShouldFocusView release];
-  mShouldFocusView = [aView retain];
-}
-
-- (void)markShouldUnfocus:(ChildView *)aView
-{
-  if (aView == mShouldFocusView) {
-    [mShouldFocusView release];
-    mShouldFocusView = nil;
-  }
-}
-
 // As best I can tell, if the notification's object has a corresponding
 // top-level widget (an nsCocoaWindow object), it has a delegate (set in
 // nsCocoaWindow::StandardCreate()) of class WindowDelegate, and otherwise
@@ -233,23 +193,6 @@
 // only child widgets (nsChildView objects)).  (The notification is sent
 // to windowBecameKey: or windowBecameMain: below.)
 //
-// If we're using top-level widgets, we need to send them both kinds of
-// focus event (NS_GOTFOCUS and NS_ACTIVATE, which by convention are sent in
-// that order) -- otherwise text input can (under unusual circumstances) stop
-// working in the currently focused child widget (see bmo bug 354768).
-//
-// When we send focus events to a top-level widget, they get propagated
-// (via nsWebShellWindow::HandleEvent(), indirectly) to a child widget (an
-// nsChildView object) -- so in principle we shouldn't have to send them to
-// child widgets here.  But I've found that, unless I also send at least an
-// NS_GOTFOCUS event directly to the currently focused child widget, it's
-// easy to get blinking I-bar cursors in multiple text input fields
-// (particularly if one of them is the Google search box).  On other platforms
-// (e.g. Windows and GTK2), NS_ACTIVATE events are only sent (directly) to
-// top-level widgets -- so we do the same here.  Not sending them directly
-// to child widgets also avoids "win is null" assertions on debug builds
-// (see bug 354768 comments 55 and 58).
-//
 // For use with clients that (like Firefox) do use top-level widgets (and
 // have NSWindow delegates of class WindowDelegate).
 + (void)activateInWindow:(NSWindow*)aWindow
@@ -264,16 +207,6 @@
     return;
   [delegate sendToplevelActivateEvents];
 
-  id firstResponder = [aWindow firstResponder];
-  if ([firstResponder isKindOfClass:[ChildView class]]) {
-    BOOL isMozWindow = [aWindow respondsToSelector:@selector(setSuppressMakeKeyFront:)];
-    if (isMozWindow)
-      [aWindow setSuppressMakeKeyFront:YES];
-    [firstResponder sendFocusEvent:NS_GOTFOCUS];
-    if (isMozWindow)
-      [aWindow setSuppressMakeKeyFront:NO];
-  }
-
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
@@ -281,19 +214,7 @@
 //
 // If we're using top-level widgets (nsCocoaWindow objects), we send them
 // NS_DEACTIVATE events (which propagate to child widgets (nsChildView
-// objects) via nsWebShellWindow::HandleEvent()).  Sending NS_LOSTFOCUS
-// events to top-level widgets currently has no effect (nsWebShellWindow::
-// HandleEvent(), which processes focus events sent to top-level widgets,
-// doesn't have a section for NS_LOSTFOCUS).  But on general principles we
-// send them anyway.
-//
-// On other platforms (e.g. Windows and GTK2), NS_DEACTIVATE events are only
-// sent (directly) to top-level widgets.  And (as noted above) these events
-// propagate to child widgets when they're sent to top-level widgets.  But if
-// we don't send them again, blinking I-bar cursors can appear in multiple
-// text input fields.  Since we also need to send NS_LOSTFOCUS events and
-// call nsTSMManager::CommitIME(), we just always call through to ChildView
-// viewsWindowDidResignKey (whether or not we're using top-level widgets).
+// objects) via nsWebShellWindow::HandleEvent()).
 //
 // For use with clients that (like Firefox) do use top-level widgets (and
 // have NSWindow delegates of class WindowDelegate).
@@ -344,9 +265,9 @@
 
 // We make certain exceptions for top-level windows in non-embedders (see
 // comment above windowBecameMain below).  And we need (elsewhere) to guard
-// against sending duplicate events.  But in general NS_ACTIVATE and
-// NS_GOTFOCUS events should be sent when a native window becomes key, and
-// NS_LOSTFOCUS and NS_DEACTIVATE events should be sent when it resignes key.
+// against sending duplicate events.  But in general the NS_ACTIVATE event
+// should be sent when a native window becomes key, and the NS_DEACTIVATE
+// event should be sent when it resignes key.
 - (void)windowBecameKey:(NSNotification*)inNotification
 {
   NSWindow* window = (NSWindow*)[inNotification object];
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 068ab7f984e2..3d2a39f93a09 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -381,7 +381,6 @@ nsWindow::nsWindow()
     mIsVisible           = PR_FALSE;
     mRetryPointerGrab    = PR_FALSE;
     mRetryKeyboardGrab   = PR_FALSE;
-    mActivatePending     = PR_FALSE;
     mTransientParent     = nsnull;
     mWindowType          = eWindowType_child;
     mSizeState           = nsSizeMode_Normal;
@@ -509,23 +508,6 @@ nsWindow::InitKeyEvent(nsKeyEvent &aEvent, GdkEventKey *aGdkEvent)
     aEvent.time      = aGdkEvent->time;
 }
 
-void
-nsWindow::DispatchGotFocusEvent(void)
-{
-    nsGUIEvent event(PR_TRUE, NS_GOTFOCUS, this);
-    nsEventStatus status;
-    DispatchEvent(&event, status);
-}
-
-void
-nsWindow::DispatchLostFocusEvent(void)
-{
-    nsGUIEvent event(PR_TRUE, NS_LOSTFOCUS, this);
-    nsEventStatus status;
-    DispatchEvent(&event, status);
-}
-
-
 void
 nsWindow::DispatchResizeEvent(nsIntRect &aRect, nsEventStatus &aStatus)
 {
@@ -544,6 +526,9 @@ nsWindow::DispatchResizeEvent(nsIntRect &aRect, nsEventStatus &aStatus)
 void
 nsWindow::DispatchActivateEvent(void)
 {
+    if (!mIsTopLevel)
+        return;
+
 #ifdef ACCESSIBILITY
     DispatchActivateEventAccessible();
 #endif //ACCESSIBILITY
@@ -555,6 +540,9 @@ nsWindow::DispatchActivateEvent(void)
 void
 nsWindow::DispatchDeactivateEvent(void)
 {
+    if (!mIsTopLevel)
+        return;
+
     nsGUIEvent event(PR_TRUE, NS_DEACTIVATE, this);
     nsEventStatus status;
     DispatchEvent(&event, status);
@@ -1404,14 +1392,8 @@ nsWindow::SetFocus(PRBool aRaise)
         gtk_widget_grab_focus(owningWidget);
         owningWindow->mContainerBlockFocus = PR_FALSE;
 
-        DispatchGotFocusEvent();
-
-        // unset the activate flag
-        if (owningWindow->mActivatePending) {
-            owningWindow->mActivatePending = PR_FALSE;
-            DispatchActivateEvent();
-        }
-
+        gFocusWindow = this;
+        DispatchActivateEvent();
         return NS_OK;
     }
 
@@ -1421,23 +1403,19 @@ nsWindow::SetFocus(PRBool aRaise)
         return NS_OK;
     }
 
-    // If there is already a focused child window, dispatch a LOSTFOCUS
-    // event from that widget and unset its got focus flag.
-    if (gFocusWindow) {
-        nsRefPtr<nsWindow> kungFuDeathGrip = gFocusWindow;
 #ifdef USE_XIM
+    if (gFocusWindow) {
         // If the focus window and this window share the same input
         // context we don't have to change the focus of the IME
         // context
+        nsRefPtr<nsWindow> kungFuDeathGrip = gFocusWindow;
         if (IM_get_input_context(this) !=
             IM_get_input_context(gFocusWindow))
             gFocusWindow->IMELoseFocus();
-#endif
-        gFocusWindow->LoseFocus();
     }
+#endif
 
-    // Set this window to be the focused child window, update our has
-    // focus flag and dispatch a GOTFOCUS event.
+    // Set this window to be the focused child window
     gFocusWindow = this;
 
 #ifdef USE_XIM
@@ -1447,13 +1425,7 @@ nsWindow::SetFocus(PRBool aRaise)
     LOGFOCUS(("  widget now has focus - dispatching events [%p]\n",
               (void *)this));
 
-    DispatchGotFocusEvent();
-
-    // unset the activate flag
-    if (owningWindow->mActivatePending) {
-        owningWindow->mActivatePending = PR_FALSE;
-        DispatchActivateEvent();
-    }
+    DispatchActivateEvent();
 
     LOGFOCUS(("  done dispatching events in SetFocus() [%p]\n",
               (void *)this));
@@ -2069,19 +2041,6 @@ nsWindow::HasPendingInputEvent()
     return haveEvent;
 }
 
-void
-nsWindow::LoseFocus(void)
-{
-    // make sure that we reset our key down counter so the next keypress
-    // for this widget will get the down event
-    memset(mKeyDownFlags, 0, sizeof(mKeyDownFlags));
-
-    // Dispatch a lostfocus event
-    DispatchLostFocusEvent();
-
-    LOGFOCUS(("  widget lost focus [%p]\n", (void *)this));
-}
-
 #if 0
 #ifdef DEBUG
 // Paint flashing code (disabled for cairo - see below)
@@ -2788,7 +2747,7 @@ nsWindow::OnButtonPressEvent(GtkWidget *aWidget, GdkEventButton *aEvent)
     // check to see if we should rollup
     nsWindow *containerWindow = GetContainerWindow();
     if (!gFocusWindow && containerWindow) {
-        containerWindow->mActivatePending = PR_FALSE;
+        gFocusWindow = this;
         DispatchActivateEvent();
     }
 
@@ -2907,9 +2866,8 @@ nsWindow::OnContainerFocusInEvent(GtkWidget *aWidget, GdkEventFocus *aEvent)
         return;
     }
 
-    if (mIsTopLevel) {
-        mActivatePending = PR_TRUE;
 #if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_ENABLE_GCONF)
+    if (mIsTopLevel) {
         // For mobile/maemo, it is desired to disable the word completion widget
         // at the bottom of the screen for some reasons: it interacts badly with
         // keyboard events sometimes and disabling it will give more screen space
@@ -2932,24 +2890,17 @@ nsWindow::OnContainerFocusInEvent(GtkWidget *aWidget, GdkEventFocus *aEvent)
                                           PR_FALSE, nsnull);
                 g_object_unref(gConfClient);
             }
-#endif
     }
+#endif
+
     // Unset the urgency hint, if possible
     GtkWidget* top_window = nsnull;
     GetToplevelWidget(&top_window);
     if (top_window && (GTK_WIDGET_VISIBLE(top_window)))
         SetUrgencyHint(top_window, PR_FALSE);
 
-    // dispatch a got focus event
-    DispatchGotFocusEvent();
-
-    // send the activate event if it wasn't already sent via any
-    // SetFocus() calls that were the result of the GOTFOCUS event
-    // above.
-    if (mActivatePending) {
-        mActivatePending = PR_FALSE;
-        DispatchActivateEvent();
-    }
+    gFocusWindow = this;
+    DispatchActivateEvent();
 
     LOGFOCUS(("Events sent from focus in event [%p]\n", (void *)this));
 }
@@ -2968,7 +2919,7 @@ nsWindow::OnContainerFocusOutEvent(GtkWidget *aWidget, GdkEventFocus *aEvent)
 #endif /* MOZ_X11 */
 
     // Figure out if the focus widget is the child of this window.  If
-    // it is, send a focus out and deactivate event for it.
+    // it is, send a deactivate event for it.
     if (!gFocusWindow)
         return;
 
@@ -3010,17 +2961,13 @@ nsWindow::OnContainerFocusOutEvent(GtkWidget *aWidget, GdkEventFocus *aEvent)
     gFocusWindow->IMELoseFocus();
 #endif
 
-    gFocusWindow->LoseFocus();
-
     // We only dispatch a deactivate event if we are a toplevel
     // window, otherwise the embedding code takes care of it.
-    if (mIsTopLevel && NS_LIKELY(!gFocusWindow->mIsDestroyed))
-        gFocusWindow->DispatchDeactivateEvent();
+    if (NS_LIKELY(!gFocusWindow->mIsDestroyed))
+        DispatchDeactivateEvent();
 
     gFocusWindow = nsnull;
 
-    mActivatePending = PR_FALSE;
-
     LOGFOCUS(("Done with container focus out [%p]\n", (void *)this));
 }
 
diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h
index 2d5a69118774..80ccc384ce81 100644
--- a/widget/src/gtk2/nsWindow.h
+++ b/widget/src/gtk2/nsWindow.h
@@ -117,8 +117,6 @@ public:
     // event handling code
     void InitKeyEvent(nsKeyEvent &aEvent, GdkEventKey *aGdkEvent);
 
-    void DispatchGotFocusEvent(void);
-    void DispatchLostFocusEvent(void);
     void DispatchActivateEvent(void);
     void DispatchDeactivateEvent(void);
     void DispatchResizeEvent(nsIntRect &aRect, nsEventStatus &aStatus);
@@ -210,8 +208,7 @@ public:
     NS_IMETHOD         MakeFullScreen(PRBool aFullScreen);
     NS_IMETHOD         HideWindowChrome(PRBool aShouldHide);
 
-    // utility methods
-    void               LoseFocus();
+    // utility method
     gint               ConvertBorderStyles(nsBorderStyle aStyle);
 
     // event callbacks
@@ -478,7 +475,6 @@ private:
                         mContainerBlockFocus : 1,
                         mIsVisible : 1,
                         mRetryPointerGrab : 1,
-                        mActivatePending : 1,
                         mRetryKeyboardGrab : 1;
     GtkWindow          *mTransientParent;
     PRInt32             mSizeState;
diff --git a/widget/src/os2/nsFrameWindow.cpp b/widget/src/os2/nsFrameWindow.cpp
index ad4323a0446d..5dbee4173d8b 100644
--- a/widget/src/os2/nsFrameWindow.cpp
+++ b/widget/src/os2/nsFrameWindow.cpp
@@ -468,14 +468,6 @@ MRESULT nsFrameWindow::FrameMessage( ULONG msg, MPARAM mp1, MPARAM mp2)
             }
          }
          break;
-
-      case WM_ACTIVATE:
-        DEBUGFOCUS(frame WM_ACTIVATE);
-        if (SHORT1FROMMP(mp1) &&
-            !(WinQueryWindowULong(mFrameWnd, QWL_STYLE) & WS_MINIMIZED)) {
-           bDone = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
-        }
-        break;
    }
 
    if( !bDone)
diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index b39da48d8982..c9c712a58561 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -1254,7 +1254,7 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode)
     DEBUGFOCUS(deferred NS_ACTIVATE);
     gJustGotActivate = PR_FALSE;
     gJustGotDeactivate = PR_FALSE;
-    DispatchFocus(NS_ACTIVATE, TRUE);
+    DispatchFocus(NS_ACTIVATE);
   }
 
   // nothing to do in these cases
@@ -2686,7 +2686,6 @@ PRBool nsWindow::ProcessMessage( ULONG msg, MPARAM mp1, MPARAM mp2, MRESULT &rc)
 
         case WM_FOCUSCHANGED:
         {
-          PRBool isMozWindowTakingFocus = PR_TRUE;
           DEBUGFOCUS(WM_FOCUSCHANGED);
 
           // If the frame was activated earlier or mp1 is 0, dispatch
@@ -2696,42 +2695,29 @@ PRBool nsWindow::ProcessMessage( ULONG msg, MPARAM mp1, MPARAM mp2, MRESULT &rc)
           // restore it involuntarily.  
 
           if (SHORT1FROMMP(mp2)) {
-            DEBUGFOCUS(NS_GOTFOCUS);
-            result = DispatchFocus(NS_GOTFOCUS, isMozWindowTakingFocus);
-
             if (gJustGotActivate || mp1 == 0) {
               HWND hActive = WinQueryActiveWindow( HWND_DESKTOP);
               if (!(WinQueryWindowULong( hActive, QWL_STYLE) & WS_MINIMIZED)) {
                 DEBUGFOCUS(NS_ACTIVATE);
                 gJustGotActivate = PR_FALSE;
                 gJustGotDeactivate = PR_FALSE;
-                result = DispatchFocus(NS_ACTIVATE, isMozWindowTakingFocus);
+                result = DispatchFocus(NS_ACTIVATE);
               }
             }
 
             if ( WinIsChild( mWnd, HWNDFROMMP(mp1)) && mNextID == 1) {
               DEBUGFOCUS(NS_PLUGIN_ACTIVATE);
-              result = DispatchFocus(NS_PLUGIN_ACTIVATE, isMozWindowTakingFocus);
+              result = DispatchFocus(NS_PLUGIN_ACTIVATE);
               WinSetFocus(HWND_DESKTOP, mWnd);
             }
           }
           // We are losing focus
           else {
-            char className[19];
-            ::WinQueryClassName((HWND)mp1, 19, className);
-            if (strcmp(className, WindowClass()) != 0 && 
-                strcmp(className, WC_SCROLLBAR_STRING) != 0) {
-              isMozWindowTakingFocus = PR_FALSE;
-            }
-
             if (gJustGotDeactivate) {
               DEBUGFOCUS(NS_DEACTIVATE);
               gJustGotDeactivate = PR_FALSE;
-              result = DispatchFocus(NS_DEACTIVATE, isMozWindowTakingFocus);
+              result = DispatchFocus(NS_DEACTIVATE);
             }
-
-            DEBUGFOCUS(NS_LOSTFOCUS);
-            result = DispatchFocus(NS_LOSTFOCUS, isMozWindowTakingFocus);
           }
 
           break;
@@ -3183,27 +3169,25 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, MPARAM mp1, MPARAM mp2,
 // Deal with focus messages
 //
 //-------------------------------------------------------------------------
-PRBool nsWindow::DispatchFocus(PRUint32 aEventType, PRBool isMozWindowTakingFocus)
+PRBool nsWindow::DispatchFocus(PRUint32 aEventType)
 {
   // call the event callback 
   if (mEventCallback) {
-    nsFocusEvent event(PR_TRUE, aEventType, this);
+    nsGUIEvent event(PR_TRUE, aEventType, this);
     InitEvent(event);
 
     //focus and blur event should go to their base widget loc, not current mouse pos
     event.refPoint.x = 0;
     event.refPoint.y = 0;
 
-    event.isMozWindowTakingFocus = isMozWindowTakingFocus;
-
     nsPluginEvent pluginEvent;
 
     switch (aEventType)
     {
-      case NS_GOTFOCUS:
+      case NS_ACTIVATE:
         pluginEvent.event = WM_SETFOCUS;
         break;
-      case NS_LOSTFOCUS:
+      case NS_DEACTIVATE:
         pluginEvent.event = WM_FOCUSCHANGED;
         break;
       case NS_PLUGIN_ACTIVATE:
diff --git a/widget/src/os2/nsWindow.h b/widget/src/os2/nsWindow.h
index 7ed8120b949e..153cf3188f97 100644
--- a/widget/src/os2/nsWindow.h
+++ b/widget/src/os2/nsWindow.h
@@ -226,7 +226,7 @@ protected:
    virtual PRBool OnResize( PRInt32 aX, PRInt32 aY);
    virtual PRBool OnMove( PRInt32 aX, PRInt32 aY);
    virtual PRBool OnKey( MPARAM mp1, MPARAM mp2);
-   virtual PRBool DispatchFocus( PRUint32 aEventType, PRBool isMozWindowTakingFocus);
+   virtual PRBool DispatchFocus( PRUint32 aEventType);
    virtual PRBool OnScroll( ULONG msgid, MPARAM mp1, MPARAM mp2);
    virtual PRBool OnVScroll( MPARAM mp1, MPARAM mp2);
    virtual PRBool OnHScroll( MPARAM mp1, MPARAM mp2);
diff --git a/widget/src/photon/nsWidget.cpp b/widget/src/photon/nsWidget.cpp
index 80225860a0bd..a9e37ca87704 100644
--- a/widget/src/photon/nsWidget.cpp
+++ b/widget/src/photon/nsWidget.cpp
@@ -1158,15 +1158,11 @@ int nsWidget::GotFocusCallback( PtWidget_t *widget, void *data, PtCallbackInfo_t
 			}
 		}
 
-	pWidget->DispatchStandardEvent(NS_GOTFOCUS);
-
   return Pt_CONTINUE;
 }
 
 int nsWidget::LostFocusCallback( PtWidget_t *widget, void *data, PtCallbackInfo_t *cbinfo ) 
 {
-  nsWidget *pWidget = (nsWidget *) data;
- 	pWidget->DispatchStandardEvent(NS_LOSTFOCUS);
   return Pt_CONTINUE;
 }
 
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index f0e0e0560870..c82619824842 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -566,17 +566,6 @@ nsWindow::SetFocus(PRBool aRaise)
         mDrawingArea->raise();
     mDrawingArea->setFocus();
 
-    // If there is already a focused child window, dispatch a LOSTFOCUS
-    // event from that widget and unset its got focus flag.
-
-    LOGFOCUS(("  widget now has focus - dispatching events [%p]\n",
-              (void *)this));
-
-    DispatchGotFocusEvent();
-
-    LOGFOCUS(("  done dispatching events in SetFocus() [%p]\n",
-              (void *)this));
-
     return NS_OK;
 }
 
@@ -1006,19 +995,6 @@ nsWindow::GetAttention(PRInt32 aCycleCount)
     return NS_OK;
 }
 
-void
-nsWindow::LoseFocus(void)
-{
-    // make sure that we reset our key down counter so the next keypress
-    // for this widget will get the down event
-    memset(mKeyDownFlags, 0, sizeof(mKeyDownFlags));
-
-    // Dispatch a lostfocus event
-    DispatchLostFocusEvent();
-
-    LOGFOCUS(("  widget lost focus [%p]\n", (void *)this));
-}
-
 static int gDoubleBuffering = -1;
 
 nsEventStatus
@@ -1368,12 +1344,6 @@ nsWindow::OnFocusInEvent(QFocusEvent *aEvent)
     // Unset the urgency hint, if possible
 //    SetUrgencyHint(top_window, PR_FALSE);
 
-    // dispatch a got focus event
-    DispatchGotFocusEvent();
-
-    // send the activate event if it wasn't already sent via any
-    // SetFocus() calls that were the result of the GOTFOCUS event
-    // above.
     DispatchActivateEvent();
 
     LOGFOCUS(("Events sent from focus in event [%p]\n", (void *)this));
@@ -1385,7 +1355,6 @@ nsWindow::OnFocusOutEvent(QFocusEvent *aEvent)
 {
     LOGFOCUS(("OnFocusOutEvent [%p]\n", (void *)this));
 
-    DispatchLostFocusEvent();
     if (mDrawingArea)
         DispatchDeactivateEvent();
 
@@ -2318,22 +2287,6 @@ nsWindow::GetParent(void)
     return mParent;
 }
 
-void
-nsWindow::DispatchGotFocusEvent(void)
-{
-    nsGUIEvent event(PR_TRUE, NS_GOTFOCUS, this);
-    nsEventStatus status;
-    DispatchEvent(&event, status);
-}
-
-void
-nsWindow::DispatchLostFocusEvent(void)
-{
-    nsGUIEvent event(PR_TRUE, NS_LOSTFOCUS, this);
-    nsEventStatus status;
-    DispatchEvent(&event, status);
-}
-
 void
 nsWindow::DispatchActivateEvent(void)
 {
diff --git a/widget/src/qt/nsWindow.h b/widget/src/qt/nsWindow.h
index e31d195192ba..562f117bfcd9 100644
--- a/widget/src/qt/nsWindow.h
+++ b/widget/src/qt/nsWindow.h
@@ -205,7 +205,6 @@ public:
     // utility methods
     //
 
-    void               LoseFocus();
     qint32             ConvertBorderStyles(nsBorderStyle aStyle);
 
     void               QWidgetDestroyed();
@@ -215,8 +214,6 @@ public:
 
     // event handling code
 
-    void DispatchGotFocusEvent(void);
-    void DispatchLostFocusEvent(void);
     void DispatchActivateEvent(void);
     void DispatchDeactivateEvent(void);
     void DispatchResizeEvent(nsIntRect &aRect, nsEventStatus &aStatus);
diff --git a/widget/src/windows/nsDataObjCollection.cpp b/widget/src/windows/nsDataObjCollection.cpp
index b6f50a14a00e..6ae7ee204281 100644
--- a/widget/src/windows/nsDataObjCollection.cpp
+++ b/widget/src/windows/nsDataObjCollection.cpp
@@ -215,26 +215,12 @@ STDMETHODIMP nsDataObjCollection::EnumFormatEtc(DWORD dwDir, LPENUMFORMATETC *pp
 {
   PRNTDEBUG("nsDataObjCollection::EnumFormatEtc\n");
 
-  switch (dwDir) {
-    case DATADIR_GET:
-      m_enumFE->Clone(ppEnum);
-      break;
-    case DATADIR_SET:
-      // fall through
-    default:
-      *ppEnum = NULL;
-  } // switch
-
-  // Since a new one has been created, 
-  // we will ref count the new clone here 
-  // before giving it back
-  if (NULL == *ppEnum)
-    return ResultFromScode(E_FAIL);
-  else
-    (*ppEnum)->AddRef();
-
-  return NOERROR;
+  if (dwDir == DATADIR_GET) {
+    // Clone addref's the new enumerator.
+    return m_enumFE->Clone(ppEnum);
+  }
 
+  return E_NOTIMPL;
 }
 
 //-----------------------------------------------------
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 508614a3a773..4b8b3ef3956f 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -959,8 +959,7 @@ NS_IMETHODIMP nsWindow::DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus
   aStatus = nsEventStatus_eIgnore;
 
   // skip processing of suppressed blur events
-  if ((event->message == NS_DEACTIVATE || event->message == NS_LOSTFOCUS) &&
-      BlurEventsSuppressed())
+  if (event->message == NS_DEACTIVATE && BlurEventsSuppressed())
     return NS_OK;
 
   if (nsnull != mEventCallback) {
@@ -4113,7 +4112,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
   PRBool result = PR_FALSE;                 // call the default nsWindow proc
   static PRBool getWheelInfo = PR_TRUE;
   *aRetValue = 0;
-  PRBool isMozWindowTakingFocus = PR_TRUE;
   nsPaletteInfo palInfo;
 
   // Uncomment this to see all windows messages
@@ -4597,6 +4595,12 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       break;
 
     case WM_ACTIVATE:
+      // The WM_ACTIVATE event is fired when a window is raised or lowered,
+      // and the loword of wParam specifies which. But we don't want to tell
+      // the focus system about this until the WM_SETFOCUS or WM_KILLFOCUS
+      // events are fired. Instead, set either the gJustGotActivate or
+      // gJustGotDeativate flags and fire the NS_ACTIVATE or NS_DEACTIVATE
+      // events once the focus events arrive.
       if (mEventCallback) {
         PRInt32 fActive = LOWORD(wParam);
 
@@ -4606,7 +4610,14 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 #endif
 
         if (WA_INACTIVE == fActive) {
-          gJustGotDeactivate = PR_TRUE;
+          // when minimizing a window, the deactivation and focus events will
+          // be fired in the reverse order. Instead, just dispatch
+          // NS_DEACTIVATE right away.
+          if (HIWORD(wParam))
+            result = DispatchFocusToTopLevelWindow(NS_DEACTIVATE);
+          else
+            gJustGotDeactivate = PR_TRUE;
+
 #ifndef WINCE
           if (mIsTopWidgetWindow)
             mLastKeyboardLayout = gKbdLayout.GetLayout();
@@ -4668,12 +4679,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 #endif
 
     case WM_SETFOCUS:
-      result = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
-      if (gJustGotActivate) {
-        gJustGotActivate = PR_FALSE;
-        gJustGotDeactivate = PR_FALSE;
-        result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
-      }
+      if (gJustGotActivate)
+        result = DispatchFocusToTopLevelWindow(NS_ACTIVATE);
 
 #ifdef ACCESSIBILITY
       if (nsWindow::gIsAccessibilityOn) {
@@ -4702,20 +4709,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
         ImmSetOpenStatus(IMEContext.get(), FALSE);
       }
 #endif
-      WCHAR className[kMaxClassNameLength];
-      ::GetClassNameW((HWND)wParam, className, kMaxClassNameLength);
-      if (wcscmp(className, kClassNameUI) &&
-          wcscmp(className, kClassNameContent) &&
-          wcscmp(className, kClassNameContentFrame) &&
-          wcscmp(className, kClassNameDialog) &&
-          wcscmp(className, kClassNameGeneral)) {
-        isMozWindowTakingFocus = PR_FALSE;
-      }
-      if (gJustGotDeactivate) {
-        gJustGotDeactivate = PR_FALSE;
-        result = DispatchFocus(NS_DEACTIVATE, isMozWindowTakingFocus);
-      }
-      result = DispatchFocus(NS_LOSTFOCUS, isMozWindowTakingFocus);
+      if (gJustGotDeactivate)
+        result = DispatchFocusToTopLevelWindow(NS_DEACTIVATE);
       
       break;
 
@@ -4819,30 +4814,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
         InitEvent(event);
 
         result = DispatchWindowEvent(&event);
-
-#ifndef WINCE
-        if (pl.showCmd == SW_SHOWMINIMIZED) {
-          // Deactivate
-          WCHAR className[kMaxClassNameLength];
-          ::GetClassNameW((HWND)wParam, className, kMaxClassNameLength);
-          if (wcscmp(className, kClassNameUI) &&
-              wcscmp(className, kClassNameContent) &&
-              wcscmp(className, kClassNameContentFrame) &&
-              wcscmp(className, kClassNameDialog) &&
-              wcscmp(className, kClassNameGeneral)) {
-            isMozWindowTakingFocus = PR_FALSE;
-          }
-          gJustGotDeactivate = PR_FALSE;
-          result = DispatchFocus(NS_DEACTIVATE, isMozWindowTakingFocus);
-        } else if (pl.showCmd == SW_SHOWNORMAL && !(wp->flags & SWP_NOACTIVATE)){
-          // Make sure we're active
-          result = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
-          result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
-        }
-#else
-        result = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
-        result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
-#endif
       }
     }
     break;
@@ -6632,27 +6603,45 @@ PRBool nsWindow::DispatchAccessibleEvent(PRUint32 aEventType, nsIAccessible** aA
 // Deal with focus messages
 //
 //-------------------------------------------------------------------------
-PRBool nsWindow::DispatchFocus(PRUint32 aEventType, PRBool isMozWindowTakingFocus)
+PRBool nsWindow::DispatchFocusToTopLevelWindow(PRUint32 aEventType)
+{
+  if (aEventType == NS_ACTIVATE)
+    gJustGotActivate = PR_FALSE;
+  gJustGotDeactivate = PR_FALSE;
+
+  // clear the flags, and retrieve the toplevel window. This way, it doesn't
+  // mattter what child widget received the focus event and it will always be
+  // fired at the toplevel window.
+  HWND toplevelWnd = GetTopLevelHWND(mWnd);
+  if (toplevelWnd) {
+    nsWindow *win = GetNSWindowPtr(toplevelWnd);
+    if (win)
+      return win->DispatchFocus(aEventType);
+  }
+
+  return PR_FALSE;
+}
+
+
+PRBool nsWindow::DispatchFocus(PRUint32 aEventType)
 {
   // call the event callback
   if (mEventCallback) {
-    nsFocusEvent event(PR_TRUE, aEventType, this);
+    nsGUIEvent event(PR_TRUE, aEventType, this);
     InitEvent(event);
 
     //focus and blur event should go to their base widget loc, not current mouse pos
     event.refPoint.x = 0;
     event.refPoint.y = 0;
 
-    event.isMozWindowTakingFocus = isMozWindowTakingFocus;
-
     nsPluginEvent pluginEvent;
 
     switch (aEventType)//~~~
     {
-      case NS_GOTFOCUS:
+      case NS_ACTIVATE:
         pluginEvent.event = WM_SETFOCUS;
         break;
-      case NS_LOSTFOCUS:
+      case NS_DEACTIVATE:
         pluginEvent.event = WM_KILLFOCUS;
         break;
       case NS_PLUGIN_ACTIVATE:
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 818116e1974b..c13f8389ce83 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -369,7 +369,9 @@ protected:
 
   PRBool                  DispatchPluginEvent(const MSG &aMsg);
 
-  virtual PRBool          DispatchFocus(PRUint32 aEventType, PRBool isMozWindowTakingFocus);
+  PRBool DispatchFocusToTopLevelWindow(PRUint32 aEventType);
+  PRBool DispatchFocus(PRUint32 aEventType);
+
   virtual PRBool          OnScroll(UINT scrollCode, int cPos);
   virtual HBRUSH          OnControlColor();
 
diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp
index b160f61d9283..cadb8b7b2cc6 100644
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -949,13 +949,11 @@ case _value: eventName.AssignWithConversion(_name) ; break
     _ASSIGN_eventName(NS_FORM_INPUT,"NS_FORM_INPUT");
     _ASSIGN_eventName(NS_FORM_RESET,"NS_FORM_RESET");
     _ASSIGN_eventName(NS_FORM_SUBMIT,"NS_FORM_SUBMIT");
-    _ASSIGN_eventName(NS_GOTFOCUS,"NS_GOTFOCUS");
     _ASSIGN_eventName(NS_IMAGE_ABORT,"NS_IMAGE_ABORT");
     _ASSIGN_eventName(NS_LOAD_ERROR,"NS_LOAD_ERROR");
     _ASSIGN_eventName(NS_KEY_DOWN,"NS_KEY_DOWN");
     _ASSIGN_eventName(NS_KEY_PRESS,"NS_KEY_PRESS");
     _ASSIGN_eventName(NS_KEY_UP,"NS_KEY_UP");
-    _ASSIGN_eventName(NS_LOSTFOCUS,"NS_LOSTFOCUS");
     _ASSIGN_eventName(NS_MENU_SELECTED,"NS_MENU_SELECTED");
     _ASSIGN_eventName(NS_MOUSE_ENTER,"NS_MOUSE_ENTER");
     _ASSIGN_eventName(NS_MOUSE_EXIT,"NS_MOUSE_EXIT");
diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html
index c4a74bbbacb0..d2986463165f 100644
--- a/widget/tests/test_imestate.html
+++ b/widget/tests/test_imestate.html
@@ -63,6 +63,8 @@
 
 <script class="testbody" type="application/javascript">
 
+SimpleTest.waitForExplicitFinish();
+
 var gUtils = window.
       QueryInterface(Components.interfaces.nsIInterfaceRequestor).
       getInterface(Components.interfaces.nsIDOMWindowUtils);
@@ -81,8 +83,6 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
   var defaultEnabledState =
         aIsEditable ? gUtils.IME_STATUS_ENABLED : gUtils.IME_STATUS_DISABLED;
 
-  // XXX Between designMode and contentEditable, the result is different.
-  // Is this expected difference?
   var nonFormControlNodeEnabledState =
         aInDesignMode ? gUtils.IME_STATUS_ENABLED : gUtils.IME_STATUS_DISABLED;
 
@@ -93,7 +93,7 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
       if (aTest.expectedEnabled == gUtils.IME_STATUS_DISABLED) {
         document.getElementById("text").focus();
       } else {
-        gUtils.focus(null);
+        document.activeElement.blur();
       }
       document.getElementById(aTest.id).focus();
     }
@@ -114,7 +114,10 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
     if (kIMEEnabledSupported) {
       moveFocus(aTest);
       enabled = gUtils.IMEStatus;
-      is(enabled, aTest.expectedEnabled,
+      // no focusing of html elements is possible in design mode so ime should
+      // always be enabled for the document
+      var expected = aInDesignMode ? gUtils.IME_STATUS_ENABLED : aTest.expectedEnabled;
+      is(enabled, expected,
          aDescription + ": " + aTest.description + ", wrong enabled state");
     }
 
@@ -129,7 +132,7 @@ function runBasicTest(aIsEditable, aInDesignMode, aDescription)
   }
 
   if (kIMEEnabledSupported) {
-    gUtils.focus(null);
+    document.activeElement.blur();
     is(gUtils.IMEStatus, nonFormControlNodeEnabledState,
        aDescription + ": unexpected enabled state when no element has focus");
   }
@@ -436,8 +439,6 @@ function runTests()
   if (!kIMEEnabledSupported && !kIMEOpenSupported)
     return;
 
-  SimpleTest.waitForExplicitFinish();
-
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
   // test for normal contents.
@@ -461,6 +462,7 @@ function runTests()
   document.designMode = "on";
   runBasicTest(true, true, "Testing designMode=\"on\"");
   document.designMode = "off";
+  document.getElementById("text").focus();
   runBasicTest(false, false, "Testing designMode=\"off\"");
 
   // changing input[type] values
diff --git a/xpcom/analysis/stack.js b/xpcom/analysis/stack.js
index bb4f5ebd62f7..90df3fe0e45c 100644
--- a/xpcom/analysis/stack.js
+++ b/xpcom/analysis/stack.js
@@ -152,8 +152,11 @@ function process_cp_pre_genericize(fndecl)
 
           let i;
           for (i in xrange(stack.length - 1, -1, -1)) {
-            if (TREE_CODE(stack[i]) != NOP_EXPR)
-              break;
+            if (TREE_CODE(stack[i]) == NOP_EXPR ||
+                TREE_CODE(stack[i]) == COMPOUND_EXPR)
+              continue;
+            
+            break;
           }
           let assign = stack[i];
           switch (TREE_CODE(assign)) {
diff --git a/xpcom/io/nsLocalFileOSX.h b/xpcom/io/nsLocalFileOSX.h
index d99803031379..7857ebb3b087 100644
--- a/xpcom/io/nsLocalFileOSX.h
+++ b/xpcom/io/nsLocalFileOSX.h
@@ -96,25 +96,22 @@ private:
 protected:
   nsLocalFile(const nsLocalFile& src);
 
-  nsresult SetBaseRef(CFURLRef aCFURLRef); // Does CFRetain on aCFURLRef
-  nsresult UpdateTargetRef();
+  nsresult SetBaseURL(CFURLRef aCFURLRef); // retains aCFURLRef
 
   nsresult GetFSRefInternal(FSRef& aFSRef);
   nsresult GetPathInternal(nsACString& path); // Returns path WRT mFollowLinks
   nsresult EqualsInternal(nsISupports* inFile, PRBool *_retval);
-
   nsresult CopyInternal(nsIFile* newParentDir,
                         const nsAString& newName,
                         PRBool followLinks);
+  nsresult FillStatBufferInternal(struct STAT *statBuffer);
 
   static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
 
 protected:
-  CFURLRef mBaseURL;   // The FS object we represent
-  CFURLRef mTargetURL; // If mBaseURL is an alias/symlink, its target
+  CFURLRef mBaseURL; // The FS object we represent
 
   PRPackedBool mFollowLinks;
-  PRPackedBool mFollowLinksDirty;
 };
 
 #endif // nsLocalFileMac_h_
diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
index d0f0c73f4c5c..91e7a1f69175 100644
--- a/xpcom/io/nsLocalFileOSX.mm
+++ b/xpcom/io/nsLocalFileOSX.mm
@@ -290,25 +290,19 @@ const char kPathSepChar = '/';
 
 nsLocalFile::nsLocalFile() :
   mBaseURL(nsnull),
-  mTargetURL(nsnull),
-  mFollowLinks(PR_TRUE),
-  mFollowLinksDirty(PR_TRUE)
+  mFollowLinks(PR_TRUE)
 {
 }
 
 nsLocalFile::nsLocalFile(const nsLocalFile& src) :
   mBaseURL(src.mBaseURL),
-  mTargetURL(src.mTargetURL),
-  mFollowLinks(src.mFollowLinks),
-  mFollowLinksDirty(src.mFollowLinksDirty)
+  mFollowLinks(src.mFollowLinks)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  // A CFURLRef is immutable so no need to copy, just retain.
+  // CFURL objects are immutable so no need to copy, just retain.
   if (mBaseURL)
     ::CFRetain(mBaseURL);
-  if (mTargetURL)
-    ::CFRetain(mTargetURL);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -319,8 +313,6 @@ nsLocalFile::~nsLocalFile()
 
   if (mBaseURL)
     ::CFRelease(mBaseURL);
-  if (mTargetURL)
-    ::CFRelease(mTargetURL);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -381,7 +373,7 @@ NS_IMETHODIMP nsLocalFile::AppendNative(const nsACString& aNode)
                                   mBaseURL, nodeStrRef, PR_FALSE);
     ::CFRelease(nodeStrRef);
     if (newRef) {
-      SetBaseRef(newRef);
+      SetBaseURL(newRef);
       ::CFRelease(newRef);
       return NS_OK;
     }
@@ -395,23 +387,16 @@ NS_IMETHODIMP nsLocalFile::Normalize()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   // CFURL doesn't doesn't seem to resolve paths containing relative
   // components, so we'll nick the stdlib code from nsLocalFileUnix
   UInt8 path[PATH_MAX] = "";
-  Boolean success;
-  success = ::CFURLGetFileSystemRepresentation(mBaseURL, true, path, PATH_MAX);
-  if (!success)
+  if (!::CFURLGetFileSystemRepresentation(mBaseURL, true, path, PATH_MAX))
     return NS_ERROR_FAILURE;
 
   char resolved_path[PATH_MAX] = "";
-  char *resolved_path_ptr = nsnull;
-  resolved_path_ptr = realpath((char*)path, resolved_path);
-
-  // if there is an error, the return is null.
-  if (!resolved_path_ptr)
+  if (!realpath((char*)path, resolved_path))
       return NSRESULT_FOR_ERRNO();
 
   // Need to know whether we're a directory to create a new CFURLRef
@@ -420,16 +405,15 @@ NS_IMETHODIMP nsLocalFile::Normalize()
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = NS_ERROR_FAILURE;
-  CFStringRef pathStrRef =
-    ::CFStringCreateWithCString(kCFAllocatorDefault,
-                                resolved_path,
-                                kCFStringEncodingUTF8);
+  CFStringRef pathStrRef = ::CFStringCreateWithCString(kCFAllocatorDefault,
+                                                       resolved_path,
+                                                       kCFStringEncodingUTF8);
   if (pathStrRef) {
     CFURLRef newURLRef =
       ::CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pathStrRef,
                                       kCFURLPOSIXPathStyle, isDirectory);
     if (newURLRef) {
-      SetBaseRef(newURLRef);
+      SetBaseURL(newURLRef);
       ::CFRelease(newURLRef);
       rv = NS_OK;
     }
@@ -527,16 +511,12 @@ NS_IMETHODIMP nsLocalFile::Create(PRUint32 type, PRUint32 permissions)
 
 NS_IMETHODIMP nsLocalFile::GetLeafName(nsAString& aLeafName)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
   nsCAutoString nativeString;
   nsresult rv = GetNativeLeafName(nativeString);
   if (NS_FAILED(rv))
     return rv;
   CopyUTF8toUTF16NFC(nativeString, aLeafName);
   return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
 NS_IMETHODIMP nsLocalFile::SetLeafName(const nsAString& aLeafName)
@@ -548,7 +528,6 @@ NS_IMETHODIMP nsLocalFile::GetNativeLeafName(nsACString& aNativeLeafName)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   nsresult rv = NS_ERROR_FAILURE;
@@ -566,7 +545,6 @@ NS_IMETHODIMP nsLocalFile::SetNativeLeafName(const nsACString& aNativeLeafName)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   nsresult rv = NS_ERROR_FAILURE;
@@ -580,7 +558,7 @@ NS_IMETHODIMP nsLocalFile::SetNativeLeafName(const nsACString& aNativeLeafName)
       CFURLRef newURLRef = ::CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,
                                     parentURLRef, nodeStrRef, PR_FALSE);
       if (newURLRef) {
-        SetBaseRef(newURLRef);
+        SetBaseURL(newURLRef);
         ::CFRelease(newURLRef);
         rv = NS_OK;
       }
@@ -622,7 +600,6 @@ NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString&
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   StFollowLinksState followLinks(*this, PR_FALSE);
@@ -697,7 +674,7 @@ NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString&
                                              destPath.Length(), isDirectory);
   if (!newBaseRef)
     return NS_ERROR_FAILURE;
-  SetBaseRef(newBaseRef);
+  SetBaseURL(newBaseRef);
   ::CFRelease(newBaseRef);
 
   return rv;
@@ -709,10 +686,9 @@ NS_IMETHODIMP nsLocalFile::Remove(PRBool recursive)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
-  // XXX If we're an alias, never remove target
+  // if we're a symlink, never remove target
   StFollowLinksState followLinks(*this, PR_FALSE);
 
   PRBool isDirectory;
@@ -842,11 +818,9 @@ NS_IMETHODIMP nsLocalFile::SetLastModifiedTime(PRInt64 aLastModifiedTime)
   int result;
   if (aLastModifiedTime != 0) {
     struct STAT statBuf;
-    if (STAT(path.get(), &statBuf) == -1) {
-      // try lstat it may be a symlink
-      if (LSTAT(path.get(), &statBuf) == -1)
-        return NS_ERROR_FAILURE;
-    }
+    nsresult rv = FillStatBufferInternal(&statBuf);
+    if (NS_FAILED(rv))
+      return rv;
 
     struct utimbuf ut;
     ut.actime = statBuf.st_atime;
@@ -932,7 +906,6 @@ NS_IMETHODIMP nsLocalFile::SetFileSize(PRInt64 aFileSize)
 
 NS_IMETHODIMP nsLocalFile::GetFileSizeOfLink(PRInt64 *aFileSizeOfLink)
 {
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   NS_ENSURE_ARG_POINTER(aFileSizeOfLink);
@@ -953,19 +926,32 @@ NS_IMETHODIMP nsLocalFile::GetTarget(nsAString& aTarget)
 
 NS_IMETHODIMP nsLocalFile::GetNativeTarget(nsACString& aNativeTarget)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+  CHECK_mBaseURL();
 
-  if (!mTargetURL)
-    return NS_ERROR_NOT_INITIALIZED;
-  nsresult rv = NS_ERROR_FAILURE;
-  CFStringRef pathStrRef = ::CFURLCopyFileSystemPath(mTargetURL, kCFURLPOSIXPathStyle);
-  if (pathStrRef) {
-    rv = CFStringReftoUTF8(pathStrRef, aNativeTarget);
-    ::CFRelease(pathStrRef);
-  }
-  return rv;
+  PRBool isSymLink = PR_FALSE;
+  nsresult rv = IsSymlink(&isSymLink);
+  if (NS_FAILED(rv))
+    return rv;
 
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+  if (!isSymLink)
+    return NS_ERROR_FILE_INVALID_PATH;
+
+  nsCAutoString nativeString;
+  rv = GetNativePath(nativeString);
+  if (NS_FAILED(rv))
+    return rv;
+
+  char resolvedPathBuf[PATH_MAX];
+  if (!realpath(nativeString.get(), resolvedPathBuf))
+    return NS_ERROR_FILE_INVALID_PATH;
+
+  unsigned int resolvedPathLength = strlen(resolvedPathBuf);
+  aNativeTarget.SetLength(resolvedPathLength);
+  if (aNativeTarget.Length() != (unsigned int)resolvedPathLength)
+    return NS_ERROR_OUT_OF_MEMORY;
+  strncpy(aNativeTarget.BeginWriting(), resolvedPathBuf, resolvedPathLength);
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsLocalFile::GetPath(nsAString& aPath)
@@ -982,7 +968,6 @@ NS_IMETHODIMP nsLocalFile::GetNativePath(nsACString& aNativePath)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   nsresult rv = NS_ERROR_FAILURE;
@@ -1106,25 +1091,17 @@ NS_IMETHODIMP nsLocalFile::IsHidden(PRBool *_retval)
 
 NS_IMETHODIMP nsLocalFile::IsDirectory(PRBool *_retval)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
-  FSRef fsRef;
-  nsresult rv = GetFSRefInternal(fsRef);
+
+  struct STAT buf;
+  nsresult rv = FillStatBufferInternal(&buf);
   if (NS_FAILED(rv))
     return rv;
-    
-  FSCatalogInfo catalogInfo;
-  OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNodeFlags, &catalogInfo,
-                                nsnull, nsnull, nsnull);
-  if (err != noErr)
-    return MacErrorMapper(err);
-  *_retval = ((catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) != 0);
-  return NS_OK;
 
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+  *_retval = S_ISDIR(buf.st_mode);
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval)
@@ -1133,18 +1110,14 @@ NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval)
 
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
-  FSRef fsRef;
-  nsresult rv = GetFSRefInternal(fsRef);
+
+  struct STAT buf;
+  nsresult rv = FillStatBufferInternal(&buf);
   if (NS_FAILED(rv))
     return rv;
-    
-  FSCatalogInfo catalogInfo;
-  OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNodeFlags, &catalogInfo,
-                                nsnull, nsnull, nsnull);
-  if (err != noErr)
-    return MacErrorMapper(err);
-  *_retval = ((catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) == 0);
+
+  *_retval = S_ISREG(buf.st_mode);
+
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -1169,16 +1142,6 @@ NS_IMETHODIMP nsLocalFile::IsSymlink(PRBool *_retval)
     return NSRESULT_FOR_ERRNO();
   *_retval = S_ISLNK(symStat.st_mode);
 
-  // If we're not a symlink, see if we are an old-school Mac OS alias
-  if (!(*_retval)) {
-    FSRef fsRef;
-    if (::CFURLGetFSRef(mBaseURL, &fsRef)) {
-      Boolean isAlias, isFolder;
-      if (::FSIsAliasFile(&fsRef, &isAlias, &isFolder) == noErr)
-        *_retval = isAlias;
-    }    
-  }
-
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -1186,8 +1149,8 @@ NS_IMETHODIMP nsLocalFile::IsSymlink(PRBool *_retval)
 
 NS_IMETHODIMP nsLocalFile::IsSpecial(PRBool *_retval)
 {
-    NS_ERROR("NS_ERROR_NOT_IMPLEMENTED");
-    return NS_ERROR_NOT_IMPLEMENTED;
+  NS_ERROR("NS_ERROR_NOT_IMPLEMENTED");
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsLocalFile::Clone(nsIFile **_retval)
@@ -1204,7 +1167,7 @@ NS_IMETHODIMP nsLocalFile::Clone(nsIFile **_retval)
 
 NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
 {
-    return EqualsInternal(inFile, _retval);
+  return EqualsInternal(inFile, _retval);
 }
 
 nsresult
@@ -1388,7 +1351,7 @@ NS_IMETHODIMP nsLocalFile::InitWithNativePath(const nsACString& filePath)
     ::CFRelease(pathAsCFString);
     return NS_ERROR_FAILURE;
   }
-  SetBaseRef(pathAsCFURL);
+  SetBaseURL(pathAsCFURL);
   ::CFRelease(pathAsCFURL);
   ::CFRelease(pathAsCFString);
   return NS_OK;
@@ -1426,10 +1389,8 @@ NS_IMETHODIMP nsLocalFile::GetFollowLinks(PRBool *aFollowLinks)
 
 NS_IMETHODIMP nsLocalFile::SetFollowLinks(PRBool aFollowLinks)
 {
-  if (aFollowLinks != mFollowLinks) {
-    mFollowLinks = aFollowLinks;
-    UpdateTargetRef();
-  }
+  mFollowLinks = aFollowLinks;
+
   return NS_OK;
 }
 
@@ -1471,7 +1432,6 @@ NS_IMETHODIMP nsLocalFile::OpenANSIFileDesc(const char *mode, FILE **_retval)
 
 NS_IMETHODIMP nsLocalFile::Load(PRLibrary **_retval)
 {
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   NS_ENSURE_ARG_POINTER(_retval);
@@ -1684,7 +1644,7 @@ NS_IMETHODIMP nsLocalFile::InitWithCFURL(CFURLRef aCFURL)
 {
   NS_ENSURE_ARG(aCFURL);
   
-  SetBaseRef(aCFURL);
+  SetBaseURL(aCFURL);
   return NS_OK;
 }
 
@@ -1697,7 +1657,7 @@ NS_IMETHODIMP nsLocalFile::InitWithFSRef(const FSRef *aFSRef)
   
   CFURLRef newURLRef = ::CFURLCreateFromFSRef(kCFAllocatorDefault, aFSRef);
   if (newURLRef) {
-    SetBaseRef(newURLRef);
+    SetBaseURL(newURLRef);
     ::CFRelease(newURLRef);
     rv = NS_OK;
   }
@@ -1723,12 +1683,31 @@ NS_IMETHODIMP nsLocalFile::GetCFURL(CFURLRef *_retval)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  NS_ENSURE_ARG_POINTER(_retval);
-  CFURLRef whichURLRef = mFollowLinks ? mTargetURL : mBaseURL;
-  if (whichURLRef)
-    ::CFRetain(whichURLRef);
-  *_retval = whichURLRef;
-  return whichURLRef ? NS_OK : NS_ERROR_FAILURE;
+  CHECK_mBaseURL();
+
+  if (mFollowLinks) {
+    nsCAutoString nativePath;
+    nsresult rv = GetNativeTarget(nativePath);
+    if (NS_SUCCEEDED(rv)) {
+      // This is a symlink if we can get a target path.
+      // We can assume this is not a directory if we know it is a symlink.
+      // I'll say this anyway because it is so dangerous: Do not call IsDirectory
+      // here because that ultimately ends up calling GetCFURL and you get a loop.
+      CFURLRef targetURL = ::CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,
+                                                                     (UInt8*)nativePath.BeginWriting(),
+                                                                     nativePath.Length(),
+                                                                     false);
+      if (!targetURL)
+        return NS_ERROR_FAILURE;
+      *_retval = targetURL;
+      return NS_OK;
+    }
+  }
+
+  ::CFRetain(mBaseURL);
+  *_retval = mBaseURL;
+
+  return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
@@ -2036,54 +2015,17 @@ nsLocalFile::GetBundleIdentifier(nsACString& outBundleIdentifier)
 #pragma mark -
 #pragma mark [Protected Methods]
 
-nsresult nsLocalFile::SetBaseRef(CFURLRef aCFURLRef)
+nsresult nsLocalFile::SetBaseURL(CFURLRef aCFURLRef)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   NS_ENSURE_ARG(aCFURLRef);
-  
+
   ::CFRetain(aCFURLRef);
   if (mBaseURL)
     ::CFRelease(mBaseURL);
   mBaseURL = aCFURLRef;
 
-  mFollowLinksDirty = PR_TRUE;  
-  UpdateTargetRef();
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsLocalFile::UpdateTargetRef()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Check we are correctly initialized.
-  CHECK_mBaseURL();
-  
-  if (mFollowLinksDirty) {
-    if (mTargetURL) {
-      ::CFRelease(mTargetURL);
-      mTargetURL = nsnull;
-    }
-    if (mFollowLinks) {
-      mTargetURL = mBaseURL;
-      ::CFRetain(mTargetURL);
-
-      FSRef fsRef;
-      if (::CFURLGetFSRef(mBaseURL, &fsRef)) {
-        Boolean targetIsFolder, wasAliased;
-        if (FSResolveAliasFile(&fsRef, true /*resolveAliasChains*/, 
-            &targetIsFolder, &wasAliased) == noErr && wasAliased) {
-          ::CFRelease(mTargetURL);
-          mTargetURL = ::CFURLCreateFromFSRef(NULL, &fsRef);
-          if (!mTargetURL)
-            return NS_ERROR_FAILURE;
-        }
-      }
-      mFollowLinksDirty = PR_FALSE;
-    }
-  }
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -2093,50 +2035,9 @@ nsresult nsLocalFile::GetFSRefInternal(FSRef& aFSRef)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  CFURLRef whichURLRef = mFollowLinks ? mTargetURL : mBaseURL;
-  NS_ENSURE_TRUE(whichURLRef, NS_ERROR_NULL_POINTER);
-  if (::CFURLGetFSRef(whichURLRef, &aFSRef))
-    return NS_OK;
+  CHECK_mBaseURL();
 
-  // See if we are a symlink, and construct an FSRef for that
-  nsCAutoString path;
-  nsresult rv = GetNativePath(path); // XXXjag inline and use whichURLRef?
-  if (NS_FAILED(rv))
-    return rv;
-
-  struct stat symStat;
-  if (lstat(path.get(), &symStat) < 0)
-    return NSRESULT_FOR_ERRNO();
-
-  rv = NS_ERROR_FILE_NOT_FOUND; // best guess if all else fails
-
-  if (S_ISLNK(symStat.st_mode)) {
-    CFURLRef parentURLRef = ::CFURLCreateCopyDeletingLastPathComponent(kCFAllocatorDefault, whichURLRef);
-    if (parentURLRef) {
-      FSRef parentFSRef;
-      if (::CFURLGetFSRef(parentURLRef, &parentFSRef)) {
-        CFStringRef leafRef = ::CFURLCopyLastPathComponent(whichURLRef);
-        if (leafRef) {
-          CFRange range = { 0, ::CFStringGetLength(leafRef) };
-          if (range.length > 0) {
-            UniChar* leaf = new UniChar[range.length];
-            if (leaf) {
-              ::CFStringGetCharacters(leafRef, range, leaf);
-              if (::FSMakeFSRefUnicode(&parentFSRef, range.length, leaf,
-                                       kTextEncodingUnknown, &aFSRef) == noErr)
-                rv = NS_OK;
-
-              delete[] leaf;
-            }
-          }
-          ::CFRelease(leafRef);
-        }
-      }
-      ::CFRelease(parentURLRef);
-    }
-  }
-
-  return rv;
+  return (::CFURLGetFSRef(mBaseURL, &aFSRef) ? NS_OK : NS_ERROR_FAILURE);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
@@ -2145,18 +2046,22 @@ nsresult nsLocalFile::GetPathInternal(nsACString& path)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  CFURLRef whichURLRef = mFollowLinks ? mTargetURL : mBaseURL;
-  if (!whichURLRef)
-    return NS_ERROR_FAILURE;
+  CHECK_mBaseURL();
+
+  CFURLRef urlRef;
+  nsresult rv = GetCFURL(&urlRef);
+  if (NS_FAILED(rv))
+    return rv;
 
   path.SetLength(PATH_MAX);
-  if (path.Length() != (unsigned int)PATH_MAX)
+  if (path.Length() != (unsigned int)PATH_MAX) {
+    ::CFRelease(urlRef);
     return NS_ERROR_OUT_OF_MEMORY;
-  UInt8 *buffer = (UInt8*)path.BeginWriting();
-  if (::CFURLGetFileSystemRepresentation(whichURLRef, true, buffer, PATH_MAX))
-    return NS_OK;
-  
-  return NS_ERROR_FAILURE;
+  }
+  Boolean gotPath = ::CFURLGetFileSystemRepresentation(urlRef, true, (UInt8*)path.BeginWriting(), PATH_MAX);
+  ::CFRelease(urlRef);
+
+  return (gotPath ? NS_OK : NS_ERROR_FAILURE);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
@@ -2167,7 +2072,6 @@ nsresult nsLocalFile::CopyInternal(nsIFile* aParentDir,
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  // Check we are correctly initialized.
   CHECK_mBaseURL();
 
   StFollowLinksState srcFollowState(*this, followLinks);
@@ -2224,6 +2128,23 @@ nsresult nsLocalFile::CopyInternal(nsIFile* aParentDir,
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
+nsresult nsLocalFile::FillStatBufferInternal(struct STAT *statBuffer)
+{
+  CHECK_mBaseURL();
+
+  char path[PATH_MAX] = "";
+  Boolean gotPath = ::CFURLGetFileSystemRepresentation(mBaseURL, true, (UInt8*)path, PATH_MAX);
+  if (!gotPath)
+    return NS_ERROR_FAILURE;
+
+  if (STAT(path, statBuffer) == -1) {
+    if (LSTAT(path, statBuffer) == -1)
+      return NSRESULT_FOR_ERRNO();
+  }
+
+  return NS_OK;
+}
+
 nsresult nsLocalFile::CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
@@ -2253,7 +2174,7 @@ nsresult nsLocalFile::CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutS
 NS_IMETHODIMP
 nsLocalFile::Equals(nsIHashable* aOther, PRBool *aResult)
 {
-    return EqualsInternal(aOther, aResult);
+  return EqualsInternal(aOther, aResult);
 }
 
 NS_IMETHODIMP
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index b931cbc1fd09..897425c6d0b3 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -92,6 +92,7 @@ CPP_UNIT_TESTS = \
                  TestFile.cpp \
                  TestHashtables.cpp \
                  TestID.cpp \
+                 TestObserverArray.cpp \
                  TestObserverService.cpp \
                  TestPipe.cpp \
                  TestServMgr.cpp \
diff --git a/xpcom/tests/TestArguments.cpp b/xpcom/tests/TestArguments.cpp
index aa6dc80c2ca4..b93359d0781b 100644
--- a/xpcom/tests/TestArguments.cpp
+++ b/xpcom/tests/TestArguments.cpp
@@ -1,15 +1,21 @@
-#include <string>
-
-using namespace std;
+#include <string.h>
 
 int main(int argc, char* argv[]) {
-  if (argc != 2)
+  if (argc != 7)
       return -1;
 
-  string test = "mozilla";
-
-  if (test.compare(argv[1]) != 0)
-      return -1;
+  if (strcmp("mozilla", argv[1]) != 0)
+      return 1;
+  if (strcmp("firefox", argv[2]) != 0)
+      return 2;
+  if (strcmp("thunderbird", argv[3]) != 0)
+      return 3;
+  if (strcmp("seamonkey", argv[4]) != 0)
+      return 4;
+  if (strcmp("foo", argv[5]) != 0)
+      return 5;
+  if (strcmp("bar", argv[6]) != 0)
+      return 6;
   
   return 0;
 } 
diff --git a/xpcom/tests/TestObserverArray.cpp b/xpcom/tests/TestObserverArray.cpp
new file mode 100644
index 000000000000..bc9768067d1c
--- /dev/null
+++ b/xpcom/tests/TestObserverArray.cpp
@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+// vim:cindent:ts=4:et:sw=4:
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Boris Zbarsky <bzbarsky@mit.edu> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "TestHarness.h"
+#include "nsTObserverArray.h"
+
+typedef nsTObserverArray<int> Array;
+
+#define NS_ARRAY_LENGTH(_x) (sizeof(_x)/sizeof(*_x))
+
+#define DO_TEST(_type, _exp, _code)                                   \
+  do {                                                                \
+    ++testNum;                                                        \
+    count = 0;                                                        \
+    Array::_type iter(arr);                                           \
+    while (iter.HasMore() && count != NS_ARRAY_LENGTH(_exp)) {        \
+      _code                                                           \
+      int next = iter.GetNext();                                      \
+      int expected = _exp[count++];                                   \
+      if (next != expected) {                                         \
+        fail("During test %d at position %d got %d expected %d\n",    \
+             testNum, count-1, next, expected);                       \
+        rv = 1;                                                       \
+      }                                                               \
+    }                                                                 \
+    if (iter.HasMore()) {                                             \
+      fail("During test %d, iterator ran over", testNum);             \
+      rv = 1;                                                         \
+    }                                                                 \
+    if (count != NS_ARRAY_LENGTH(_exp)) {                             \
+      fail("During test %d, iterator finished too early", testNum);   \
+      rv = 1;                                                         \
+    }                                                                 \
+  } while (0)
+
+int main(int argc, char **argv)
+{
+  ScopedXPCOM xpcom("nsTObserverArrayTests");
+  if (xpcom.failed()) {
+    return 1;
+  }
+
+  int rv = 0;
+
+  Array arr;
+  arr.AppendElement(3);
+  arr.AppendElement(4);
+
+  int count;
+  int testNum = 0;
+
+  // Basic sanity
+  static int test1Expected[] = { 3, 4 };
+  DO_TEST(ForwardIterator, test1Expected, );
+
+  // Appends
+  static int test2Expected[] = { 3, 4, 2 };
+  DO_TEST(ForwardIterator, test2Expected,
+          if (count == 1) arr.AppendElement(2);
+          );
+  DO_TEST(ForwardIterator, test2Expected, );
+
+  DO_TEST(EndLimitedIterator, test2Expected,
+          if (count == 1) arr.AppendElement(5);
+          );
+
+  static int test5Expected[] = { 3, 4, 2, 5 };
+  DO_TEST(ForwardIterator, test5Expected, );
+
+  // Removals
+  DO_TEST(ForwardIterator, test5Expected,
+          if (count == 1) arr.RemoveElementAt(0);
+          );
+
+  static int test7Expected[] = { 4, 2, 5 };
+  DO_TEST(ForwardIterator, test7Expected, );
+
+  static int test8Expected[] = { 4, 5 };
+  DO_TEST(ForwardIterator, test8Expected,
+          if (count == 1) arr.RemoveElementAt(1);
+          );
+  DO_TEST(ForwardIterator, test8Expected, );
+
+  arr.AppendElement(2);
+  arr.AppendElementUnlessExists(6);
+  static int test10Expected[] = { 4, 5, 2, 6 };
+  DO_TEST(ForwardIterator, test10Expected, );
+
+  arr.AppendElementUnlessExists(5);
+  DO_TEST(ForwardIterator, test10Expected, );
+
+  static int test12Expected[] = { 4, 5, 6 };
+  DO_TEST(ForwardIterator, test12Expected,
+          if (count == 1) arr.RemoveElementAt(2);
+          );
+  DO_TEST(ForwardIterator, test12Expected, );
+
+  // Removals + Appends
+  static int test14Expected[] = { 4, 6, 7 };
+  DO_TEST(ForwardIterator, test14Expected,
+          if (count == 1) {
+            arr.RemoveElementAt(1);
+            arr.AppendElement(7);
+          }
+          );
+  DO_TEST(ForwardIterator, test14Expected, );
+
+  arr.AppendElement(2);
+  static int test16Expected[] = { 4, 6, 7, 2 };
+  DO_TEST(ForwardIterator, test16Expected, );
+
+  static int test17Expected[] = { 4, 7, 2 };
+  DO_TEST(EndLimitedIterator, test17Expected,
+          if (count == 1) {
+            arr.RemoveElementAt(1);
+            arr.AppendElement(8);
+          }
+          );
+
+  static int test18Expected[] = { 4, 7, 2, 8 };
+  DO_TEST(ForwardIterator, test18Expected, );
+
+  // Prepends
+  arr.PrependElementUnlessExists(3);
+  static int test19Expected[] = { 3, 4, 7, 2, 8 };
+  DO_TEST(ForwardIterator, test19Expected, );
+
+  arr.PrependElementUnlessExists(7);
+  DO_TEST(ForwardIterator, test19Expected, );
+
+  // Commented out because it fails; bug 474369 will fix
+  /*  DO_TEST(ForwardIterator, test19Expected,
+          if (count == 1) {
+            arr.PrependElementUnlessExists(9);
+          }
+          );
+
+  static int test22Expected[] = { 9, 3, 4, 7, 2, 8 };
+  DO_TEST(ForwardIterator, test22Expected, );
+  */
+  
+  return rv;
+}
diff --git a/xpcom/tests/unit/test_nsIProcess.js b/xpcom/tests/unit/test_nsIProcess.js
index 98be31f434f6..c415190db4f9 100644
--- a/xpcom/tests/unit/test_nsIProcess.js
+++ b/xpcom/tests/unit/test_nsIProcess.js
@@ -120,7 +120,7 @@ function test_arguments()
                           .createInstance(Components.interfaces.nsIProcess);
   process.init(file);
   
-  var args= ["mozilla"];
+  var args= ["mozilla", "firefox", "thunderbird", "seamonkey", "foo", "bar"];
   
   process.run(true, args, args.length);
   
@@ -155,7 +155,7 @@ function test_notify_nonblocking()
                           .createInstance(Components.interfaces.nsIProcess);
   process.init(file);
 
-  process.runAsync(["mozilla"], 1, {
+  process.runAsync(["mozilla", "firefox", "thunderbird", "seamonkey", "foo", "bar"], 6, {
     observe: function(subject, topic, data) {
       process = subject.QueryInterface(Components.interfaces.nsIProcess);
       do_check_eq(topic, "process-finished");
diff --git a/xpcom/tests/unit/test_symlinks.js b/xpcom/tests/unit/test_symlinks.js
index 6e93dbd4f11f..510d3a234eaf 100644
--- a/xpcom/tests/unit/test_symlinks.js
+++ b/xpcom/tests/unit/test_symlinks.js
@@ -58,19 +58,6 @@ function makeSymLink(from, toName, relative) {
   print(to.path);
   print(to.target);
 
-  if (isMac) {
-    // Bug 484297: nsIFile.target doesn't work for symlinks.
-    if (from.leafName != DOES_NOT_EXIST) {
-      let fromN = from.clone();
-      fromN.normalize();
-      let toN = to.clone();
-      toN.normalize();
-      do_check_eq(fromN.path, toN.path);
-    }
-
-    return to;
-  }
-
   if (from.leafName != DOES_NOT_EXIST && from.isSymlink()) {
     // XXXjag wish I could set followLinks to false so we'd just get
     // the symlink's direct target instead of the final target.
@@ -137,13 +124,6 @@ function testSymLinks(testDir, relative) {
   const files = [FILE_TARGET].concat(fileLinks);
   const links = otherLinks.concat(dirLinks, fileLinks);
 
-  if (isMac) {
-    // Bug 484303: nsIFile.isFile() returns true for dangling symlinks.
-    for each (link in otherLinks) {
-      files.push(link);
-    }
-  }
-
   const spaces = createSpaces(dirs, files, links);
   const bools = {false: " false", true: " true "};
   print(spaces + " dir   file  symlink");
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 6291652d9b21..abb26b6a7ba8 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -81,7 +81,7 @@
 
 #include "nsIDOMXULDocument.h"
 
-#include "nsIFocusController.h"
+#include "nsFocusManager.h"
 
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
@@ -107,18 +107,12 @@
 #include "nsIDocShellTreeNode.h"
 
 #include "nsIMarkupDocumentViewer.h"
-#include "nsIFocusEventSuppressor.h"
 
 #ifdef XP_MACOSX
 #include "nsINativeMenuService.h"
 #define USE_NATIVE_MENUS
 #endif
 
-static nsWebShellWindow* gCurrentlyFocusedWindow = nsnull;
-static nsWebShellWindow* gFocusedWindowBeforeSuppression = nsnull;
-static PRBool gFocusSuppressed = PR_FALSE;
-static PRUint32 gWebShellWindowCount = 0;
-
 /* Define Class IDs */
 static NS_DEFINE_CID(kWindowCID,           NS_WINDOW_CID);
 
@@ -127,25 +121,11 @@ static NS_DEFINE_CID(kWindowCID,           NS_WINDOW_CID);
 nsWebShellWindow::nsWebShellWindow() : nsXULWindow()
 {
   mSPTimerLock = PR_NewLock();
-  if (++gWebShellWindowCount == 1) {
-    nsCOMPtr<nsIFocusEventSuppressorService> suppressor =
-      do_GetService(NS_NSIFOCUSEVENTSUPPRESSORSERVICE_CONTRACTID);
-    if (suppressor) {
-      suppressor->AddObserverCallback(&nsWebShellWindow::SuppressFocusEvents);
-    }
-  }
 }
 
 
 nsWebShellWindow::~nsWebShellWindow()
 {
-  --gWebShellWindowCount;
-  if (gCurrentlyFocusedWindow == this) {
-    gCurrentlyFocusedWindow = nsnull;
-  }
-  if (gFocusedWindowBeforeSuppression == this) {
-    gFocusedWindowBeforeSuppression = nsnull;
-  }
   if (mWindow) {
     mWindow->SetClientData(0);
     mWindow->Destroy();
@@ -387,21 +367,6 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         // the state and pass the event on to the OS. The day is coming
         // when we'll handle the event here, and the return result will
         // then need to be different.
-#ifdef XP_WIN
-        // This is a nasty hack to get around the fact that win32 sends the kill focus
-        // event in a different sequence than the deactivate depending on if you're
-        // minimizing the window vs. just clicking in a different window to cause
-        // the deactivation. Bug #82534
-        if(modeEvent->mSizeMode == nsSizeMode_Minimized) {
-          nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_GetInterface(docShell);
-          if(privateDOMWindow) {
-            nsIFocusController *focusController =
-              privateDOMWindow->GetRootFocusController();
-            if (focusController)
-              focusController->RewindFocusState();
-          }
-        }
-#endif
         break;
       }
       case NS_OS_TOOLBAR: {
@@ -436,17 +401,23 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         break;
       }
 
-      case NS_MOUSE_ACTIVATE:{
-        break;
-      }
-      
       case NS_ACTIVATE: {
 #if defined(DEBUG_saari) || defined(DEBUG_smaug)
         printf("nsWebShellWindow::NS_ACTIVATE\n");
 #endif
-        nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_GetInterface(docShell);
-        if (privateDOMWindow)
-          privateDOMWindow->Activate();
+        // focusing the window could cause it to close, so keep a reference to it
+        nsCOMPtr<nsIXULWindow> kungFuDeathGrip(eventWindow);
+
+        nsCOMPtr<nsIDOMWindow> window = do_GetInterface(docShell);
+        nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+        if (fm && window)
+          fm->WindowRaised(window);
+
+        if (eventWindow->mChromeLoaded) {
+          eventWindow->PersistentAttributesDirty(
+                             PAD_POSITION | PAD_SIZE | PAD_MISC);
+          eventWindow->SavePersistentAttributes();
+        }
 
         break;
       }
@@ -456,84 +427,13 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         printf("nsWebShellWindow::NS_DEACTIVATE\n");
 #endif
 
-        nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_GetInterface(docShell);
-        if (privateDOMWindow) {
-          nsIFocusController *focusController =
-            privateDOMWindow->GetRootFocusController();
-          if (focusController)
-            focusController->SetActive(PR_FALSE);
-
-          privateDOMWindow->Deactivate();
-        }
+        nsCOMPtr<nsIDOMWindow> window = do_GetInterface(docShell);
+        nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
+        if (fm && window)
+          fm->WindowLowered(window);
         break;
       }
       
-      case NS_GOTFOCUS: {
-#if defined(DEBUG_saari) || defined(DEBUG_smaug)
-        printf("nsWebShellWindow::GOTFOCUS\n");
-#endif
-        gCurrentlyFocusedWindow = eventWindow;
-        if (gFocusSuppressed) {
-          break;
-        }
-        nsCOMPtr<nsIDOMDocument> domDocument;
-        nsCOMPtr<nsPIDOMWindow> piWin = do_GetInterface(docShell);
-        if (!piWin) {
-          break;
-        }
-        nsIFocusController *focusController = piWin->GetRootFocusController();
-        if (focusController) {
-          // This is essentially the first stage of activation (NS_GOTFOCUS is
-          // followed by the DOM window getting activated (which is direct on Win32
-          // and done through web shell window via an NS_ACTIVATE message on the
-          // other platforms).
-          //
-          // Go ahead and mark the focus controller as being active.  We have
-          // to do this even before the activate message comes in, since focus
-          // memory kicks in prior to the activate being processed.
-          focusController->SetActive(PR_TRUE);
-
-          nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
-          focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
-          if (focusedWindow) {
-            // It's possible for focusing the window to cause it to close.
-            // To avoid holding a pointer to deleted memory, keep a reference
-            // on eventWindow. -bryner
-            nsCOMPtr<nsIXULWindow> kungFuDeathGrip(eventWindow);
-
-            focusController->SetSuppressFocus(PR_TRUE, "Activation Suppression");
-
-            nsCOMPtr<nsIDOMWindowInternal> domWindow = 
-              do_QueryInterface(piWin);
-
-            NS_ASSERTION(domWindow,
-                         "windows must support nsIDOMWindowInternal");
-
-            domWindow->Focus(); // This sets focus, but we'll ignore it.  
-                                // A subsequent activate will cause us to stop suppressing.
-
-            // since the window has been activated, replace persistent size data
-            // with the newly activated window's
-            if (eventWindow->mChromeLoaded) {
-              eventWindow->PersistentAttributesDirty(
-                             PAD_POSITION | PAD_SIZE | PAD_MISC);
-              eventWindow->SavePersistentAttributes();
-            }
-
-            break;
-          }
-        }
-        break;
-      }
-      case NS_LOSTFOCUS: {
-#if defined(DEBUG_saari) || defined(DEBUG_smaug)
-        printf("nsWebShellWindow::LOSTFOCUS\n");
-#endif
-        if (gCurrentlyFocusedWindow == eventWindow) {
-          gCurrentlyFocusedWindow = nsnull;
-        }
-        break;
-      }
       case NS_GETACCESSIBLE: {
         nsCOMPtr<nsIPresShell> presShell;
         docShell->GetPresShell(getter_AddRefs(presShell));
@@ -870,44 +770,3 @@ NS_IMETHODIMP nsWebShellWindow::Destroy()
   }
   return nsXULWindow::Destroy();
 }
-
-void
-nsWebShellWindow::SuppressFocusEvents(PRBool aSuppress)
-{
-  if (aSuppress) {
-    gFocusSuppressed = PR_TRUE;
-    gFocusedWindowBeforeSuppression = gCurrentlyFocusedWindow;
-    return;
-  }
-
-  gFocusSuppressed = PR_FALSE;
-  if (gFocusedWindowBeforeSuppression == gCurrentlyFocusedWindow) {
-    return;
-  }
-
-  // Backup what is focused before we send the blur. If the
-  // blur causes a focus change, keep that new focus change,
-  // don't overwrite with the old "currently focused window".
-  nsWebShellWindow* currentFocusBeforeBlur = gCurrentlyFocusedWindow;
-
-  if (gFocusedWindowBeforeSuppression) {
-    nsCOMPtr<nsIWidget> widget = gFocusedWindowBeforeSuppression->mWindow;
-    if (widget) {
-      nsRefPtr<nsWebShellWindow> window = gFocusedWindowBeforeSuppression;
-      nsGUIEvent lostfocus(PR_TRUE, NS_LOSTFOCUS, widget);
-      window->HandleEvent(&lostfocus);
-    }
-  }
-
-  // Send NS_GOTFOCUS to the widget that we think should be focused.
-  if (gCurrentlyFocusedWindow &&
-      gCurrentlyFocusedWindow == currentFocusBeforeBlur) {
-    nsCOMPtr<nsIWidget> widget = gCurrentlyFocusedWindow->mWindow;
-    if (widget) {
-      nsRefPtr<nsWebShellWindow> window = gCurrentlyFocusedWindow;
-      nsGUIEvent gotfocus(PR_TRUE, NS_GOTFOCUS, widget);
-      window->HandleEvent(&gotfocus);
-    }
-  }
-}
-
diff --git a/xpfe/appshell/src/nsWebShellWindow.h b/xpfe/appshell/src/nsWebShellWindow.h
index 3fccada50c39..5c4cb991be59 100644
--- a/xpfe/appshell/src/nsWebShellWindow.h
+++ b/xpfe/appshell/src/nsWebShellWindow.h
@@ -76,7 +76,6 @@ public:
   // nsIBaseWindow
   NS_IMETHOD Destroy();
 
-  static void SuppressFocusEvents(PRBool aSuppress);
 protected:
   
   virtual ~nsWebShellWindow();