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 880596 part 6 - Factor out common method for adding animations and transitions to a layer; r=dbaron

Browse Source 
The loops for adding animations and transitions to a layer in
nsDisplayList::AddAnimationsAndTransitionsToLayer are now identical and so can
be factored out into a common method.

Since it is not possible to implicitly convert from
nsTArray<ElementPropertyTransition> to nsTArray<ElementAnimation> despite
ElementPropertyTransition being a subclass of ElementAnimation a templated
method is used. In the future, as animations and transitions share more and more
code, we should be able to remove the need for templates.
This commit is contained in:
Brian Birtles 2014-04-03 14:57:28 +09:00
parent e4bdcd3cfb
commit c4ffbc205d
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
layout/base/nsDisplayList.cpp
View File

@ -314,9 +314,9 @@ ToTimingFunction(css::ComputedTimingFunction& aCTF)
}
static void
AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
ElementAnimation* ea, Layer* aLayer,
AnimationData& aData, bool aPending)
AddAnimationForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
ElementAnimation* ea, Layer* aLayer,
AnimationData& aData, bool aPending)
{
NS_ASSERTION(aLayer->AsContainerLayer(), "Should only animate ContainerLayer");
nsStyleContext* styleContext = aFrame->StyleContext();
@ -370,6 +370,25 @@ AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
}
}
template<class T>
static void
AddAnimationsForProperty(nsIFrame* aFrame, nsCSSProperty aProperty,
nsTArray<T>& aAnimations,
Layer* aLayer, AnimationData& aData,
bool aPending) {
mozilla::TimeStamp currentTime =
aFrame->PresContext()->RefreshDriver()->MostRecentRefresh();
for (uint32_t animIdx = 0; animIdx < aAnimations.Length(); animIdx++) {
ElementAnimation* anim = &aAnimations[animIdx];
if (!(anim->HasAnimationOfProperty(aProperty) &&
anim->IsRunningAt(currentTime))) {
continue;
}
AddAnimationForProperty(aFrame, aProperty, anim, aLayer, aData, aPending);
anim->mIsRunningOnCompositor = true;
}
}
/* static */ void
nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer(Layer* aLayer,
nsDisplayListBuilder* aBuilder,
@ -424,8 +443,6 @@ nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer(Layer* aLayer,
return;
}
mozilla::TimeStamp currentTime =
aFrame->PresContext()->RefreshDriver()->MostRecentRefresh();
AnimationData data;
if (aProperty == eCSSProperty_transform) {
nsRect bounds = nsDisplayTransform::GetFrameBoundsForTransform(aFrame);
@ -462,32 +479,14 @@ nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer(Layer* aLayer,
}
if (et) {
for (uint32_t tranIdx = 0; tranIdx < et->mPropertyTransitions.Length(); tranIdx++) {
ElementPropertyTransition* pt = &et->mPropertyTransitions[tranIdx];
if (!(pt->HasAnimationOfProperty(aProperty) &&
pt->IsRunningAt(currentTime))) {
continue;
}
AddAnimationsForProperty(aFrame, aProperty, pt,
aLayer, data, pending);
pt->mIsRunningOnCompositor = true;
}
AddAnimationsForProperty(aFrame, aProperty, et->mPropertyTransitions,
aLayer, data, pending);
aLayer->SetAnimationGeneration(et->mAnimationGeneration);
}
if (ea) {
for (uint32_t animIdx = 0; animIdx < ea->mAnimations.Length(); animIdx++) {
ElementAnimation* anim = &ea->mAnimations[animIdx];
if (!(anim->HasAnimationOfProperty(aProperty) &&
anim->IsRunningAt(currentTime))) {
continue;
}
AddAnimationsForProperty(aFrame, aProperty, anim,
aLayer, data, pending);
anim->mIsRunningOnCompositor = true;
}
AddAnimationsForProperty(aFrame, aProperty, ea->mAnimations,
aLayer, data, pending);
aLayer->SetAnimationGeneration(ea->mAnimationGeneration);
}
}