| Index: Source/core/frame/animation/CompositeAnimation.h
|
| diff --git a/Source/core/frame/animation/CompositeAnimation.h b/Source/core/frame/animation/CompositeAnimation.h
|
| deleted file mode 100644
|
| index ee0bd46728873c3fcf22510ecd7b5b70aa94ab06..0000000000000000000000000000000000000000
|
| --- a/Source/core/frame/animation/CompositeAnimation.h
|
| +++ /dev/null
|
| @@ -1,96 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2007 Apple 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:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
|
| - * its contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
|
| - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| - * LOSS OF USE, 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.
|
| - */
|
| -
|
| -#ifndef CompositeAnimation_h
|
| -#define CompositeAnimation_h
|
| -
|
| -#include "core/frame/animation/ImplicitAnimation.h"
|
| -#include "core/frame/animation/KeyframeAnimation.h"
|
| -#include "wtf/HashMap.h"
|
| -
|
| -namespace WebCore {
|
| -
|
| -class AnimationControllerPrivate;
|
| -class AnimationController;
|
| -class RenderObject;
|
| -class RenderStyle;
|
| -
|
| -// A CompositeAnimation represents a collection of animations that are running
|
| -// on a single RenderObject, such as a number of properties transitioning at once.
|
| -class CompositeAnimation : public RefCounted<CompositeAnimation> {
|
| -public:
|
| - static PassRefPtr<CompositeAnimation> create(AnimationControllerPrivate* animationController)
|
| - {
|
| - return adoptRef(new CompositeAnimation(animationController));
|
| - };
|
| -
|
| - ~CompositeAnimation();
|
| -
|
| - void clearRenderer();
|
| -
|
| - PassRefPtr<RenderStyle> animate(RenderObject&, RenderStyle* currentStyle, RenderStyle& targetStyle);
|
| - PassRefPtr<RenderStyle> getAnimatedStyle() const;
|
| -
|
| - double timeToNextService() const;
|
| - double timeToNextEvent() const;
|
| -
|
| - AnimationControllerPrivate* animationController() const { return m_animationController; }
|
| -
|
| - bool hasAnimations() const { return !m_transitions.isEmpty() || !m_keyframeAnimations.isEmpty(); }
|
| -
|
| - bool isAnimatingProperty(CSSPropertyID, bool acceleratedOnly, bool isRunningNow) const;
|
| -
|
| - PassRefPtr<KeyframeAnimation> getAnimationForProperty(CSSPropertyID) const;
|
| -
|
| - void overrideImplicitAnimations(CSSPropertyID);
|
| - void resumeOverriddenImplicitAnimations(CSSPropertyID);
|
| -
|
| - void pauseAnimationsForTesting(double t);
|
| - unsigned numberOfActiveAnimations() const;
|
| -
|
| -private:
|
| - CompositeAnimation(AnimationControllerPrivate* animationController)
|
| - : m_animationController(animationController)
|
| - {
|
| - }
|
| -
|
| - void updateTransitions(RenderObject&, RenderStyle* currentStyle, RenderStyle& targetStyle);
|
| - void updateKeyframeAnimations(RenderObject&, RenderStyle* currentStyle, RenderStyle& targetStyle);
|
| -
|
| - typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap;
|
| - typedef HashMap<AtomicString, RefPtr<KeyframeAnimation> > AnimationNameMap;
|
| -
|
| - AnimationControllerPrivate* m_animationController;
|
| - CSSPropertyTransitionsMap m_transitions;
|
| - AnimationNameMap m_keyframeAnimations;
|
| - Vector<AtomicString> m_keyframeAnimationOrderList;
|
| -};
|
| -
|
| -} // namespace WebCore
|
| -
|
| -#endif // CompositeAnimation_h
|
|
|