| 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/css/resolver/AnimatedStyleBuilder.h" | 8 #include "core/css/resolver/AnimatedStyleBuilder.h" |
| 9 #include "core/css/resolver/StyleResolverState.h" |
| 9 | 10 |
| 10 namespace WebCore { | 11 namespace WebCore { |
| 11 | 12 |
| 12 namespace { | 13 namespace { |
| 13 | 14 |
| 14 bool typesMatch(const InterpolableValue* start, const InterpolableValue* end) | 15 bool typesMatch(const InterpolableValue* start, const InterpolableValue* end) |
| 15 { | 16 { |
| 16 if (start->isNumber()) | 17 if (start->isNumber()) |
| 17 return end->isNumber(); | 18 return end->isNumber(); |
| 18 if (start->isBool()) | 19 if (start->isBool()) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 } | 54 } |
| 54 } | 55 } |
| 55 | 56 |
| 56 void LegacyStyleInterpolation::apply(StyleResolverState& state) const | 57 void LegacyStyleInterpolation::apply(StyleResolverState& state) const |
| 57 { | 58 { |
| 58 AnimatableValue* value = currentValue(); | 59 AnimatableValue* value = currentValue(); |
| 59 AnimatedStyleBuilder::applyProperty(m_id, state, value); | 60 AnimatedStyleBuilder::applyProperty(m_id, state, value); |
| 60 } | 61 } |
| 61 | 62 |
| 62 } | 63 } |
| OLD | NEW |