Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: sky/engine/core/animation/AnimationStack.cpp

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: CompositorPendingAnimations -> PendingAnimations Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/animation/AnimationStack.h ('k') | sky/engine/core/animation/AnimationStackTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/AnimationStack.cpp
diff --git a/sky/engine/core/animation/AnimationStack.cpp b/sky/engine/core/animation/AnimationStack.cpp
index da58ac53443120b82968e2e53651c9958aa7aa3c..1017afebc4b06a8799f98d3cdc58c6d89ba03e52 100644
--- a/sky/engine/core/animation/AnimationStack.cpp
+++ b/sky/engine/core/animation/AnimationStack.cpp
@@ -32,7 +32,6 @@
#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"
@@ -72,24 +71,6 @@ 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.
@@ -141,25 +122,4 @@ void AnimationStack::simplifyEffects()
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
« no previous file with comments | « sky/engine/core/animation/AnimationStack.h ('k') | sky/engine/core/animation/AnimationStackTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698