зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 352c30687dea (bug 1344917)
This commit is contained in:
Родитель
1ea83446a1
Коммит
07fab37fd8
|
@ -2237,7 +2237,6 @@ GK_ATOM(scrollbar_end_backward, "scrollbar-end-backward")
|
|||
GK_ATOM(scrollbar_end_forward, "scrollbar-end-forward")
|
||||
GK_ATOM(scrollbar_thumb_proportional, "scrollbar-thumb-proportional")
|
||||
GK_ATOM(overlay_scrollbars, "overlay-scrollbars")
|
||||
GK_ATOM(windows_accent_color_applies, "windows-accent-color-applies")
|
||||
GK_ATOM(windows_default_theme, "windows-default-theme")
|
||||
GK_ATOM(mac_graphite_theme, "mac-graphite-theme")
|
||||
GK_ATOM(mac_yosemite_theme, "mac-yosemite-theme")
|
||||
|
@ -2267,7 +2266,6 @@ GK_ATOM(_moz_scrollbar_end_backward, "-moz-scrollbar-end-backward")
|
|||
GK_ATOM(_moz_scrollbar_end_forward, "-moz-scrollbar-end-forward")
|
||||
GK_ATOM(_moz_scrollbar_thumb_proportional, "-moz-scrollbar-thumb-proportional")
|
||||
GK_ATOM(_moz_overlay_scrollbars, "-moz-overlay-scrollbars")
|
||||
GK_ATOM(_moz_windows_accent_color_applies, "-moz-windows-accent-color-applies")
|
||||
GK_ATOM(_moz_windows_default_theme, "-moz-windows-default-theme")
|
||||
GK_ATOM(_moz_mac_graphite_theme, "-moz-mac-graphite-theme")
|
||||
GK_ATOM(_moz_mac_yosemite_theme, "-moz-mac-yosemite-theme")
|
||||
|
|
|
@ -1132,11 +1132,6 @@ nsCSSRuleProcessor::InitSystemMetrics()
|
|||
sSystemMetrics->AppendElement(nsGkAtoms::mac_yosemite_theme);
|
||||
}
|
||||
|
||||
rv = LookAndFeel::GetInt(LookAndFeel::eIntID_WindowsAccentColorApplies, &metricResult);
|
||||
if (NS_SUCCEEDED(rv) && metricResult) {
|
||||
sSystemMetrics->AppendElement(nsGkAtoms::windows_accent_color_applies);
|
||||
}
|
||||
|
||||
rv = LookAndFeel::GetInt(LookAndFeel::eIntID_DWMCompositor, &metricResult);
|
||||
if (NS_SUCCEEDED(rv) && metricResult) {
|
||||
sSystemMetrics->AppendElement(nsGkAtoms::windows_compositor);
|
||||
|
|
|
@ -693,14 +693,6 @@ nsMediaFeatures::features[] = {
|
|||
{ &nsGkAtoms::mac_yosemite_theme },
|
||||
GetSystemMetric
|
||||
},
|
||||
{
|
||||
&nsGkAtoms::_moz_windows_accent_color_applies,
|
||||
nsMediaFeature::eMinMaxNotAllowed,
|
||||
nsMediaFeature::eBoolInteger,
|
||||
nsMediaFeature::eNoRequirements,
|
||||
{ &nsGkAtoms::windows_accent_color_applies },
|
||||
GetSystemMetric
|
||||
},
|
||||
{
|
||||
&nsGkAtoms::_moz_windows_compositor,
|
||||
nsMediaFeature::eMinMaxNotAllowed,
|
||||
|
|
|
@ -242,15 +242,6 @@ public:
|
|||
// Should menu items blink when they're chosen?
|
||||
eIntID_ChosenMenuItemsShouldBlink,
|
||||
|
||||
/*
|
||||
* A Boolean value to determine whether the Windows accent color
|
||||
* should be applied to the title bar.
|
||||
*
|
||||
* The value of this metric is not used on other platforms. These platforms
|
||||
* should return NS_ERROR_NOT_IMPLEMENTED when queried for this metric.
|
||||
*/
|
||||
eIntID_WindowsAccentColorApplies,
|
||||
|
||||
/*
|
||||
* A Boolean value to determine whether the Windows default theme is
|
||||
* being used.
|
||||
|
|
|
@ -440,12 +440,6 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
|
|||
case eIntID_DWMCompositor:
|
||||
aResult = nsUXThemeData::CheckForCompositor();
|
||||
break;
|
||||
case eIntID_WindowsAccentColorApplies:
|
||||
{
|
||||
nscolor unused;
|
||||
aResult = NS_SUCCEEDED(GetAccentColor(unused)) ? 1 : 0;
|
||||
}
|
||||
break;
|
||||
case eIntID_WindowsGlass:
|
||||
// Aero Glass is only available prior to Windows 8 when DWM is used.
|
||||
aResult = (nsUXThemeData::CheckForCompositor() && !IsWin8OrLater());
|
||||
|
|
Загрузка…
Ссылка в новой задаче