Bug 1288040 (Part 3) - Get rid of RefreshResult.error, a field which nothing cares about. r=edwin

This commit is contained in:
Seth Fowler 2016-07-19 13:37:13 -07:00
parent 4af805ced1
commit 4306ec9de5
2 changed files with 0 additions and 8 deletions

View File

@ -213,7 +213,6 @@ FrameAnimator::AdvanceFrame(AnimationState& aState, TimeStamp aTime)
// Bad data
if (GetTimeoutForFrame(aState, nextFrameIndex) < 0) {
ret.animationFinished = true;
ret.error = true;
}
if (nextFrameIndex == 0) {
@ -229,7 +228,6 @@ FrameAnimator::AdvanceFrame(AnimationState& aState, TimeStamp aTime)
aState.mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime(aState);
aState.mCurrentAnimationFrameIndex = nextFrameIndex;
ret.error = true;
return ret;
}

View File

@ -152,21 +152,15 @@ public:
// Whether the animation has finished playing.
bool animationFinished : 1;
// Whether an error has occurred when trying to advance a frame. Note that
// errors do not, on their own, end the animation.
bool error : 1;
RefreshResult()
: frameAdvanced(false)
, animationFinished(false)
, error(false)
{ }
void Accumulate(const RefreshResult& other)
{
frameAdvanced = frameAdvanced || other.frameAdvanced;
animationFinished = animationFinished || other.animationFinished;
error = error || other.error;
dirtyRect = dirtyRect.Union(other.dirtyRect);
}
};