diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index de6d09ed1d92..2bd1e78bab07 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -3186,7 +3186,7 @@ Element::MozRequestPointerLock() } void -Element::GetAnimationPlayers(nsTArray >& aPlayers) +Element::GetAnimations(nsTArray >& aAnimations) { nsIDocument* doc = GetComposedDoc(); if (doc) { @@ -3208,7 +3208,7 @@ Element::GetAnimationPlayers(nsTArray >& aPlayers) playerIdx++) { AnimationPlayer* player = collection->mPlayers[playerIdx]; if (player->IsRelevant()) { - aPlayers.AppendElement(player); + aAnimations.AppendElement(player); } } } diff --git a/dom/base/Element.h b/dom/base/Element.h index 100243f496e1..e21dd5395bc8 100644 --- a/dom/base/Element.h +++ b/dom/base/Element.h @@ -808,7 +808,11 @@ public: { } - void GetAnimationPlayers(nsTArray >& aPlayers); + void GetAnimations(nsTArray >& aAnimations); + // Temporary alias (bug 1145246) + void GetAnimationPlayers(nsTArray >& aAnimations) { + GetAnimations(aAnimations); + } NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML); virtual void SetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError); diff --git a/dom/webidl/Animatable.webidl b/dom/webidl/Animatable.webidl index 93101adf12fe..8cda54b0bc51 100644 --- a/dom/webidl/Animatable.webidl +++ b/dom/webidl/Animatable.webidl @@ -12,6 +12,10 @@ [NoInterfaceObject] interface Animatable { + // Temporary alias for getAnimations (bug 1145246) [Func="nsDocument::IsWebAnimationsEnabled"] sequence getAnimationPlayers(); + + [Func="nsDocument::IsWebAnimationsEnabled"] + sequence getAnimations(); }; diff --git a/dom/webidl/AnimationTimeline.webidl b/dom/webidl/AnimationTimeline.webidl index 83d1f57e32dc..14d67254ba31 100644 --- a/dom/webidl/AnimationTimeline.webidl +++ b/dom/webidl/AnimationTimeline.webidl @@ -16,5 +16,5 @@ interface AnimationTimeline { readonly attribute double? currentTime; // Not yet implemented: // AnimationPlayer play (optional TimedItem? source = null); - // sequence getAnimationPlayers (); + // sequence getAnimations (); };