| 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 InterpolationEffect_h | 5 #ifndef InterpolationEffect_h |
| 6 #define InterpolationEffect_h | 6 #define InterpolationEffect_h |
| 7 | 7 |
| 8 #include "core/CoreExport.h" | 8 #include "core/CoreExport.h" |
| 9 #include "core/animation/Interpolation.h" | 9 #include "core/animation/Interpolation.h" |
| 10 #include "core/animation/Keyframe.h" | 10 #include "core/animation/Keyframe.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 double start, | 39 double start, |
| 40 double end, | 40 double end, |
| 41 double applyFrom, | 41 double applyFrom, |
| 42 double applyTo) { | 42 double applyTo) { |
| 43 m_interpolations.push_back(InterpolationRecord(std::move(interpolation), | 43 m_interpolations.push_back(InterpolationRecord(std::move(interpolation), |
| 44 std::move(easing), start, | 44 std::move(easing), start, |
| 45 end, applyFrom, applyTo)); | 45 end, applyFrom, applyTo)); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void addInterpolationsFromKeyframes( | 48 void addInterpolationsFromKeyframes( |
| 49 PropertyHandle, | 49 const PropertyHandle&, |
| 50 const Keyframe::PropertySpecificKeyframe& keyframeA, | 50 const Keyframe::PropertySpecificKeyframe& keyframeA, |
| 51 const Keyframe::PropertySpecificKeyframe& keyframeB, | 51 const Keyframe::PropertySpecificKeyframe& keyframeB, |
| 52 double applyFrom, | 52 double applyFrom, |
| 53 double applyTo); | 53 double applyTo); |
| 54 | 54 |
| 55 private: | 55 private: |
| 56 struct InterpolationRecord { | 56 struct InterpolationRecord { |
| 57 InterpolationRecord(PassRefPtr<Interpolation> interpolation, | 57 InterpolationRecord(PassRefPtr<Interpolation> interpolation, |
| 58 PassRefPtr<TimingFunction> easing, | 58 PassRefPtr<TimingFunction> easing, |
| 59 double start, | 59 double start, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 75 double m_applyTo; | 75 double m_applyTo; |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 bool m_isPopulated; | 78 bool m_isPopulated; |
| 79 Vector<InterpolationRecord> m_interpolations; | 79 Vector<InterpolationRecord> m_interpolations; |
| 80 }; | 80 }; |
| 81 | 81 |
| 82 } // namespace blink | 82 } // namespace blink |
| 83 | 83 |
| 84 #endif // InterpolationEffect_h | 84 #endif // InterpolationEffect_h |
| OLD | NEW |