| Index: Source/core/page/animation/CompositeAnimation.h
|
| diff --git a/Source/core/page/animation/CompositeAnimation.h b/Source/core/page/animation/CompositeAnimation.h
|
| index d2f8da860c02b0d2152f640d75263a1f8e1b5a96..96221bafffe9c8fbb80622706d232ba1d1837f8d 100644
|
| --- a/Source/core/page/animation/CompositeAnimation.h
|
| +++ b/Source/core/page/animation/CompositeAnimation.h
|
| @@ -6,13 +6,13 @@
|
| * are met:
|
| *
|
| * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| + * 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.
|
| + * 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.
|
| + * 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
|
| @@ -50,7 +50,7 @@ public:
|
| };
|
|
|
| ~CompositeAnimation();
|
| -
|
| +
|
| void clearRenderer();
|
|
|
| PassRefPtr<RenderStyle> animate(RenderObject*, RenderStyle* currentStyle, RenderStyle* targetStyle);
|
| @@ -58,13 +58,13 @@ public:
|
|
|
| double timeToNextService() const;
|
| double timeToNextEvent() const;
|
| -
|
| +
|
| AnimationControllerPrivate* animationController() const { return m_animationController; }
|
|
|
| void suspendAnimations();
|
| void resumeAnimations();
|
| bool suspended() const { return m_suspended; }
|
| -
|
| +
|
| bool hasAnimations() const { return !m_transitions.isEmpty() || !m_keyframeAnimations.isEmpty(); }
|
|
|
| bool isAnimatingProperty(CSSPropertyID, bool acceleratedOnly, bool isRunningNow) const;
|
| @@ -86,7 +86,7 @@ private:
|
|
|
| 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;
|
|
|
|
|