Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 30a99a2

Browse files
committed
Bug 1419170 - Remove the statusbar and statusbarpanel bindings;r=Paolo
MozReview-Commit-ID: DbwMUBpHcri --HG-- extra : rebase_source : 0fb627a10860302ca5f31013ed7d8370eb655230
1 parent 23412ca commit 30a99a2

File tree

9 files changed

+5
-197
lines changed

9 files changed

+5
-197
lines changed

accessible/base/XULMap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
XULMAP(image, New_MaybeImageOrToolbarButtonAccessible)
6+
XULMAP(statusbar, New_StatusBarAccessible)
67
XULMAP(menuseparator, New_MenuSeparator)

accessible/base/nsAccessibilityService.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,13 @@ New_MaybeImageOrToolbarButtonAccessible(nsIContent* aContent,
272272

273273
return new ImageAccessibleWrap(aContent, aContext->Document());
274274
}
275-
276275
static Accessible*
277276
New_MenuSeparator(nsIContent* aContent, Accessible* aContext)
278277
{ return new XULMenuSeparatorAccessible(aContent, aContext->Document()); }
279278

279+
static Accessible*
280+
New_StatusBarAccessible(nsIContent* aContent, Accessible* aContext)
281+
{ return new XULStatusBarAccessible(aContent, aContext->Document()); }
280282
#endif
281283

282284
/**
@@ -1548,9 +1550,6 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
15481550
} else if (role.EqualsLiteral("xul:progressmeter")) {
15491551
accessible = new XULProgressMeterAccessible(aContent, aDoc);
15501552

1551-
} else if (role.EqualsLiteral("xul:statusbar")) {
1552-
accessible = new XULStatusBarAccessible(aContent, aDoc);
1553-
15541553
} else if (role.EqualsLiteral("xul:scale")) {
15551554
accessible = new XULSliderAccessible(aContent, aDoc);
15561555

toolkit/content/tests/chrome/chrome.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ support-files = window_preferences_onsyncfrompreference.xul
167167
[test_scrollbar.xul]
168168
[test_showcaret.xul]
169169
[test_sorttemplate.xul]
170-
[test_statusbar.xul]
171170
[test_subframe_origin.xul]
172171
[test_tabbox.xul]
173172
[test_tabindex.xul]

toolkit/content/tests/chrome/test_statusbar.xul

Lines changed: 0 additions & 42 deletions
This file was deleted.

toolkit/content/widgets/general.xml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -95,35 +95,6 @@
9595
</implementation>
9696
</binding>
9797

98-
<binding id="statusbarpanel" display="xul:button">
99-
<content>
100-
<children>
101-
<xul:label xbl:inherits="value=label,crop" crop="right" flex="1"/>
102-
</children>
103-
</content>
104-
105-
<implementation>
106-
<property name="label"
107-
onget="return this.getAttribute('label');"
108-
onset="this.setAttribute('label',val); return val;"/>
109-
<property name="image"
110-
onget="return this.getAttribute('image');"
111-
onset="this.setAttribute('image',val); return val;"/>
112-
<property name="src"
113-
onget="return this.getAttribute('src');"
114-
onset="this.setAttribute('src',val); return val;"/>
115-
</implementation>
116-
</binding>
117-
118-
<binding id="statusbar" role="xul:statusbar">
119-
<content>
120-
<children/>
121-
<xul:statusbarpanel class="statusbar-resizerpanel">
122-
<xul:resizer dir="bottomend"/>
123-
</xul:statusbarpanel>
124-
</content>
125-
</binding>
126-
12798
<binding id="deck">
12899
<implementation>
129100
<property name="selectedIndex"

toolkit/content/xul.css

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ caption {
252252
%ifndef MOZ_WIDGET_GTK
253253
titlebar,
254254
toolbar:not([nowindowdrag="true"]):not([customizing="true"]),
255-
statusbar:not([nowindowdrag="true"]),
256255
%endif
257256
windowdragbox {
258257
-moz-window-dragging: drag;
@@ -501,16 +500,6 @@ panel[type="arrow"][animating] {
501500
pointer-events: none;
502501
}
503502

504-
%ifdef XP_MACOSX
505-
.statusbar-resizerpanel {
506-
display: none;
507-
}
508-
%else
509-
window[sizemode="maximized"] statusbarpanel.statusbar-resizerpanel {
510-
visibility: collapse;
511-
}
512-
%endif
513-
514503
/******** grid **********/
515504

