| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef Keyframe_h | 5 #ifndef Keyframe_h |
| 6 #define Keyframe_h | 6 #define Keyframe_h |
| 7 | 7 |
| 8 #include "core/animation/AnimationEffect.h" | |
| 9 #include "core/animation/AnimationNode.h" | |
| 10 #include "core/animation/animatable/AnimatableValue.h" | |
| 11 #include "gen/sky/core/CSSPropertyNames.h" | 8 #include "gen/sky/core/CSSPropertyNames.h" |
| 9 #include "sky/engine/core/animation/AnimationEffect.h" |
| 10 #include "sky/engine/core/animation/AnimationNode.h" |
| 11 #include "sky/engine/core/animation/animatable/AnimatableValue.h" |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 typedef HashSet<CSSPropertyID> PropertySet; | 15 typedef HashSet<CSSPropertyID> PropertySet; |
| 16 | 16 |
| 17 class Element; | 17 class Element; |
| 18 | 18 |
| 19 // FIXME: Make Keyframe immutable | 19 // FIXME: Make Keyframe immutable |
| 20 class Keyframe : public RefCounted<Keyframe> { | 20 class Keyframe : public RefCounted<Keyframe> { |
| 21 public: | 21 public: |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 } | 89 } |
| 90 | 90 |
| 91 double m_offset; | 91 double m_offset; |
| 92 AnimationEffect::CompositeOperation m_composite; | 92 AnimationEffect::CompositeOperation m_composite; |
| 93 RefPtr<TimingFunction> m_easing; | 93 RefPtr<TimingFunction> m_easing; |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 } | 96 } |
| 97 | 97 |
| 98 #endif | 98 #endif |
| OLD | NEW |