| 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 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/animation/InterpolableValue.h" | 6 #include "core/animation/InterpolableValue.h" |
| 7 | 7 |
| 8 namespace blink { | 8 namespace blink { |
| 9 | 9 |
| 10 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue); | |
| 11 | |
| 12 void InterpolableNumber::interpolate(const InterpolableValue &to, const double p
rogress, InterpolableValue& result) const | 10 void InterpolableNumber::interpolate(const InterpolableValue &to, const double p
rogress, InterpolableValue& result) const |
| 13 { | 11 { |
| 14 const InterpolableNumber& toNumber = toInterpolableNumber(to); | 12 const InterpolableNumber& toNumber = toInterpolableNumber(to); |
| 15 InterpolableNumber& resultNumber = toInterpolableNumber(result); | 13 InterpolableNumber& resultNumber = toInterpolableNumber(result); |
| 16 | 14 |
| 17 if (progress == 0 || m_value == toNumber.m_value) | 15 if (progress == 0 || m_value == toNumber.m_value) |
| 18 resultNumber.m_value = m_value; | 16 resultNumber.m_value = m_value; |
| 19 else if (progress == 1) | 17 else if (progress == 1) |
| 20 resultNumber.m_value = toNumber.m_value; | 18 resultNumber.m_value = toNumber.m_value; |
| 21 else | 19 else |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 resultValue.m_value = AnimatableValue::interpolate(m_value.get(), toValue.m_
value.get(), progress); | 113 resultValue.m_value = AnimatableValue::interpolate(m_value.get(), toValue.m_
value.get(), progress); |
| 116 } | 114 } |
| 117 | 115 |
| 118 DEFINE_TRACE(InterpolableAnimatableValue) | 116 DEFINE_TRACE(InterpolableAnimatableValue) |
| 119 { | 117 { |
| 120 visitor->trace(m_value); | 118 visitor->trace(m_value); |
| 121 InterpolableValue::trace(visitor); | 119 InterpolableValue::trace(visitor); |
| 122 } | 120 } |
| 123 | 121 |
| 124 } | 122 } |
| OLD | NEW |