tabbrowserjs-lazy try: -b o -p linux64,macosx64,win64 -u mochitest-e10s-bc -t all --rebuild-talos 10 draft
authorDão Gottwald <dao@mozilla.com>
Tue, 20 Nov 2018 11:46:34 +0100
changeset 1765105 c37940bde57bd278cdf056509cbe54d504e40987
parent 1765101 a9c89acd28f71a2327042e57247f24e200b2fcd2
child 1907904 79efd4ecfaa355f39c6fb0af5aa148f581cc77b3
push id316572
push userdgottwald@mozilla.com
push dateTue, 20 Nov 2018 10:47:02 +0000
treeherdertry@c37940bde57b [default view] [failures only]
milestone65.0a1
tabbrowserjs-lazy try: -b o -p linux64,macosx64,win64 -u mochitest-e10s-bc -t all --rebuild-talos 10
browser/base/content/browser.js
browser/base/content/browser.xul
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -79,16 +79,18 @@ XPCOMUtils.defineLazyModuleGetters(this,
   ZoomUI: "resource:///modules/ZoomUI.jsm",
 });
 
 if (AppConstants.MOZ_CRASHREPORTER) {
   ChromeUtils.defineModuleGetter(this, "PluginCrashReporter",
     "resource:///modules/ContentCrashHandlers.jsm");
 }
 
+XPCOMUtils.defineLazyScriptGetter(this, "_gBrowser",
+                                  "chrome://browser/content/tabbrowser.js");
 XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
                                   "chrome://browser/content/places/treeView.js");
 XPCOMUtils.defineLazyScriptGetter(this, ["PlacesInsertionPoint", "PlacesController",
                                          "PlacesControllerDragHelper"],
                                   "chrome://browser/content/places/controller.js");
 XPCOMUtils.defineLazyScriptGetter(this, "PrintUtils",
                                   "chrome://global/content/printUtils.js");
 XPCOMUtils.defineLazyScriptGetter(this, "ZoomManager",
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -83,17 +83,16 @@
 #include global-scripts.inc
 
 <script type="application/javascript"
 #ifdef BROWSER_XHTML
 xmlns="http://www.w3.org/1999/xhtml"
 #endif
 >
   Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
-  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
 
   window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
   window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
   window.onclose = WindowIsClosing;
 
 #ifdef BROWSER_XHTML
   window.addEventListener("readystatechange", () => {