Backing out 3031346b1104 (bug 1050447) for not fixing the bug at all.
authorMike Conley <mconley@mozilla.com>
Sat, 16 Aug 2014 15:44:10 -0400
changeset 199892 a4e46fd6959b36c5baae3f09f2a27dde52c3a388
parent 199891 93f366d6cb3cdcf5595fad3a8d5b9e04cafe7ff8
child 199893 9a2152d29d8a12b1bebcdb179c907491cac8bcb2
push id27324
push userryanvm@gmail.com
push dateSat, 16 Aug 2014 21:18:56 +0000
treeherdermozilla-central@9a2152d29d8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1050447
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backing out 3031346b1104 (bug 1050447) for not fixing the bug at all.
browser/base/content/utilityOverlay.js
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -304,18 +304,16 @@ function openLinkIn(url, where, params) 
       loadInBackground = false;
     }
   }
 
   // Raise the target window before loading the URI, since loading it may
   // 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;
 
     if (aAllowThirdPartyFixup) {
       flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
       flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
     }
@@ -329,39 +327,32 @@ function openLinkIn(url, where, params) 
 
     w.gBrowser.loadURIWithFlags(url, flags, aReferrerURI, null, aPostData);
     break;
   case "tabshifted":
     loadInBackground = !loadInBackground;
     // fall through
   case "tab":
     let browser = w.gBrowser;
-    newTab = browser.loadOneTab(url, {
-                                referrerURI: aReferrerURI,
-                                charset: aCharset,
-                                postData: aPostData,
-                                inBackground: loadInBackground,
-                                allowThirdPartyFixup: aAllowThirdPartyFixup,
-                                relatedToCurrent: aRelatedToCurrent,
-                                skipAnimation: aSkipTabAnimation,
-                                allowMixedContent: aAllowMixedContent });
+    browser.loadOneTab(url, {
+                       referrerURI: aReferrerURI,
+                       charset: aCharset,
+                       postData: aPostData,
+                       inBackground: loadInBackground,
+                       allowThirdPartyFixup: aAllowThirdPartyFixup,
+                       relatedToCurrent: aRelatedToCurrent,
+                       skipAnimation: aSkipTabAnimation,
+                       allowMixedContent: aAllowMixedContent });
     break;
   }
 
   w.gBrowser.selectedBrowser.focus();
 
-  if (!loadInBackground && w.isBlankPageURL(url)) {
-    if (newTab) {
-      // Remote tab content does not focus synchronously, so we set the flag
-      // on this tab to skip focusing the content if we want to focus the URL
-      // bar instead.
-      newTab._urlbarFocused = true;
-    }
+  if (!loadInBackground && w.isBlankPageURL(url))
     w.focusAndSelectUrlBar();
-  }
 }
 
 // Used as an onclick handler for UI elements with link-like behavior.
 // e.g. onclick="checkForMiddleClick(this, event);"
 function checkForMiddleClick(node, event) {
   // We should be using the disabled property here instead of the attribute,
   // but some elements that this function is used with don't support it (e.g.
   // menuitem).