diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-30 07:24:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 07:24:17 +0200 |
| commit | c2fc3664d1d94178a48178b72dad462379b57449 (patch) | |
| tree | 845967451c0e210648b9607092a9bf1f83eaef70 /layout/style/nsCSSRuleProcessor.cpp | |
| parent | 86c08f4c4e41ea6de54d7353a9bfec065bcf205a (diff) | |
| parent | 6151dca6eac269a8dc4ca23552360aa7856eb9db (diff) | |
| download | UXP-c2fc3664d1d94178a48178b72dad462379b57449.tar UXP-c2fc3664d1d94178a48178b72dad462379b57449.tar.gz UXP-c2fc3664d1d94178a48178b72dad462379b57449.tar.lz UXP-c2fc3664d1d94178a48178b72dad462379b57449.tar.xz UXP-c2fc3664d1d94178a48178b72dad462379b57449.zip | |
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/nsCSSRuleProcessor.cpp')
| -rw-r--r-- | layout/style/nsCSSRuleProcessor.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index 8760a330e..810a8f8f0 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -1122,6 +1122,11 @@ InitSystemMetrics() sSystemMetrics->AppendElement(nsGkAtoms::mac_graphite_theme); } + rv = LookAndFeel::GetInt(LookAndFeel::eIntID_MacLionTheme, &metricResult); + if (NS_SUCCEEDED(rv) && metricResult) { + sSystemMetrics->AppendElement(nsGkAtoms::mac_lion_theme); + } + rv = LookAndFeel::GetInt(LookAndFeel::eIntID_MacYosemiteTheme, &metricResult); if (NS_SUCCEEDED(rv) && metricResult) { sSystemMetrics->AppendElement(nsGkAtoms::mac_yosemite_theme); @@ -1161,7 +1166,7 @@ InitSystemMetrics() if (NS_SUCCEEDED(rv) && metricResult) { sSystemMetrics->AppendElement(nsGkAtoms::touch_enabled); } - + rv = LookAndFeel::GetInt(LookAndFeel::eIntID_SwipeAnimationEnabled, &metricResult); if (NS_SUCCEEDED(rv) && metricResult) { @@ -1539,7 +1544,7 @@ checkGenericEmptyMatches(Element* aElement, do { child = aElement->GetChildAt(++index); // stop at first non-comment (and non-whitespace for - // :-moz-only-whitespace) node + // :-moz-only-whitespace) node } while (child && !IsSignificantChild(child, true, isWhitespaceSignificant)); return (child == nullptr); } @@ -2233,7 +2238,7 @@ static bool SelectorMatches(Element* aElement, NS_ASSERTION(hasAttr, "HasAttr lied"); result = AttrMatchesValue(attr, value, isHTML); } - + attr = attr->mNext; } while (attr && result); } @@ -3085,7 +3090,7 @@ nsCSSRuleProcessor::AppendFontFaceRules( if (!aArray.AppendElements(cascade->mFontFaceRules)) return false; } - + return true; } @@ -3129,7 +3134,7 @@ nsCSSRuleProcessor::AppendPageRules( return false; } } - + return true; } |