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

Side by Side Diff: Source/core/page/animation/CompositeAnimation.h

Issue 14556022: Simplify animation testing API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 years, 7 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 bool hasAnimations() const { return !m_transitions.isEmpty() || !m_keyframe Animations.isEmpty(); } 69 bool hasAnimations() const { return !m_transitions.isEmpty() || !m_keyframe Animations.isEmpty(); }
70 70
71 bool isAnimatingProperty(CSSPropertyID, bool acceleratedOnly, bool isRunning Now) const; 71 bool isAnimatingProperty(CSSPropertyID, bool acceleratedOnly, bool isRunning Now) const;
72 72
73 PassRefPtr<KeyframeAnimation> getAnimationForProperty(CSSPropertyID) const; 73 PassRefPtr<KeyframeAnimation> getAnimationForProperty(CSSPropertyID) const;
74 74
75 void overrideImplicitAnimations(CSSPropertyID); 75 void overrideImplicitAnimations(CSSPropertyID);
76 void resumeOverriddenImplicitAnimations(CSSPropertyID); 76 void resumeOverriddenImplicitAnimations(CSSPropertyID);
77 77
78 bool pauseAnimationAtTime(const AtomicString& name, double t); 78 void pauseAnimationsForTesting(double t);
79 bool pauseTransitionAtTime(CSSPropertyID, double);
80 unsigned numberOfActiveAnimations() const; 79 unsigned numberOfActiveAnimations() const;
81 80
82 private: 81 private:
83 CompositeAnimation(AnimationControllerPrivate* animationController) 82 CompositeAnimation(AnimationControllerPrivate* animationController)
84 : m_animationController(animationController) 83 : m_animationController(animationController)
85 , m_suspended(false) 84 , m_suspended(false)
86 { 85 {
87 } 86 }
88 87
89 void updateTransitions(RenderObject*, RenderStyle* currentStyle, RenderStyle * targetStyle); 88 void updateTransitions(RenderObject*, RenderStyle* currentStyle, RenderStyle * targetStyle);
90 void updateKeyframeAnimations(RenderObject*, RenderStyle* currentStyle, Rend erStyle* targetStyle); 89 void updateKeyframeAnimations(RenderObject*, RenderStyle* currentStyle, Rend erStyle* targetStyle);
91 90
92 typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap; 91 typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap;
93 typedef HashMap<AtomicStringImpl*, RefPtr<KeyframeAnimation> > AnimationNam eMap; 92 typedef HashMap<AtomicStringImpl*, RefPtr<KeyframeAnimation> > AnimationNam eMap;
94 93
95 AnimationControllerPrivate* m_animationController; 94 AnimationControllerPrivate* m_animationController;
96 CSSPropertyTransitionsMap m_transitions; 95 CSSPropertyTransitionsMap m_transitions;
97 AnimationNameMap m_keyframeAnimations; 96 AnimationNameMap m_keyframeAnimations;
98 Vector<AtomicStringImpl*> m_keyframeAnimationOrderMap; 97 Vector<AtomicStringImpl*> m_keyframeAnimationOrderMap;
99 bool m_suspended; 98 bool m_suspended;
100 }; 99 };
101 100
102 } // namespace WebCore 101 } // namespace WebCore
103 102
104 #endif // CompositeAnimation_h 103 #endif // CompositeAnimation_h
OLDNEW
« no previous file with comments | « Source/core/page/animation/CSSPropertyAnimation.cpp ('k') | Source/core/page/animation/CompositeAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698