Fix Animations, Remove Compostior Animations.

sky/engine/core/animation/AnimationStack.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/animation/AnimationStack.h"
 
 #include <algorithm>
-#include "sky/engine/core/animation/CompositorAnimations.h"
 #include "sky/engine/core/animation/StyleInterpolation.h"
 #include "sky/engine/core/animation/css/CSSAnimations.h"
 #include "sky/engine/wtf/BitArray.h"
 #include "sky/engine/wtf/NonCopyingSort.h"
 
 namespace blink {
 
 namespace {
 
 void copyToActiveInterpolationMap(const Vector<RefPtr<blink::Interpolation> >& source, HashMap<CSSPropertyID, RefPtr<blink::Interpolation> >& target)
@@ skipping 19 matching lines @@
         }
     }
 }
 
 } // namespace
 
 AnimationStack::AnimationStack()
 {
 }
 
-bool AnimationStack::affects(CSSPropertyID property) const
-{
-    for (size_t i = 0; i < m_effects.size(); ++i) {
-        if (m_effects[i]->animation() && m_effects[i]->animation()->affects(property))
-            return true;
-    }
-    return false;
-}
-
-bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
-{
-    for (size_t i = 0; i < m_effects.size(); ++i) {
-        if (m_effects[i]->animation() && m_effects[i]->animation()->hasActiveAnimationsOnCompositor(property))
-            return true;
-    }
-    return false;
-}
-
 HashMap<CSSPropertyID, RefPtr<Interpolation> > AnimationStack::activeInterpolations(AnimationStack* animationStack, const Vector<RawPtr<InertAnimation> >* newAnimations, const HashSet<RawPtr<const AnimationPlayer> >* cancelledAnimationPlayers, Animation::Priority priority, double timelineCurrentTime)
 {
     // We don't exactly know when new animations will start, but timelineCurrentTime is a good estimate.
 
     HashMap<CSSPropertyID, RefPtr<Interpolation> > result;
 
     if (animationStack) {
         Vector<OwnPtr<SampledEffect> >& effects = animationStack->m_effects;
         // std::sort doesn't work with OwnPtrs
         nonCopyingSort(effects.begin(), effects.end(), compareEffects);
@@ skipping 31 matching lines @@
         if (!m_effects[i]->interpolations().isEmpty()) {
             m_effects[dest++].swap(m_effects[i]);
             continue;
         }
         if (m_effects[i]->animation())
             m_effects[i]->animation()->notifySampledEffectRemovedFromAnimationStack();
     }
     m_effects.shrink(dest);
 }
 
-bool AnimationStack::getAnimatedBoundingBox(FloatBox& box, CSSPropertyID property) const
-{
-    FloatBox originalBox(box);
-    for (size_t i = 0; i < m_effects.size(); ++i) {
-        if (m_effects[i]->animation() && m_effects[i]->animation()->affects(property)) {
-            Animation* anim = m_effects[i]->animation();
-            if (!anim)
-                continue;
-            const Timing& timing = anim->specifiedTiming();
-            double startRange = 0;
-            double endRange = 1;
-            timing.timingFunction->range(&startRange, &endRange);
-            FloatBox expandingBox(originalBox);
-            if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expandingBox, *anim->effect(), startRange, endRange))
-                return false;
-            box.expandTo(expandingBox);
-        }
-    }
-    return true;
-}
-
 } // namespace blink