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

Side by Side Diff: Source/core/animation/AnimationStack.h

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: More comprehensive non-negative length layout tests Created 5 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef AnimationStack_h 31 #ifndef AnimationStack_h
32 #define AnimationStack_h 32 #define AnimationStack_h
33 33
34 #include "core/animation/Animation.h" 34 #include "core/animation/Animation.h"
35 #include "core/animation/AnimationEffect.h" 35 #include "core/animation/AnimationEffect.h"
36 #include "core/animation/AnimationPlayer.h" 36 #include "core/animation/AnimationPlayer.h"
37 #include "core/animation/InterpolationPipeline.h"
37 #include "core/animation/SampledEffect.h" 38 #include "core/animation/SampledEffect.h"
38 #include "platform/geometry/FloatBox.h" 39 #include "platform/geometry/FloatBox.h"
39 #include "wtf/HashSet.h" 40 #include "wtf/HashSet.h"
40 #include "wtf/Vector.h" 41 #include "wtf/Vector.h"
41 42
42 namespace blink { 43 namespace blink {
43 44
44 class InertAnimation; 45 class InertAnimation;
45 46
46 class AnimationStack { 47 class AnimationStack {
47 DISALLOW_ALLOCATION(); 48 DISALLOW_ALLOCATION();
48 WTF_MAKE_NONCOPYABLE(AnimationStack); 49 WTF_MAKE_NONCOPYABLE(AnimationStack);
49 public: 50 public:
50 AnimationStack(); 51 AnimationStack();
51 52
52 void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(ef fect); } 53 void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(ef fect); }
53 bool isEmpty() const { return m_effects.isEmpty(); } 54 bool isEmpty() const { return m_effects.isEmpty(); }
54 bool affects(CSSPropertyID) const; 55 bool affects(CSSPropertyID) const;
55 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; 56 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
56 static WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember< InertAnimation> >* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<con st AnimationPlayer> >* suppressedAnimationPlayers, Animation::Priority, double t imelineCurrentTime); 57 static InterpolationPipelineMap activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillB eHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlay ers, Animation::Priority, double timelineCurrentTime);
57 58
58 bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const; 59 bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;
59 void trace(Visitor*); 60 void trace(Visitor*);
60 61
61 private: 62 private:
62 void simplifyEffects(); 63 void simplifyEffects();
63 // Effects sorted by priority. Lower priority at the start of the list. 64 // Effects sorted by priority. Lower priority at the start of the list.
64 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> > m_effects; 65 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>> m_effects;
65 66
66 friend class AnimationAnimationStackTest; 67 friend class AnimationAnimationStackTest;
67 }; 68 };
68 69
69 } // namespace blink 70 } // namespace blink
70 71
71 #endif // AnimationStack_h 72 #endif // AnimationStack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698