diff options
Diffstat (limited to 'cc/layer_animation_controller.cc')
| -rw-r--r-- | cc/layer_animation_controller.cc | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc index 857e576..c72df04 100644 --- a/cc/layer_animation_controller.cc +++ b/cc/layer_animation_controller.cc @@ -4,7 +4,7 @@ #include "cc/layer_animation_controller.h" -#include "cc/animation.h" +#include "cc/active_animation.h" #include "cc/animation_registrar.h" #include "cc/keyframed_animation_curve.h" #include "cc/layer_animation_value_observer.h" @@ -35,7 +35,7 @@ void LayerAnimationController::pauseAnimation(int animationId, double timeOffset { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { if (m_activeAnimations[i]->id() == animationId) - m_activeAnimations[i]->setRunState(Animation::Paused, timeOffset + m_activeAnimations[i]->startTime()); + m_activeAnimations[i]->setRunState(ActiveAnimation::Paused, timeOffset + m_activeAnimations[i]->startTime()); } } @@ -50,7 +50,7 @@ void LayerAnimationController::removeAnimation(int animationId) updateActivation(); } -void LayerAnimationController::removeAnimation(int animationId, Animation::TargetProperty targetProperty) +void LayerAnimationController::removeAnimation(int animationId, ActiveAnimation::TargetProperty targetProperty) { for (size_t i = 0; i < m_activeAnimations.size();) { if (m_activeAnimations[i]->id() == animationId && m_activeAnimations[i]->targetProperty() == targetProperty) @@ -66,7 +66,7 @@ void LayerAnimationController::suspendAnimations(double monotonicTime) { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { if (!m_activeAnimations[i]->isFinished()) - m_activeAnimations[i]->setRunState(Animation::Paused, monotonicTime); + m_activeAnimations[i]->setRunState(ActiveAnimation::Paused, monotonicTime); } } @@ -74,8 +74,8 @@ void LayerAnimationController::suspendAnimations(double monotonicTime) void LayerAnimationController::resumeAnimations(double monotonicTime) { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::Paused) - m_activeAnimations[i]->setRunState(Animation::Running, monotonicTime); + if (m_activeAnimations[i]->runState() == ActiveAnimation::Paused) + m_activeAnimations[i]->setRunState(ActiveAnimation::Running, monotonicTime); } } @@ -114,13 +114,13 @@ void LayerAnimationController::animate(double monotonicTime, AnimationEventsVect updateActivation(); } -void LayerAnimationController::addAnimation(scoped_ptr<Animation> animation) +void LayerAnimationController::addAnimation(scoped_ptr<ActiveAnimation> animation) { m_activeAnimations.append(animation.Pass()); updateActivation(); } -Animation* LayerAnimationController::getAnimation(int groupId, Animation::TargetProperty targetProperty) const +ActiveAnimation* LayerAnimationController::getActiveAnimation(int groupId, ActiveAnimation::TargetProperty targetProperty) const { for (size_t i = 0; i < m_activeAnimations.size(); ++i) if (m_activeAnimations[i]->group() == groupId && m_activeAnimations[i]->targetProperty() == targetProperty) @@ -128,7 +128,7 @@ Animation* LayerAnimationController::getAnimation(int groupId, Animation::Target return 0; } -Animation* LayerAnimationController::getAnimation(Animation::TargetProperty targetProperty) const +ActiveAnimation* LayerAnimationController::getActiveAnimation(ActiveAnimation::TargetProperty targetProperty) const { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { size_t index = m_activeAnimations.size() - i - 1; @@ -147,10 +147,10 @@ bool LayerAnimationController::hasActiveAnimation() const return false; } -bool LayerAnimationController::isAnimatingProperty(Animation::TargetProperty targetProperty) const +bool LayerAnimationController::isAnimatingProperty(ActiveAnimation::TargetProperty targetProperty) const { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() != Animation::Finished && m_activeAnimations[i]->runState() != Animation::Aborted && m_activeAnimations[i]->targetProperty() == targetProperty) + if (m_activeAnimations[i]->runState() != ActiveAnimation::Finished && m_activeAnimations[i]->runState() != ActiveAnimation::Aborted && m_activeAnimations[i]->targetProperty() == targetProperty) return true; } return false; @@ -199,7 +199,7 @@ void LayerAnimationController::pushNewAnimationsToImplThread(LayerAnimationContr // Any new animations owned by the main thread's controller are cloned and adde to the impl thread's controller. for (size_t i = 0; i < m_activeAnimations.size(); ++i) { // If the animation is already running on the impl thread, there is no need to copy it over. - if (controllerImpl->getAnimation(m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty())) + if (controllerImpl->getActiveAnimation(m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty())) continue; // If the animation is not running on the impl thread, it does not necessarily mean that it needs @@ -210,9 +210,9 @@ void LayerAnimationController::pushNewAnimationsToImplThread(LayerAnimationContr continue; // The new animation should be set to run as soon as possible. - Animation::RunState initialRunState = Animation::WaitingForTargetAvailability; + ActiveAnimation::RunState initialRunState = ActiveAnimation::WaitingForTargetAvailability; double startTime = 0; - scoped_ptr<Animation> toAdd(m_activeAnimations[i]->cloneAndInitialize(Animation::ControllingInstance, initialRunState, startTime)); + scoped_ptr<ActiveAnimation> toAdd(m_activeAnimations[i]->cloneAndInitialize(ActiveAnimation::ControllingInstance, initialRunState, startTime)); DCHECK(!toAdd->needsSynchronizedStartTime()); controllerImpl->addAnimation(toAdd.Pass()); } @@ -224,7 +224,7 @@ void LayerAnimationController::removeAnimationsCompletedOnMainThread(LayerAnimat // Each iteration, controller->m_activeAnimations.size() is decremented or i is incremented // guaranteeing progress towards loop termination. for (size_t i = 0; i < controllerImpl->m_activeAnimations.size();) { - Animation* current = getAnimation(controllerImpl->m_activeAnimations[i]->group(), controllerImpl->m_activeAnimations[i]->targetProperty()); + ActiveAnimation* current = getActiveAnimation(controllerImpl->m_activeAnimations[i]->group(), controllerImpl->m_activeAnimations[i]->targetProperty()); if (!current) controllerImpl->m_activeAnimations.remove(i); else @@ -235,7 +235,7 @@ void LayerAnimationController::removeAnimationsCompletedOnMainThread(LayerAnimat void LayerAnimationController::pushPropertiesToImplThread(LayerAnimationController* controllerImpl) const { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - Animation* currentImpl = controllerImpl->getAnimation(m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty()); + ActiveAnimation* currentImpl = controllerImpl->getActiveAnimation(m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty()); if (currentImpl) m_activeAnimations[i]->pushPropertiesTo(currentImpl); } @@ -244,8 +244,8 @@ void LayerAnimationController::pushPropertiesToImplThread(LayerAnimationControll void LayerAnimationController::startAnimationsWaitingForNextTick(double monotonicTime, AnimationEventsVector* events) { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::WaitingForNextTick) { - m_activeAnimations[i]->setRunState(Animation::Running, monotonicTime); + if (m_activeAnimations[i]->runState() == ActiveAnimation::WaitingForNextTick) { + m_activeAnimations[i]->setRunState(ActiveAnimation::Running, monotonicTime); if (!m_activeAnimations[i]->hasSetStartTime()) m_activeAnimations[i]->setStartTime(monotonicTime); if (events) @@ -257,8 +257,8 @@ void LayerAnimationController::startAnimationsWaitingForNextTick(double monotoni void LayerAnimationController::startAnimationsWaitingForStartTime(double monotonicTime, AnimationEventsVector* events) { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::WaitingForStartTime && m_activeAnimations[i]->startTime() <= monotonicTime) { - m_activeAnimations[i]->setRunState(Animation::Running, monotonicTime); + if (m_activeAnimations[i]->runState() == ActiveAnimation::WaitingForStartTime && m_activeAnimations[i]->startTime() <= monotonicTime) { + m_activeAnimations[i]->setRunState(ActiveAnimation::Running, monotonicTime); if (events) events->push_back(AnimationEvent(AnimationEvent::Started, m_id, m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); } @@ -270,12 +270,12 @@ void LayerAnimationController::startAnimationsWaitingForTargetAvailability(doubl // First collect running properties. TargetProperties blockedProperties; for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::Running || m_activeAnimations[i]->runState() == Animation::Finished) + if (m_activeAnimations[i]->runState() == ActiveAnimation::Running || m_activeAnimations[i]->runState() == ActiveAnimation::Finished) blockedProperties.insert(m_activeAnimations[i]->targetProperty()); } for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::WaitingForTargetAvailability) { + if (m_activeAnimations[i]->runState() == ActiveAnimation::WaitingForTargetAvailability) { // Collect all properties for animations with the same group id (they should all also be in the list of animations). TargetProperties enqueuedProperties; enqueuedProperties.insert(m_activeAnimations[i]->targetProperty()); @@ -295,14 +295,14 @@ void LayerAnimationController::startAnimationsWaitingForTargetAvailability(doubl // If the intersection is null, then we are free to start the animations in the group. if (nullIntersection) { - m_activeAnimations[i]->setRunState(Animation::Running, monotonicTime); + m_activeAnimations[i]->setRunState(ActiveAnimation::Running, monotonicTime); if (!m_activeAnimations[i]->hasSetStartTime()) m_activeAnimations[i]->setStartTime(monotonicTime); if (events) events->push_back(AnimationEvent(AnimationEvent::Started, m_id, m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); for (size_t j = i + 1; j < m_activeAnimations.size(); ++j) { if (m_activeAnimations[i]->group() == m_activeAnimations[j]->group()) { - m_activeAnimations[j]->setRunState(Animation::Running, monotonicTime); + m_activeAnimations[j]->setRunState(ActiveAnimation::Running, monotonicTime); if (!m_activeAnimations[j]->hasSetStartTime()) m_activeAnimations[j]->setStartTime(monotonicTime); } @@ -320,13 +320,13 @@ void LayerAnimationController::resolveConflicts(double monotonicTime) // (2) has an equal start time, but was added to the queue earlier, i.e., // has a lower index in m_activeAnimations). for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::Running) { + if (m_activeAnimations[i]->runState() == ActiveAnimation::Running) { for (size_t j = i + 1; j < m_activeAnimations.size(); ++j) { - if (m_activeAnimations[j]->runState() == Animation::Running && m_activeAnimations[i]->targetProperty() == m_activeAnimations[j]->targetProperty()) { + if (m_activeAnimations[j]->runState() == ActiveAnimation::Running && m_activeAnimations[i]->targetProperty() == m_activeAnimations[j]->targetProperty()) { if (m_activeAnimations[i]->startTime() > m_activeAnimations[j]->startTime()) - m_activeAnimations[j]->setRunState(Animation::Aborted, monotonicTime); + m_activeAnimations[j]->setRunState(ActiveAnimation::Aborted, monotonicTime); else - m_activeAnimations[i]->setRunState(Animation::Aborted, monotonicTime); + m_activeAnimations[i]->setRunState(ActiveAnimation::Aborted, monotonicTime); } } } @@ -356,7 +356,7 @@ void LayerAnimationController::markAnimationsForDeletion(double monotonicTime, A if (groupId == m_activeAnimations[j]->group()) { if (events) events->push_back(AnimationEvent(AnimationEvent::Finished, m_id, m_activeAnimations[j]->group(), m_activeAnimations[j]->targetProperty(), monotonicTime)); - m_activeAnimations[j]->setRunState(Animation::WaitingForDeletion, monotonicTime); + m_activeAnimations[j]->setRunState(ActiveAnimation::WaitingForDeletion, monotonicTime); } } } @@ -366,7 +366,7 @@ void LayerAnimationController::markAnimationsForDeletion(double monotonicTime, A void LayerAnimationController::purgeAnimationsMarkedForDeletion() { for (size_t i = 0; i < m_activeAnimations.size();) { - if (m_activeAnimations[i]->runState() == Animation::WaitingForDeletion) + if (m_activeAnimations[i]->runState() == ActiveAnimation::WaitingForDeletion) m_activeAnimations.remove(i); else i++; @@ -377,15 +377,15 @@ void LayerAnimationController::replaceImplThreadAnimations(LayerAnimationControl { controllerImpl->m_activeAnimations.clear(); for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - scoped_ptr<Animation> toAdd; + scoped_ptr<ActiveAnimation> toAdd; if (m_activeAnimations[i]->needsSynchronizedStartTime()) { // We haven't received an animation started notification yet, so it // is important that we add it in a 'waiting' and not 'running' state. - Animation::RunState initialRunState = Animation::WaitingForTargetAvailability; + ActiveAnimation::RunState initialRunState = ActiveAnimation::WaitingForTargetAvailability; double startTime = 0; - toAdd = m_activeAnimations[i]->cloneAndInitialize(Animation::ControllingInstance, initialRunState, startTime).Pass(); + toAdd = m_activeAnimations[i]->cloneAndInitialize(ActiveAnimation::ControllingInstance, initialRunState, startTime).Pass(); } else - toAdd = m_activeAnimations[i]->clone(Animation::ControllingInstance).Pass(); + toAdd = m_activeAnimations[i]->clone(ActiveAnimation::ControllingInstance).Pass(); controllerImpl->addAnimation(toAdd.Pass()); } @@ -394,7 +394,7 @@ void LayerAnimationController::replaceImplThreadAnimations(LayerAnimationControl void LayerAnimationController::tickAnimations(double monotonicTime) { for (size_t i = 0; i < m_activeAnimations.size(); ++i) { - if (m_activeAnimations[i]->runState() == Animation::Running || m_activeAnimations[i]->runState() == Animation::Paused) { + if (m_activeAnimations[i]->runState() == ActiveAnimation::Running || m_activeAnimations[i]->runState() == ActiveAnimation::Paused) { double trimmed = m_activeAnimations[i]->trimTimeToCurrentIteration(monotonicTime); // Animation assumes its initial value until it gets the synchronized start time @@ -404,28 +404,28 @@ void LayerAnimationController::tickAnimations(double monotonicTime) switch (m_activeAnimations[i]->targetProperty()) { - case Animation::Transform: { + case ActiveAnimation::Transform: { const TransformAnimationCurve* transformAnimationCurve = m_activeAnimations[i]->curve()->toTransformAnimationCurve(); const gfx::Transform transform = transformAnimationCurve->getValue(trimmed).toTransform(); if (m_activeAnimations[i]->isFinishedAt(monotonicTime)) - m_activeAnimations[i]->setRunState(Animation::Finished, monotonicTime); + m_activeAnimations[i]->setRunState(ActiveAnimation::Finished, monotonicTime); notifyObserversTransformAnimated(transform); break; } - case Animation::Opacity: { + case ActiveAnimation::Opacity: { const FloatAnimationCurve* floatAnimationCurve = m_activeAnimations[i]->curve()->toFloatAnimationCurve(); const float opacity = floatAnimationCurve->getValue(trimmed); if (m_activeAnimations[i]->isFinishedAt(monotonicTime)) - m_activeAnimations[i]->setRunState(Animation::Finished, monotonicTime); + m_activeAnimations[i]->setRunState(ActiveAnimation::Finished, monotonicTime); notifyObserversOpacityAnimated(opacity); break; } // Do nothing for sentinel value. - case Animation::TargetPropertyEnumSize: + case ActiveAnimation::TargetPropertyEnumSize: NOTREACHED(); } } |