flip uriIsAboutBlank draft
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 18 Sep 2018 09:21:35 +0100
changeset 1701087 fad02c752832
parent 1701086 ab82e9ca033d
child 1701088 399b2b9c2c8a
push id300114
push usergijskruitbosch@gmail.com
push dateWed, 19 Sep 2018 10:41:35 +0000
treeherdertry@8dbae43f022e [default view] [failures only]
milestone64.0a1
flip uriIsAboutBlank
browser/base/content/browser.js
browser/base/content/tabbrowser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1648,17 +1648,17 @@ var gBrowserInit = {
         if (shouldRemoveFocusedAttribute)
           gURLBar.removeAttribute("focused");
       });
     }
   },
 
   _handleURIToLoad() {
     this._callWithURIToLoad(uriToLoad => {
-      if (!uriToLoad || uriToLoad == "about:blank") {
+      if (!uriToLoad) {
         // We don't check whether window.arguments[6] (userContextId) is set
         // because tabbrowser.js takes care of that for the initial tab.
         return;
       }
 
       // We don't check if uriToLoad is a XULElement because this case has
       // already been handled before first paint, and the argument cleared.
       if (uriToLoad instanceof Ci.nsIArray) {
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -283,17 +283,17 @@ window._gBrowser = {
   },
 
   _setupInitialBrowserAndTab() {
     // See browser.js for the meaning of window.arguments.
     let userContextId = window.arguments && window.arguments[6];
 
     // Bug 1362774 will adjust this to only set `uriIsAboutBlank` when
     // necessary. For now, we always pass it.
-    let browser = this._createBrowser({uriIsAboutBlank: true, userContextId});
+    let browser = this._createBrowser({uriIsAboutBlank: false, userContextId});
     browser.setAttribute("primary", "true");
     browser.setAttribute("blank", "true");
     if (gBrowserAllowScriptsToCloseInitialTabs) {
       browser.setAttribute("allowscriptstoclose", "true");
     }
     browser.droppedLinkHandler = handleDroppedLink;
     browser.loadURI = _loadURI.bind(null, browser);