Bug 1108555 - [e10s] closing last tab does not focus urlbar (browser.tabs.closeWindowWithLastTab = false). r=jimm,mconley

2014-12-17 18:17:38 +01:00 · 2014-12-17 18:17:38 +01:00 · 3db60dbec7
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@ -1190,6 +1190,10 @@
                // We need to explicitly focus the new tab, because
                // tabbox.xml does this only in some cases.
                this.mCurrentTab.focus();
+              } else if (gMultiProcessBrowser) {
+                // Clear focus so that _adjustFocusAfterTabSwitch can detect if
+                // some element has been focused and respect that.
+                document.activeElement.blur();
              }

              if (!gMultiProcessBrowser)
@ -1207,12 +1211,12 @@
      <method name="_adjustFocusAfterTabSwitch">
        <parameter name="newTab"/>
        <body><![CDATA[
-        let newBrowser = this.getBrowserForTab(newTab);
-
        // Don't steal focus from the tab bar.
        if (document.activeElement == newTab)
          return;

+        let newBrowser = this.getBrowserForTab(newTab);
+
        // If there's a tabmodal prompt showing, focus it.
        if (newBrowser.hasAttribute("tabmodalPromptShowing")) {
          let XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@ -1226,7 +1230,6 @@
        // In full screen mode, only bother making the location bar visible
        // if the tab is a blank one.
        if (newBrowser._urlbarFocused && gURLBar) {
-
          // Explicitly close the popup if the URL bar retains focus
          gURLBar.closePopup();

@ -1248,20 +1251,13 @@
          return;
        }

-        // Otherwise, focus the content area. If we're not using remote tabs, we
-        // can focus the content area right away, since tab switching is synchronous.
-        // If we're using remote tabs, we have to wait until after we've finalized
-        // switching the tabs.
-
-        if (newTab._skipContentFocus) {
-          // It's possible the tab we're switching to is ready to focus asynchronously,
-          // when we've already focused something else. In that case, this
-          // _skipContentFocus property can be set so that we skip focusing the
-          // content after we switch tabs.
-          delete newTab._skipContentFocus;
+        // Don't focus the content area if something has been focused after the
+        // tab switch was initiated.
+        if (gMultiProcessBrowser &&
+            document.activeElement != document.documentElement)
          return;
-        }

+        // We're now committed to focusing the content area.
        let fm = Services.focus;
        let focusFlags = fm.FLAG_NOSCROLL;

--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@ -309,8 +309,6 @@ function openLinkIn(url, where, params) {
  // result in a new frontmost window (e.g. "javascript:window.open('');").
  w.focus();

-  let newTab;
-
  switch (where) {
  case "current":
    let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
@ -333,7 +331,7 @@ function openLinkIn(url, where, params) {
    loadInBackground = !loadInBackground;
    // fall through
  case "tab":
-    newTab = w.gBrowser.loadOneTab(url, {
+    w.gBrowser.loadOneTab(url, {
      referrerURI: aReferrerURI,
      charset: aCharset,
      postData: aPostData,
@ -349,12 +347,6 @@ function openLinkIn(url, where, params) {
  w.gBrowser.selectedBrowser.focus();

  if (!loadInBackground && w.isBlankPageURL(url)) {
-    if (newTab && gMultiProcessBrowser) {
-      // Remote browsers are switched to asynchronously, and we need to
-      // ensure that the location bar remains focused in that case rather
-      // than the content area being focused.
-      newTab._skipContentFocus = true;
-    }
    w.focusAndSelectUrlBar();
  }
 }