Skip to content

Commit 9ac67f2

Browse files
author
Sandor Molnar
committed
Backed out 4 changesets (bug 1857999) for causing dt failures on browser_theme_switching.js & Mn failures at test_element_state_chrome.py CLOSED TREE
Backed out changeset 75f5e6e3d917 (bug 1857999) Backed out changeset 0d0c1d1e80e7 (bug 1857999) Backed out changeset b8a03d31ecea (bug 1857999) Backed out changeset dd5a10f9cfff (bug 1857999)
1 parent 8937518 commit 9ac67f2

File tree

77 files changed

+334
-647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+334
-647
lines changed

‎browser/base/content/aboutDialog.xhtml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
# License, v. 2.0. If a copy of the MPL was not distributed with this
55
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
8+
<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
9+
<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
10+
711
<window xmlns:html="http://www.w3.org/1999/xhtml"
812
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
913
id="aboutDialog"
@@ -24,16 +28,6 @@
2428
#endif
2529

2630
<linkset>
27-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
28-
<html:link
29-
rel="stylesheet"
30-
href="chrome://browser/content/aboutDialog.css"
31-
/>
32-
<html:link
33-
rel="stylesheet"
34-
href="chrome://branding/content/aboutDialog.css"
35-
/>
36-
3731
<html:link rel="localization" href="branding/brand.ftl"/>
3832
<html:link rel="localization" href="browser/aboutDialog.ftl"/>
3933
</linkset>

‎browser/base/content/browser.xhtml

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,32 @@
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88

9+
<!-- The "global.css" stylesheet is imported first to allow other stylesheets to
10+
override rules using selectors with the same specificity. This applies to
11+
both "content" and "skin" packages, which bug 1385444 will unify later. -->
12+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
13+
14+
<!-- While these stylesheets are defined in Toolkit, they are only used in the
15+
main browser window, so we can load them here. Bug 1474241 is on file to
16+
consider moving these widgets to the "browser" folder. -->
17+
<?xml-stylesheet href="chrome://global/content/tabprompts.css" type="text/css"?>
18+
<?xml-stylesheet href="chrome://global/skin/tabprompts.css" type="text/css"?>
19+
20+
<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
21+
<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
22+
<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?>
23+
<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
24+
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
25+
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
26+
27+
<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
28+
<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
29+
<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>
30+
<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
31+
<?xml-stylesheet href="chrome://browser/skin/translations/panel.css" type="text/css"?>
32+
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
33+
<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
34+
935
<html id="main-window"
1036
xmlns:html="http://www.w3.org/1999/xhtml"
1137
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -33,38 +59,6 @@
3359
persist="screenX screenY width height sizemode"
3460
data-l10n-sync="true">
3561
<head>
36-
<!-- The "global.css" stylesheet is imported first to allow other stylesheets to
37-
override rules using selectors with the same specificity. This applies to
38-
both "content" and "skin" packages, which bug 1385444 will unify later. -->
39-
<link rel="stylesheet" href="chrome://global/skin/global.css" />
40-
41-
<link rel="stylesheet" href="chrome://global/content/tabprompts.css" />
42-
<link rel="stylesheet" href="chrome://global/skin/tabprompts.css" />
43-
44-
<link rel="stylesheet" href="chrome://browser/content/browser.css" />
45-
<link rel="stylesheet" href="chrome://browser/content/tabbrowser.css" />
46-
<link
47-
rel="stylesheet"
48-
href="chrome://browser/content/downloads/downloads.css"
49-
/>
50-
<link rel="stylesheet" href="chrome://browser/content/places/places.css" />
51-
<link
52-
rel="stylesheet"
53-
href="chrome://browser/content/usercontext/usercontext.css"
54-
/>
55-
<link rel="stylesheet" href="chrome://browser/skin/" />
56-
57-
<link rel="stylesheet" href="chrome://browser/skin/controlcenter/panel.css" />
58-
<link
59-
rel="stylesheet"
60-
href="chrome://browser/skin/customizableui/panelUI.css"
61-
/>
62-
<link rel="stylesheet" href="chrome://browser/skin/downloads/downloads.css" />
63-
<link rel="stylesheet" href="chrome://browser/skin/searchbar.css" />
64-
<link rel="stylesheet" href="chrome://browser/skin/translations/panel.css" />
65-
<link rel="stylesheet" href="chrome://browser/skin/places/tree-icons.css" />
66-
<link rel="stylesheet" href="chrome://browser/skin/places/editBookmark.css" />
67-
6862
<link rel="localization" href="branding/brand.ftl"/>
6963
<link rel="localization" href="browser/allTabsMenu.ftl"/>
7064
<link rel="localization" href="browser/appmenu.ftl"/>

‎browser/base/content/hiddenWindowMac.xhtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
#define HIDDEN_WINDOW
88

