summaryrefslogtreecommitdiff
path: root/layout/style/nsMediaFeatures.cpp
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-06-30 07:24:17 +0200
committerGitHub <noreply@github.com>2018-06-30 07:24:17 +0200
commitc2fc3664d1d94178a48178b72dad462379b57449 (patch)
tree845967451c0e210648b9607092a9bf1f83eaef70 /layout/style/nsMediaFeatures.cpp
parent86c08f4c4e41ea6de54d7353a9bfec065bcf205a (diff)
parent6151dca6eac269a8dc4ca23552360aa7856eb9db (diff)
downloaduxp-c2fc3664d1d94178a48178b72dad462379b57449.tar.gz
Merge pull request #567 from SpockMan02/moz-mac-lion-theme
Undo Mozilla Bug 1302937; Reinstate -moz-mac-lion-theme media query
Diffstat (limited to 'layout/style/nsMediaFeatures.cpp')
-rw-r--r--layout/style/nsMediaFeatures.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index 5a54d5455d..854236e511 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -706,6 +706,14 @@ nsMediaFeatures::features[] = {
GetSystemMetric
},
{
+ &nsGkAtoms::_moz_mac_lion_theme,
+ nsMediaFeature::eMinMaxNotAllowed,
+ nsMediaFeature::eBoolInteger,
+ nsMediaFeature::eNoRequirements,
+ { &nsGkAtoms::mac_lion_theme },
+ GetSystemMetric
+ },
+ {
&nsGkAtoms::_moz_mac_yosemite_theme,
nsMediaFeature::eMinMaxNotAllowed,
nsMediaFeature::eBoolInteger,
@@ -728,7 +736,7 @@ nsMediaFeatures::features[] = {
nsMediaFeature::eNoRequirements,
{ &nsGkAtoms::windows_accent_color_is_dark },
GetSystemMetric
- },
+ },
{
&nsGkAtoms::_moz_windows_compositor,
nsMediaFeature::eMinMaxNotAllowed,