| 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 "sky/engine/config.h" | |
| 6 #include "sky/engine/core/animation/InterpolableValue.h" | 5 #include "sky/engine/core/animation/InterpolableValue.h" |
| 7 | 6 |
| 8 namespace blink { | 7 namespace blink { |
| 9 | 8 |
| 10 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue); | 9 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue); |
| 11 | 10 |
| 12 PassOwnPtr<InterpolableValue> InterpolableNumber::interpolate(const Interpolable
Value &to, const double progress) const | 11 PassOwnPtr<InterpolableValue> InterpolableNumber::interpolate(const Interpolable
Value &to, const double progress) const |
| 13 { | 12 { |
| 14 const InterpolableNumber& toNumber = toInterpolableNumber(to); | 13 const InterpolableNumber& toNumber = toInterpolableNumber(to); |
| 15 if (!progress) | 14 if (!progress) |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 { | 51 { |
| 53 const InterpolableAnimatableValue& otherValue = toInterpolableAnimatableValu
e(other); | 52 const InterpolableAnimatableValue& otherValue = toInterpolableAnimatableValu
e(other); |
| 54 if (!percentage) | 53 if (!percentage) |
| 55 return create(m_value); | 54 return create(m_value); |
| 56 if (percentage == 1) | 55 if (percentage == 1) |
| 57 return create(otherValue.m_value); | 56 return create(otherValue.m_value); |
| 58 return create(AnimatableValue::interpolate(m_value.get(), otherValue.m_value
.get(), percentage)); | 57 return create(AnimatableValue::interpolate(m_value.get(), otherValue.m_value
.get(), percentage)); |
| 59 } | 58 } |
| 60 | 59 |
| 61 } | 60 } |
| OLD | NEW |