516505
grid {
@@ -1004,19 +993,6 @@ autorepeatbutton {
1004993
-moz-binding: url("chrome://global/content/bindings/scrollbox.xml#autorepeatbutton");
1005994
}
1006995

1007-
/********** statusbar **********/
1008-
1009-
statusbar {
1010-
-moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
1011-
%ifdef XP_MACOSX
1012-
padding-right: 14px;
1013-
%endif
1014-
}
1015-
1016-
statusbarpanel {
1017-
-moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel");
1018-
}
1019-
1020996
/********** spinbuttons ***********/
1021997

1022998
spinbuttons {

toolkit/themes/linux/global/global.css

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,31 +90,6 @@ iframe {
9090
min-height: 10px;
9191
}
9292

93-
/* ::::: statusbar ::::: */
94-
95-
statusbar {
96-
-moz-appearance: statusbar;
97-
min-height: 22px;
98-
}
99-
100-
statusbar:-moz-lwtheme {
101-
-moz-appearance: none;
102-
}
103-
104-
statusbarpanel {
105-
-moz-appearance: statusbarpanel;
106-
-moz-box-align: center;
107-
-moz-box-pack: center;
108-
padding: 0 4px;
109-
}
110-
111-
.statusbar-resizerpanel {
112-
-moz-box-align: end;
113-
-moz-box-pack: end;
114-
-moz-appearance: resizerpanel;
115-
padding: 0;
116-
}
117-
11893
/* XXXBlake yeah, shoot me -- these don't belong here. I'll move them later. */
11994

12095
sidebarheader {
@@ -137,8 +112,7 @@ toolbar[mode="text"] .toolbarbutton-text {
137112

138113
/* ::::: miscellaneous formatting ::::: */
139114

140-
:root:-moz-lwtheme,
141-
statusbarpanel:-moz-lwtheme {
115+
:root:-moz-lwtheme {
142116
-moz-appearance: none;
143117
}
144118

toolkit/themes/osx/global/global.css

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,6 @@ iframe {
9292
min-height: 10px;
9393
}
9494

95-
/* ::::: statusbar ::::: */
96-
97-
statusbar {
98-
min-width: 1px; /* DON'T DELETE!
99-
Prevents hiding of scrollbars in browser when window is made smaller.*/
100-
min-height: 15px !important;
101-
margin: 0px !important;
102-
/* need to use padding-inline-end when/if bug 631729 gets fixed: */
103-
padding: 0px 16px 1px 1px;
104-
-moz-appearance: statusbar;
105-
text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
106-
}
107-
108-
statusbarpanel {
109-
-moz-box-align: center;
110-
-moz-box-pack: center;
111-
padding: 0 4px;
112-
}
113-
11495
/* ::::: miscellaneous formatting ::::: */
11596

11697
sidebarheader {
@@ -131,13 +112,6 @@ sidebarheader {
131112
text-shadow: 1px 1px 1.5px black;
132113
}
133114

134-
statusbar:-moz-lwtheme {
135-
-moz-appearance: none;
136-
background: none;
137-
border-style: none;
138-
text-shadow: inherit;
139-
}
140-
141115
.inset {
142116
border: 1px solid ThreeDShadow;
143117
border-right-color: ThreeDHighlight;

toolkit/themes/windows/global/global.css

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -95,44 +95,6 @@ iframe {
9595
min-height: 10px;
9696
}
9797

98-
/* ::::: statusbar ::::: */
99-
100-
statusbar {
101-
-moz-appearance: statusbar;
102-
border-top: 1px solid ThreeDLightShadow;
103-
border-left: 1px solid ThreeDShadow;
104-
border-right: 1px solid ThreeDHighlight;
105-
border-bottom: 1px solid ThreeDHighlight;
106-
background-color: -moz-Dialog;
107-
min-height: 22px;
108-
}
109-
110-
statusbarpanel {
111-
-moz-appearance: statusbarpanel;
112-
-moz-box-align: center;
113-
-moz-box-pack: center;
114-
border-left: 1px solid ThreeDHighlight;
115-
border-top: 1px solid ThreeDHighlight;
116-
border-right: 1px solid ThreeDShadow;
117-
border-bottom: 1px solid ThreeDShadow;
118-
padding: 0 4px;
119-
}
120-
121-
statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
122-
-moz-appearance: none;
123-
border-top-style: none;
124-
border-bottom-style: none;
125-
border-inline-start-style: none;
126-
}
127-
128-
.statusbar-resizerpanel {
129-
-moz-box-align: end;
130-
-moz-box-pack: end;
131-
-moz-appearance: resizerpanel;
132-
padding: 0;
133-
border: none;
134-
}
135-
13698
/* XXXBlake yeah, shoot me -- these don't belong here. I'll move them later. */
13799

138100
sidebarheader {
@@ -163,12 +125,6 @@ toolbar[mode="text"] .toolbarbutton-text {
163125
text-shadow: 1px 1px 1.5px black;
164126
}
165127

166-
statusbar:-moz-lwtheme {
167-
-moz-appearance: none;
168-
background: none;
169-
border-style: none;
170-
}
171-
172128
.inset {
173129
border: 1px solid ThreeDShadow;
174130
border-right-color: ThreeDHighlight;

0 commit comments

Comments
 (0)