wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 827687: Fix edge case in calculation of whichIteration. r=bzbarsky

Browse Source
This commit is contained in:
L. David Baron 2013-01-10 21:14:51 -08:00
parent 848bcb296f
commit c5a674d40c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/style/nsAnimationManager.cpp
View File

@ -12,6 +12,7 @@
#include "nsSMILKeySpline.h"
#include "nsEventDispatcher.h"
#include "nsCSSFrameConstructor.h"
#include <math.h>
using namespace mozilla;
using namespace mozilla::css;
@ -94,15 +95,14 @@ ElementAnimations::GetPositionInIteration(TimeDuration aElapsedDuration,
// Set |positionInIteration| to the position from 0% to 100% along
// the keyframes.
NS_ABORT_IF_FALSE(currentIterationCount >= 0.0, "must be positive");
uint32_t whichIteration = int(currentIterationCount);
if (whichIteration == aIterationCount && whichIteration != 0) {
double whichIteration = floor(currentIterationCount);
if (whichIteration == aIterationCount && whichIteration != 0.0) {
// When the animation's iteration count is an integer (as it
// normally is), we need to end at 100% of its last iteration
// rather than 0% of the next one (unless it's zero).
--whichIteration;
whichIteration -= 1.0;
}
double positionInIteration =
currentIterationCount - double(whichIteration);
double positionInIteration = currentIterationCount - whichIteration;
bool thisIterationReverse = false;
switch (aDirection) {
@ -113,10 +113,15 @@ ElementAnimations::GetPositionInIteration(TimeDuration aElapsedDuration,
thisIterationReverse = true;
break;
case NS_STYLE_ANIMATION_DIRECTION_ALTERNATE:
thisIterationReverse = (whichIteration & 1) == 1;
// uint64_t has more integer precision than double does, so if
// whichIteration is that large, we've already lost and we're just
// guessing. But the animation is presumably oscillating so fast
// it doesn't matter anyway.
thisIterationReverse = (uint64_t(whichIteration) & 1) == 1;
break;
case NS_STYLE_ANIMATION_DIRECTION_ALTERNATE_REVERSE:
thisIterationReverse = (whichIteration & 1) == 0;
// see as previous case
thisIterationReverse = (uint64_t(whichIteration) & 1) == 0;
break;
}
if (thisIterationReverse) {