Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1208938 part 2 - Remove Animation::HasEndEventToQueue; r=heycam

Browse Source
This commit is contained in:
Brian Birtles 2015-10-07 14:30:28 +09:00
parent 9590e60a48
commit 0ea5e5c7c8
6 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/animation/Animation.cpp
View File

@ -581,8 +581,7 @@ Animation::ComposeStyle(nsRefPtr<AnimValuesStyleRule>& aStyleRule,
AnimationPlayState playState = PlayState();
if (playState == AnimationPlayState::Running ||
playState == AnimationPlayState::Pending ||
HasEndEventToQueue()) {
playState == AnimationPlayState::Pending) {
aStyleChanging = true;
}

13
dom/animation/Animation.h
View File

@ -293,19 +293,6 @@ public:
nsCSSPropertySet& aSetProperties,
bool& aStyleChanging);
// FIXME: Because we currently determine if we need refresh driver ticks
// during restyling (specifically ComposeStyle above) and not necessarily
// during a refresh driver tick, we can arrive at a situation where we
// have finished running an animation but are waiting until the next tick
// to queue the final end event. This method tells us when we are in that
// situation so we can avoid unregistering from the refresh driver until
// we've finished dispatching events.
//
// This is a temporary measure until bug 1195180 is done and we can do all
// our registering and unregistering within a tick callback.
virtual bool HasEndEventToQueue() const { return false; }
void NotifyEffectTimingUpdated();
protected:

15
layout/style/nsAnimationManager.cpp
View File

@ -275,21 +275,6 @@ CSSAnimation::QueueEvents()
this));
}
bool
CSSAnimation::HasEndEventToQueue() const
{
if (!mEffect) {
return false;
}
bool wasActive = mPreviousPhaseOrIteration != PREVIOUS_PHASE_BEFORE &&
mPreviousPhaseOrIteration != PREVIOUS_PHASE_AFTER;
bool isActive = mEffect->GetComputedTiming().mPhase ==
ComputedTiming::AnimationPhase_Active;
return wasActive && !isActive;
}
CommonAnimationManager*
CSSAnimation::GetAnimationManager() const
{

1
layout/style/nsAnimationManager.h
View File

@ -126,7 +126,6 @@ public:
void Tick() override;
void QueueEvents();
bool HasEndEventToQueue() const override;
bool IsStylePaused() const { return mIsStylePaused; }

11
layout/style/nsTransitionManager.cpp
View File

@ -155,17 +155,6 @@ CSSTransition::QueueEvents()
this));
}
bool
CSSTransition::HasEndEventToQueue() const
{
if (!mEffect) {
return false;
}
return !mWasFinishedOnLastTick &&
PlayState() == AnimationPlayState::Finished;
}
void
CSSTransition::Tick()
{

1
layout/style/nsTransitionManager.h
View File

@ -164,7 +164,6 @@ protected:
SyncNotifyFlag aSyncNotifyFlag) override;
void QueueEvents();
bool HasEndEventToQueue() const override;
// The (pseudo-)element whose computed transition-property refers to this
// transition (if any).