9+
<?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
10+
911
<window id="main-window"
1012
xmlns:html="http://www.w3.org/1999/xhtml"
1113
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
1214
data-l10n-sync="true">
13-
<html:link
14-
rel="stylesheet"
15-
href="chrome://browser/skin/webRTC-menubar-indicator.css"
16-
/>
1715

1816
#include macWindow.inc.xhtml
1917

‎browser/base/content/pageinfo/pageInfo.xhtml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6+
<?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
7+
<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
8+
69
<window id="main-window"
710
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
811
xmlns:html="http://www.w3.org/1999/xhtml"
@@ -16,12 +19,6 @@
1619
persist="screenX screenY width height sizemode">
1720

1821
<linkset>
19-
<html:link
20-
rel="stylesheet"
21-
href="chrome://browser/content/pageinfo/pageInfo.css"
22-
/>
23-
<html:link rel="stylesheet" href="chrome://browser/skin/pageInfo.css" />
24-
2522
<html:link rel="localization" href="browser/pageInfo.ftl"/>
2623
</linkset>
2724
#ifdef XP_MACOSX

‎browser/base/content/safeMode.xhtml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
- License, v. 2.0. If a copy of the MPL was not distributed with this
55
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
66

7+
<?xml-stylesheet href="chrome://global/skin/global.css"?>
8+
<?xml-stylesheet href="chrome://browser/content/safeMode.css"?>
9+
710
<window
811
xmlns:html="http://www.w3.org/1999/xhtml"
912
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -18,12 +21,6 @@
1821
buttonidextra1="refresh-profile"
1922
>
2023
<linkset>
21-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
22-
<html:link
23-
rel="stylesheet"
24-
href="chrome://browser/content/safeMode.css"
25-
/>
26-
2724
<html:link rel="localization" href="branding/brand.ftl" />
2825
<html:link rel="localization" href="browser/safeMode.ftl" />
2926
</linkset>

‎browser/base/content/sanitize.xhtml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
- License, v. 2.0. If a copy of the MPL was not distributed with this
66
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
77
8+
<?xml-stylesheet href="chrome://global/skin/global.css"?>
9+
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
10+
<?xml-stylesheet href="chrome://browser/skin/sanitizeDialog.css"?>
11+
12+
<?xml-stylesheet href="chrome://browser/content/sanitizeDialog.css"?>
13+
814
<!DOCTYPE window>
915

1016
<window
@@ -22,21 +28,6 @@
2228
</hbox>
2329

2430
<linkset>
25-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
26-
<html:link
27-
rel="stylesheet"
28-
href="chrome://browser/skin/preferences/preferences.css"
29-
/>
30-
<html:link
31-
rel="stylesheet"
32-
href="chrome://browser/skin/sanitizeDialog.css"
33-
/>
34-
35-
<html:link
36-
rel="stylesheet"
37-
href="chrome://browser/content/sanitizeDialog.css"
38-
/>
39-
4031
<html:link rel="localization" href="browser/sanitize.ftl" />
4132
</linkset>
4233

‎browser/base/content/webext-panels.xhtml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# License, v. 2.0. If a copy of the MPL was not distributed with this
66
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
8+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
9+
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
10+
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
11+
812
<window id="webextpanels-window"
913
xmlns:html="http://www.w3.org/1999/xhtml"
1014
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -18,13 +22,6 @@
1822
<script src="chrome://global/content/editMenuOverlay.js"/>
1923

2024
<linkset>
21-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
22-
<html:link rel="stylesheet" href="chrome://browser/skin/" />
23-
<html:link
24-
rel="stylesheet"
25-
href="chrome://browser/content/usercontext/usercontext.css"
26-
/>
27-
2825
<html:link rel="localization" href="toolkit/branding/brandings.ftl"/>
2926
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
3027
<html:link rel="localization" href="browser/browserContext.ftl"/>

‎browser/base/content/webrtcIndicator.xhtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
- License, v. 2.0. If a copy of the MPL was not distributed with this
44
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
55

6+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
7+
<?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
8+
69
<!DOCTYPE html>
710

811
<html
@@ -13,9 +16,6 @@
1316
chromemargin="0,0,0,0"
1417
>
1518
<head>
16-
<link rel="stylesheet" href="chrome://global/skin/global.css" />
17-
<link rel="stylesheet" href="chrome://browser/skin/webRTC-indicator.css" />
18-
1919
<link rel="localization" href="branding/brand.ftl" />
2020
<link rel="localization" href="browser/webrtcIndicator.ftl" />
2121
<title data-l10n-id="webrtc-indicator-title"></title>

‎browser/base/content/webrtcLegacyIndicator.xhtml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# License, v. 2.0. If a copy of the MPL was not distributed with this
55
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
8+
<?xml-stylesheet href="chrome://browser/skin/webRTC-legacy-indicator.css" type="text/css"?>
9+
710
<!DOCTYPE window>
811

