| 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 namespace { | 14 namespace { |
| 14 | 15 |
| 15 bool typesMatch(const InterpolableValue* start, const InterpolableValue* end) | 16 bool typesMatch(const InterpolableValue* start, const InterpolableValue* end) |
| 16 { | 17 { |
| 17 if (start->isNumber()) | 18 if (start->isNumber()) |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 } | 55 } |
| 55 } | 56 } |
| 56 | 57 |
| 57 void StyleInterpolation::trace(Visitor* visitor) | 58 void StyleInterpolation::trace(Visitor* visitor) |
| 58 { | 59 { |
| 59 Interpolation::trace(visitor); | 60 Interpolation::trace(visitor); |
| 60 } | 61 } |
| 61 | 62 |
| 62 void LegacyStyleInterpolation::apply(StyleResolverState& state) const | 63 void LegacyStyleInterpolation::apply(StyleResolverState& state) const |
| 63 { | 64 { |
| 64 AnimatableValue* value = currentValue(); | 65 AnimatedStyleBuilder::applyProperty(m_id, state, currentValue().get()); |
| 65 AnimatedStyleBuilder::applyProperty(m_id, state, value); | |
| 66 } | 66 } |
| 67 | 67 |
| 68 void LegacyStyleInterpolation::trace(Visitor* visitor) | 68 void LegacyStyleInterpolation::trace(Visitor* visitor) |
| 69 { | 69 { |
| 70 StyleInterpolation::trace(visitor); | 70 StyleInterpolation::trace(visitor); |
| 71 } | 71 } |
| 72 | 72 |
| 73 } | 73 } |
| OLD | NEW |