Bug 1472616 - Import all the static browser stylesheets from "browser-window.css". r=dao draft
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Mon, 02 Jul 2018 08:44:54 +0100
changeset 813021 9b37c756bcf5931295361132bbba7f0e024d9cc4
parent 812962 3cfc350101967376909ad3c729f9779ae0ab7a94
child 813022 9dc93b81f12b1cedad9449cbebd5a825c5f00fd4
push id114739
push userpaolo.mozmail@amadzone.org
push dateMon, 02 Jul 2018 07:46:16 +0000
reviewersdao
bugs1472616, 1421433
milestone63.0a1
Bug 1472616 - Import all the static browser stylesheets from "browser-window.css". r=dao This prevents a specific failure in the "browser_startup_flicker.js" test on Windows 10 only, surfaced by bug 1421433. The compact theme stylesheet is kept separate because it can be disabled independently. MozReview-Commit-ID: 3WDkrYqZtqN
browser/base/content/browser-window.css
browser/base/content/browser.xul
browser/base/jar.mn
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-window.css
@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://browser/content/browser.css");
+@import url("chrome://browser/content/downloads/downloads.css");
+@import url("chrome://browser/content/places/places.css");
+@import url("chrome://browser/content/usercontext/usercontext.css");
+@import url("chrome://browser/skin/controlcenter/panel.css");
+@import url("chrome://browser/skin/customizableui/panelUI.css");
+@import url("chrome://browser/skin/downloads/downloads.css");
+@import url("chrome://browser/skin/searchbar.css");
+@import url("chrome://browser/skin/places/places.css");
+@import url("chrome://browser/skin/places/editBookmark.css");
+@import url("chrome://browser/skin/");
+@import url("chrome://browser/content/tabbrowser.css");
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1,28 +1,17 @@
 #filter substitution
 <?xml version="1.0"?>
 # -*- Mode: HTML -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
-<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
-<?xml-stylesheet href="chrome://browser/skin/searchbar.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/browser-window.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
 
 # All DTD information is stored in a separate file so that it can be shared by
 # hiddenWindow.xul.
 <!DOCTYPE window [
 #include browser-doctype.inc
 ]>
 
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -50,16 +50,17 @@ browser.jar:
         content/browser/browser-safebrowsing.js       (content/browser-safebrowsing.js)
         content/browser/browser-sidebar.js            (content/browser-sidebar.js)
         content/browser/browser-siteIdentity.js       (content/browser-siteIdentity.js)
         content/browser/browser-sync.js               (content/browser-sync.js)
         content/browser/browser-tabsintitlebar.js       (content/browser-tabsintitlebar.js)
         content/browser/browser-thumbnails.js         (content/browser-thumbnails.js)
         content/browser/browser-trackingprotection.js (content/browser-trackingprotection.js)
         content/browser/browser-webrender.js          (content/browser-webrender.js)
+        content/browser/browser-window.css            (content/browser-window.css)
         content/browser/tab-content.js                (content/tab-content.js)
         content/browser/content.js                    (content/content.js)
         content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
         content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
         content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
         content/browser/defaultthemes/2.header.jpg    (content/defaultthemes/2.header.jpg)
         content/browser/defaultthemes/2.icon.jpg      (content/defaultthemes/2.icon.jpg)
         content/browser/defaultthemes/2.preview.jpg   (content/defaultthemes/2.preview.jpg)