Bug 1365364 - Set up nsIBrowserDOMWindow correctly in GeckoView r=jchen draft
authorJames Willcox <snorp@snorp.net>
Fri, 02 Jun 2017 13:20:58 -0500
changeset 588342 27a5efaaa323ad08bc0ab720366a933a0a075454
parent 588341 4448cfe7eed15f56957979a2fa4c1f2a1fc69185
child 631549 85490e8a6be3d2dec1ddcb19a275d1cf345dde01
push id62006
push userbmo:snorp@snorp.net
push dateFri, 02 Jun 2017 18:22:38 +0000
reviewersjchen
bugs1365364
milestone55.0a1
Bug 1365364 - Set up nsIBrowserDOMWindow correctly in GeckoView r=jchen MozReview-Commit-ID: L0FkAGriChD
mobile/android/chrome/geckoview/geckoview.js
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -43,17 +43,20 @@ var ModuleManager = {
       return;
     }
     delete this.modules[aType];
   }
 };
 
 function startup() {
   ModuleManager.init();
+
+  // GeckoViewNavigation needs to go first because nsIDOMBrowserWindow must set up
+  // before the first remote browser. Bug 1365364.
+  ModuleManager.add("resource://gre/modules/GeckoViewNavigation.jsm",
+                    "GeckoViewNavigation");
   ModuleManager.add("resource://gre/modules/GeckoViewSettings.jsm",
                     "GeckoViewSettings");
   ModuleManager.add("resource://gre/modules/GeckoViewContent.jsm",
                     "GeckoViewContent");
-  ModuleManager.add("resource://gre/modules/GeckoViewNavigation.jsm",
-                    "GeckoViewNavigation");
   ModuleManager.add("resource://gre/modules/GeckoViewProgress.jsm",
                     "GeckoViewProgress");
 }