From bfe09ec4edd2c4f74ce5e216087d6d4ec90ed40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Tue, 13 Jun 2017 08:39:38 +0200
Subject: [PATCH] Bug 1371710 - Places should not be initialized before first
 paint, r=mconley.

---
 browser/components/nsBrowserGlue.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 554c279356b9..97bf3b28eb19 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -601,7 +601,6 @@ BrowserGlue.prototype = {
   // runs on startup, before the first command line handler is invoked
   // (i.e. before the first window is opened)
   _finalUIStartup: function BG__finalUIStartup() {
-    this._sanitizer.onStartup();
     // check if we're in safe mode
     if (Services.appinfo.inSafeMode) {
       Services.ww.openWindow(null, "chrome://browser/content/safeMode.xul",
@@ -617,13 +616,6 @@ BrowserGlue.prototype = {
 
     listeners.init();
 
-    PageThumbs.init();
-
-    DirectoryLinksProvider.init();
-    NewTabUtils.init();
-    NewTabUtils.links.addProvider(DirectoryLinksProvider);
-    AboutNewTab.init();
-
     SessionStore.init();
     BrowserUsageTelemetry.init();
     BrowserUITelemetry.init();
@@ -974,6 +966,13 @@ BrowserGlue.prototype = {
       WeaveService.init();
     }
 
+    PageThumbs.init();
+
+    DirectoryLinksProvider.init();
+    NewTabUtils.init();
+    NewTabUtils.links.addProvider(DirectoryLinksProvider);
+    AboutNewTab.init();
+
     this._firstWindowTelemetry(aWindow);
     this._firstWindowLoaded();
 
@@ -1180,6 +1179,7 @@ BrowserGlue.prototype = {
       }
     }
 
+    this._sanitizer.onStartup();
     E10SAccessibilityCheck.onWindowsRestored();
   },