diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-10-20 09:52:16 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-10-20 09:52:16 +0000 |
| commit | e8ae76d473088f140c73376d0f0e324559f344c5 (patch) | |
| tree | d6d3ab0488946079b8273cec1589c33e9721e039 /layout/style/nsStyleContext.cpp | |
| parent | 5072843ee383bd8ae42e50aac304a33f803c0e6a (diff) | |
| parent | 23a30020df8a4be6a96fd514fe870260b64a96a1 (diff) | |
| download | UXP-e8ae76d473088f140c73376d0f0e324559f344c5.tar UXP-e8ae76d473088f140c73376d0f0e324559f344c5.tar.gz UXP-e8ae76d473088f140c73376d0f0e324559f344c5.tar.lz UXP-e8ae76d473088f140c73376d0f0e324559f344c5.tar.xz UXP-e8ae76d473088f140c73376d0f0e324559f344c5.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'layout/style/nsStyleContext.cpp')
| -rw-r--r-- | layout/style/nsStyleContext.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp index 4b1a14897..38b422bd7 100644 --- a/layout/style/nsStyleContext.cpp +++ b/layout/style/nsStyleContext.cpp @@ -1255,6 +1255,17 @@ nsStyleContext::CalcStyleDifferenceInternal(StyleContextLike* aNewContext, } } + // NB: Calling Peek on |this|, not |thisVis| (see above). + if (!change && PeekStyleUserInterface()) { + const nsStyleUserInterface *thisVisUserInterface = thisVis->StyleUserInterface(); + const nsStyleUserInterface *otherVisUserInterface = otherVis->StyleUserInterface(); + if (thisVisUserInterface->mCaretColor != + otherVisUserInterface->mCaretColor) { + change = true; + } + } + + if (change) { hint |= nsChangeHint_RepaintFrame; } @@ -1487,6 +1498,9 @@ ExtractColor(nsCSSPropertyID aProperty, case StyleAnimationValue::eUnit_ComplexColor: return Some(aStyleContext->StyleColor()-> CalcComplexColor(val.GetStyleComplexColorValue())); + case StyleAnimationValue::eUnit_Auto: + return Some(aStyleContext->StyleColor()-> + CalcComplexColor(StyleComplexColor::Auto())); default: return Nothing(); } @@ -1508,7 +1522,8 @@ static const ColorIndexSet gVisitedIndices[2] = { { 0, 0 }, { 1, 0 } }; nscolor nsStyleContext::GetVisitedDependentColor(nsCSSPropertyID aProperty) { - NS_ASSERTION(aProperty == eCSSProperty_color || + NS_ASSERTION(aProperty == eCSSProperty_caret_color || + aProperty == eCSSProperty_color || aProperty == eCSSProperty_background_color || aProperty == eCSSProperty_border_top_color || aProperty == eCSSProperty_border_right_color || |