Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't cancel transitions that are almost completed (and round to their final value) when we get an unrelated style change. (Bug 613888) r=bzbarsky a2.0=blocking

Browse Source
This commit is contained in:
L. David Baron 2011-01-14 19:57:53 -08:00
parent 1e94966653
commit 3ffcee0937
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/style/nsTransitionManager.cpp
View File

@ -588,9 +588,11 @@ nsTransitionManager::ConsiderStartingTransition(nsCSSProperty aProperty,
ElementPropertyTransition pt;
nsStyleAnimation::Value dummyValue;
PRBool shouldAnimate =
PRBool haveValues =
TransExtractComputedValue(aProperty, aOldStyleContext, pt.mStartValue) &&
TransExtractComputedValue(aProperty, aNewStyleContext, pt.mEndValue) &&
TransExtractComputedValue(aProperty, aNewStyleContext, pt.mEndValue);
PRBool shouldAnimate =
haveValues &&
pt.mStartValue != pt.mEndValue &&
// Check that we can interpolate between these values
// (If this is ever a performance problem, we could add a
@ -613,13 +615,19 @@ nsTransitionManager::ConsiderStartingTransition(nsCSSProperty aProperty,
nsPresContext *presContext = aNewStyleContext->PresContext();
if (!shouldAnimate) {
if (currentIndex != nsTArray<ElementPropertyTransition>::NoIndex) {
nsTArray<ElementPropertyTransition> &pts =
aElementTransitions->mPropertyTransitions;
if (currentIndex != nsTArray<ElementPropertyTransition>::NoIndex &&
(!haveValues || pts[currentIndex].mEndValue != pt.mEndValue)) {
// We're in the middle of a transition, but just got a
// non-transition style change changing to exactly the
// current in-progress value. (This is quite easy to cause
// using 'transition-delay'.)
nsTArray<ElementPropertyTransition> &pts =
aElementTransitions->mPropertyTransitions;
//
// We also check that this current in-progress value is different
// from the end value; we don't want to cancel a transition that
// is almost done (and whose current value rounds to its end
// value) just because we got an unrelated style change.
pts.RemoveElementAt(currentIndex);
if (pts.IsEmpty()) {
aElementTransitions->Destroy();