Chromium Code Reviews Chromium Code Reviews
Issue 811993002:
Animation: Implement DoubleStyleInterpolation in StringKeyframe (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| 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/CSSPropertyNames.h" | 8 #include "core/CSSPropertyNames.h" |
| 9 #include "core/animation/AnimationEffect.h" | 9 #include "core/animation/AnimationEffect.h" |
| 10 #include "core/animation/AnimationNode.h" | 10 #include "core/animation/AnimationNode.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 virtual bool isStringPropertySpecificKeyframe() const { return false; } | 64 virtual bool isStringPropertySpecificKeyframe() const { return false; } |
| 65 | 65 |
| 66 virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe (double offset, PassRefPtr<TimingFunction> easing) const = 0; | 66 virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe (double offset, PassRefPtr<TimingFunction> easing) const = 0; |
| 67 virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(C SSPropertyID, blink::Keyframe::PropertySpecificKeyframe& end, Element*) const = 0; | 67 virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(C SSPropertyID, blink::Keyframe::PropertySpecificKeyframe& end, Element*) const = 0; |
| 68 | 68 |
| 69 virtual void trace(Visitor*) { } | 69 virtual void trace(Visitor*) { } |
| 70 | 70 |
| 71 protected: | 71 protected: |
| 72 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, AnimationEffect::CompositeOperation); | 72 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, AnimationEffect::CompositeOperation); |
| 73 | 73 |
| 74 | |
|
Eric Willigers
2015/01/22 23:38:56
No need for this extra line
| |
| 74 double m_offset; | 75 double m_offset; |
| 75 RefPtr<TimingFunction> m_easing; | 76 RefPtr<TimingFunction> m_easing; |
| 76 AnimationEffect::CompositeOperation m_composite; | 77 AnimationEffect::CompositeOperation m_composite; |
| 77 }; | 78 }; |
| 78 | 79 |
| 79 virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> createPropertySpeci ficKeyframe(CSSPropertyID) const = 0; | 80 virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> createPropertySpeci ficKeyframe(CSSPropertyID) const = 0; |
| 80 | 81 |
| 81 protected: | 82 protected: |
| 82 Keyframe() | 83 Keyframe() |
| 83 : m_offset(nullValue()) | 84 : m_offset(nullValue()) |
| 84 , m_composite(AnimationEffect::CompositeReplace) | 85 , m_composite(AnimationEffect::CompositeReplace) |
| 85 , m_easing(LinearTimingFunction::shared()) | 86 , m_easing(LinearTimingFunction::shared()) |
| 86 { | 87 { |
| 87 } | 88 } |
| 88 Keyframe(double offset, AnimationEffect::CompositeOperation composite, PassR efPtr<TimingFunction> easing) | 89 Keyframe(double offset, AnimationEffect::CompositeOperation composite, PassR efPtr<TimingFunction> easing) |
| 89 : m_offset(offset) | 90 : m_offset(offset) |
| 90 , m_composite(composite) | 91 , m_composite(composite) |
| 91 , m_easing(easing) | 92 , m_easing(easing) |
| 92 { | 93 { |
| 93 } | 94 } |
| 94 | 95 |
| 95 double m_offset; | 96 double m_offset; |
| 96 AnimationEffect::CompositeOperation m_composite; | 97 AnimationEffect::CompositeOperation m_composite; |
| 97 RefPtr<TimingFunction> m_easing; | 98 RefPtr<TimingFunction> m_easing; |
| 98 }; | 99 }; |
| 99 | 100 |
| 100 } // namespace blink | 101 } // namespace blink |
| 101 | 102 |
| 102 #endif // Keyframe_h | 103 #endif // Keyframe_h |
| OLD | NEW |
