| 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/Interpolation.h" | 6 #include "core/animation/Interpolation.h" |
| 7 | 7 |
| 8 #include "core/animation/AnimatableDouble.h" |
| 8 #include "core/css/resolver/AnimatedStyleBuilder.h" | 9 #include "core/css/resolver/AnimatedStyleBuilder.h" |
| 9 #include "core/css/resolver/StyleResolverState.h" | 10 #include "core/css/resolver/StyleResolverState.h" |
| 10 | 11 |
| 11 namespace WebCore { | 12 namespace WebCore { |
| 12 | 13 |
| 13 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Interpolation); | 14 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Interpolation); |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 | 17 |
| 17 bool typesMatch(const InterpolableValue* start, const InterpolableValue* end) | 18 bool typesMatch(const InterpolableValue* start, const InterpolableValue* end) |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 visitor->trace(m_cachedValue); | 64 visitor->trace(m_cachedValue); |
| 64 } | 65 } |
| 65 | 66 |
| 66 void StyleInterpolation::trace(Visitor* visitor) | 67 void StyleInterpolation::trace(Visitor* visitor) |
| 67 { | 68 { |
| 68 Interpolation::trace(visitor); | 69 Interpolation::trace(visitor); |
| 69 } | 70 } |
| 70 | 71 |
| 71 void LegacyStyleInterpolation::apply(StyleResolverState& state) const | 72 void LegacyStyleInterpolation::apply(StyleResolverState& state) const |
| 72 { | 73 { |
| 73 AnimatableValue* value = currentValue(); | 74 AnimatedStyleBuilder::applyProperty(m_id, state, currentValue().get()); |
| 74 AnimatedStyleBuilder::applyProperty(m_id, state, value); | |
| 75 } | 75 } |
| 76 | 76 |
| 77 void LegacyStyleInterpolation::trace(Visitor* visitor) | 77 void LegacyStyleInterpolation::trace(Visitor* visitor) |
| 78 { | 78 { |
| 79 StyleInterpolation::trace(visitor); | 79 StyleInterpolation::trace(visitor); |
| 80 } | 80 } |
| 81 | 81 |
| 82 } | 82 } |
| OLD | NEW |