diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
| commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
| tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /layout/style/nsStyleStruct.cpp | |
| parent | Adding debian version 124.0.1-1. (diff) | |
| download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/style/nsStyleStruct.cpp')
| -rw-r--r-- | layout/style/nsStyleStruct.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 123a1b3304..39f5b1a760 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -2020,7 +2020,7 @@ StyleTransition::StyleTransition(const StyleTransition& aCopy) = default; bool StyleTransition::operator==(const StyleTransition& aOther) const { return mTimingFunction == aOther.mTimingFunction && mDuration == aOther.mDuration && mDelay == aOther.mDelay && - mProperty == aOther.mProperty; + mProperty == aOther.mProperty && mBehavior == aOther.mBehavior; } StyleAnimation::StyleAnimation(const StyleAnimation& aCopy) = default; @@ -3079,6 +3079,7 @@ nsStyleUIReset::nsStyleUIReset() mTransitionDurationCount(1), mTransitionDelayCount(1), mTransitionPropertyCount(1), + mTransitionBehaviorCount(1), mAnimations( nsStyleAutoArray<StyleAnimation>::WITH_SINGLE_INITIAL_ELEMENT), mAnimationTimingFunctionCount(1), @@ -3120,6 +3121,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource) mTransitionDurationCount(aSource.mTransitionDurationCount), mTransitionDelayCount(aSource.mTransitionDelayCount), mTransitionPropertyCount(aSource.mTransitionPropertyCount), + mTransitionBehaviorCount(aSource.mTransitionBehaviorCount), mAnimations(aSource.mAnimations.Clone()), mAnimationTimingFunctionCount(aSource.mAnimationTimingFunctionCount), mAnimationDurationCount(aSource.mAnimationDurationCount), @@ -3178,6 +3180,7 @@ nsChangeHint nsStyleUIReset::CalcDifference( mTransitionDurationCount != aNewData.mTransitionDurationCount || mTransitionDelayCount != aNewData.mTransitionDelayCount || mTransitionPropertyCount != aNewData.mTransitionPropertyCount || + mTransitionBehaviorCount != aNewData.mTransitionBehaviorCount || mAnimations != aNewData.mAnimations || mAnimationTimingFunctionCount != aNewData.mAnimationTimingFunctionCount || @@ -3461,12 +3464,6 @@ void StyleCalcNode::ScaleLengthsBy(float aScale) { } } -nscoord StyleCalcLengthPercentage::Resolve(nscoord aBasis, - CoordRounder aRounder) const { - CSSCoord result = ResolveToCSSPixels(CSSPixel::FromAppUnits(aBasis)); - return aRounder(result * AppUnitsPerCSSPixel()); -} - bool nsStyleDisplay::PrecludesSizeContainmentOrContentVisibilityWithFrame( const nsIFrame& aFrame) const { // The spec says that in the case of SVG, the contain property only applies |