Bug 1223658 - Part 6: Remove Animation::HasInPlayEffect and AnimationEffectReadOnly::IsInPlay. r?birtles draft
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Fri, 14 Oct 2016 19:14:12 +0900
changeset 425235 559ec5dc97df5a4ac43df25707af8266f87d896f
parent 425234 dda235d13efaec89b2efa4fd10c7089e6f176e1f
child 425236 207721d0f6adb1170f19cc1c333aeac45312c3c8
push id32372
push userbmo:hiikezoe@mozilla-japan.org
push dateFri, 14 Oct 2016 10:51:45 +0000
reviewersbirtles
bugs1223658
milestone52.0a1
Bug 1223658 - Part 6: Remove Animation::HasInPlayEffect and AnimationEffectReadOnly::IsInPlay. r?birtles MozReview-Commit-ID: JQ167ol4Ty9
dom/animation/Animation.h
dom/animation/AnimationEffectReadOnly.cpp
dom/animation/AnimationEffectReadOnly.h
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -256,20 +256,16 @@ public:
   TimeStamp AnimationTimeToTimeStamp(const StickyTimeDuration& aTime) const;
 
   bool IsPausedOrPausing() const
   {
     return PlayState() == AnimationPlayState::Paused ||
            mPendingState == PendingState::PausePending;
   }
 
-  bool HasInPlayEffect() const
-  {
-    return GetEffect() && GetEffect()->IsInPlay();
-  }
   bool HasCurrentEffect() const
   {
     return GetEffect() && GetEffect()->IsCurrent();
   }
   bool IsInEffect() const
   {
     return GetEffect() && GetEffect()->IsInEffect();
   }
--- a/dom/animation/AnimationEffectReadOnly.cpp
+++ b/dom/animation/AnimationEffectReadOnly.cpp
@@ -39,27 +39,16 @@ NS_INTERFACE_MAP_END
 AnimationEffectReadOnly::AnimationEffectReadOnly(
   nsIDocument* aDocument, AnimationEffectTimingReadOnly* aTiming)
   : mDocument(aDocument)
   , mTiming(aTiming)
 {
   MOZ_ASSERT(aTiming);
 }
 
-// https://w3c.github.io/web-animations/#in-play
-bool
-AnimationEffectReadOnly::IsInPlay() const
-{
-  if (!mAnimation || mAnimation->PlayState() == AnimationPlayState::Finished) {
-    return false;
-  }
-
-  return GetComputedTiming().mPhase == ComputedTiming::AnimationPhase::Active;
-}
-
 // https://w3c.github.io/web-animations/#current
 bool
 AnimationEffectReadOnly::IsCurrent() const
 {
   if (!mAnimation || mAnimation->PlayState() == AnimationPlayState::Finished) {
     return false;
   }
 
--- a/dom/animation/AnimationEffectReadOnly.h
+++ b/dom/animation/AnimationEffectReadOnly.h
@@ -44,17 +44,16 @@ public:
   virtual ElementPropertyTransition* AsTransition() { return nullptr; }
   virtual const ElementPropertyTransition* AsTransition() const
   {
     return nullptr;
   }
 
   nsISupports* GetParentObject() const { return mDocument; }
 
-  bool IsInPlay() const;
   bool IsCurrent() const;
   bool IsInEffect() const;
   bool IsActiveDurationZero() const
   {
     return SpecifiedTiming().ActiveDuration() == StickyTimeDuration();
   }
 
   already_AddRefed<AnimationEffectTimingReadOnly> Timing();