Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1150810 part 11 - Add some assertions to AnimationTimeline::GetAnimations; r=jwatt

Browse Source 
--HG--
extra : commitid : 6HV2S292DtE
extra : rebase_source : 02cf7f8b0fddb3a859e1d854caf6611c1485e5d9
This commit is contained in:
Brian Birtles 2015-06-15 11:05:43 +09:00
parent 6434e79a4b
commit 0983c8cc10
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/animation/AnimationTimeline.cpp
View File

@ -19,14 +19,29 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AnimationTimeline)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
namespace {
struct AddAnimationParams {
AnimationTimeline::AnimationSequence& mSequence;
#ifdef DEBUG
// This is only used for a pointer-equality assertion
AnimationTimeline* mTimeline;
#endif
};
}
static PLDHashOperator
AppendAnimationToSequence(nsRefPtrHashKey<dom::Animation>* aKey,
void* aSequence)
void* aParams)
{
Animation* animation = aKey->GetKey();
AnimationTimeline::AnimationSequence* sequence =
static_cast<AnimationTimeline::AnimationSequence*>(aSequence);
sequence->AppendElement(animation);
AddAnimationParams* params = static_cast<AddAnimationParams*>(aParams);
MOZ_ASSERT(animation->IsRelevant(),
"Animations registered with a timeline should be relevant");
MOZ_ASSERT(animation->GetTimeline() == params->mTimeline,
"Animation should refer to this timeline");
params->mSequence.AppendElement(animation);
return PL_DHASH_NEXT;
}
@ -36,7 +51,12 @@ AnimationTimeline::GetAnimations(AnimationSequence& aAnimations)
{
// FIXME: Flush the document here (fixed in a subsequent patch)
mAnimations.EnumerateEntries(AppendAnimationToSequence, &aAnimations);
#ifdef DEBUG
AddAnimationParams params{ aAnimations, this };
#else
AddAnimationParams params{ aAnimations };
#endif
mAnimations.EnumerateEntries(AppendAnimationToSequence, &params);
}
void