Bug 1448043 - Activate the Light/Dark theme stylesheet before the initial layout. r?bgrins draft
authorDão Gottwald <dao@mozilla.com>
Thu, 22 Mar 2018 17:05:09 +0100
changeset 771157 b02c9f2dc6039d9f30ce2571769ba111bbc4a370
parent 771146 7c4b08deb2b138137312e86bbe438a6803d4b1bb
child 771162 328be02248cc078c23b3443e4aa7d5c2eb53f2b0
push id103588
push userdgottwald@mozilla.com
push dateThu, 22 Mar 2018 16:17:43 +0000
reviewersbgrins
bugs1448043
milestone61.0a1
Bug 1448043 - Activate the Light/Dark theme stylesheet before the initial layout. r?bgrins MozReview-Commit-ID: BQRiXfopFFI
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1226,16 +1226,18 @@ var gBrowserInit = {
       document.documentElement.setAttribute("height", height);
 
       if (width < TARGET_WIDTH && height < TARGET_HEIGHT) {
         document.documentElement.setAttribute("sizemode", "maximized");
       }
     }
 
     new LightweightThemeConsumer(document);
+    CompactTheme.init();
+
     TabsInTitlebar.init();
 
     if (window.matchMedia("(-moz-os-version: windows-win8)").matches &&
         window.matchMedia("(-moz-windows-default-theme)").matches) {
       let windowFrameColor = new Color(...ChromeUtils.import("resource:///modules/Windows8WindowFrameColor.jsm", {})
                                             .Windows8WindowFrameColor.get());
       // Default to black for foreground text.
       if (!windowFrameColor.isContrastRatioAcceptable(new Color(0, 0, 0))) {
@@ -1325,17 +1327,16 @@ var gBrowserInit = {
     // loading the frame script to ensure that we don't miss any
     // message sent between when the frame script is loaded and when
     // the listener is registered.
     DOMEventHandler.init();
     gPageStyleMenu.init();
     LanguageDetectionListener.init();
     BrowserOnClick.init();
     FeedHandler.init();
-    CompactTheme.init();
     AboutCapabilitiesListener.init();
     TrackingProtection.init();
     CaptivePortalWatcher.init();
     ZoomUI.init(window);
 
     let mm = window.getGroupMessageManager("browsers");
     mm.loadFrameScript("chrome://browser/content/tab-content.js", true);
     mm.loadFrameScript("chrome://browser/content/content.js", true);