912
<window xmlns:html="http://www.w3.org/1999/xhtml"
@@ -20,12 +23,6 @@
2023
orient="horizontal"
2124
>
2225
<linkset>
23-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
24-
<html:link
25-
rel="stylesheet"
26-
href="chrome://browser/skin/webRTC-legacy-indicator.css"
27-
/>
28-
2926
<html:link rel="localization" href="branding/brand.ftl"/>
3027
<html:link rel="localization" href="browser/webrtcIndicator.ftl"/>
3128
</linkset>

‎browser/components/downloads/content/contentAreaDownloadsView.xhtml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
# License, v. 2.0. If a copy of the MPL was not distributed with this
55
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7+
<?xml-stylesheet href="chrome://global/skin/global.css"?>
8+
<?xml-stylesheet href="chrome://browser/content/downloads/contentAreaDownloadsView.css"?>
9+
<?xml-stylesheet href="chrome://browser/skin/downloads/contentAreaDownloadsView.css"?>
10+
<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
11+
<?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>
12+
713
<!DOCTYPE window>
814

915
<window id="contentAreaDownloadsView"
@@ -13,24 +19,6 @@
1319
csp="default-src chrome:; img-src chrome: moz-icon:; object-src 'none'">
1420

1521
<linkset>
16-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
17-
<html:link
18-
rel="stylesheet"
19-
href="chrome://browser/content/downloads/contentAreaDownloadsView.css"
20-
/>
21-
<html:link
22-
rel="stylesheet"
23-
href="chrome://browser/skin/downloads/contentAreaDownloadsView.css"
24-
/>
25-
<html:link
26-
rel="stylesheet"
27-
href="chrome://browser/content/downloads/downloads.css"
28-
/>
29-
<html:link
30-
rel="stylesheet"
31-
href="chrome://browser/skin/downloads/allDownloadsView.css"
32-
/>
33-
3422
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
3523
<html:link rel="localization" href="browser/downloads.ftl" />
3624
</linkset>

‎browser/components/migration/content/migration.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
7+
68
<window id="migrationWizard"
79
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
810
xmlns:html="http://www.w3.org/1999/xhtml"
@@ -13,8 +15,6 @@
1315
style="min-width: 40em;"
1416
buttons="accept,cancel">
1517
<linkset>
16-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
17-
1818
<html:link rel="localization" href="branding/brand.ftl"/>
1919
<html:link rel="localization" href="toolkit/global/wizard.ftl"/>
2020
<html:link rel="localization" href="browser/migration.ftl"/>

‎browser/components/places/content/bookmarkProperties.xhtml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
- License, v. 2.0. If a copy of the MPL was not distributed with this
55
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
66

7+
<?xml-stylesheet href="chrome://global/skin/global.css"?>
8+
<?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
9+
<?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
10+
<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
11+
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
12+
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
13+
714
<!DOCTYPE window>
815

916
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,25 +24,6 @@
1724
buttons="accept, cancel">
1825

1926
<linkset>
20-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
21-
<html:link
22-
rel="stylesheet"
23-
href="chrome://global/content/commonDialog.css"
24-
/>
25-
<html:link rel="stylesheet" href="chrome://global/skin/commonDialog.css" />
26-
<html:link
27-
rel="stylesheet"
28-
href="chrome://browser/skin/places/editBookmark.css"
29-
/>
30-
<html:link
31-
rel="stylesheet"
32-
href="chrome://browser/skin/places/tree-icons.css"
33-
/>
34-
<html:link
35-
rel="stylesheet"
36-
href="chrome://browser/content/places/places.css"
37-
/>
38-
3927
<html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
4028
</linkset>
4129

‎browser/components/places/content/bookmarksSidebar.xhtml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
- License, v. 2.0. If a copy of the MPL was not distributed with this
44
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
55

6+
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
7+
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
8+
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
9+
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
10+
<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
11+
612
<!DOCTYPE window>
713

814
<window id="bookmarksPanel"
@@ -21,24 +27,6 @@
2127
<script src="chrome://global/content/editMenuOverlay.js"/>
2228

2329
<linkset>
24-
<html:link
25-
rel="stylesheet"
26-
href="chrome://browser/content/places/places.css"
27-
/>
28-
<html:link
29-
rel="stylesheet"
30-
href="chrome://browser/content/usercontext/usercontext.css"
31-
/>
32-
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
33-
<html:link
34-
rel="stylesheet"
35-
href="chrome://browser/skin/places/tree-icons.css"
36-
/>
37-
<html:link
38-
rel="stylesheet"
39-
href="chrome://browser/skin/places/sidebar.css"
40-
/>
41-
4230
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
4331
<html:link rel="localization" href="browser/browser.ftl"/>
4432
<html:link rel="localization" href="browser/places.ftl"/>

0 commit comments

Comments
 (0)