OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "core/animation/CSSInterpolationType.h" | 5 #include "core/animation/CSSInterpolationType.h" |
6 | 6 |
7 #include "core/StylePropertyShorthand.h" | 7 #include "core/StylePropertyShorthand.h" |
8 #include "core/animation/StringKeyframe.h" | 8 #include "core/animation/StringKeyframe.h" |
9 #include "core/css/CSSVariableReferenceValue.h" | 9 #include "core/css/CSSVariableReferenceValue.h" |
10 #include "core/css/resolver/CSSVariableResolver.h" | 10 #include "core/css/resolver/CSSVariableResolver.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 return maybeConvertInitial(environment.state(), conversionCheckers); | 82 return maybeConvertInitial(environment.state(), conversionCheckers); |
83 | 83 |
84 if (value->isInheritedValue() || | 84 if (value->isInheritedValue() || |
85 (value->isUnsetValue() && | 85 (value->isUnsetValue() && |
86 CSSPropertyMetadata::isInheritedProperty(cssProperty()))) | 86 CSSPropertyMetadata::isInheritedProperty(cssProperty()))) |
87 return maybeConvertInherit(environment.state(), conversionCheckers); | 87 return maybeConvertInherit(environment.state(), conversionCheckers); |
88 | 88 |
89 return maybeConvertValue(*value, environment.state(), conversionCheckers); | 89 return maybeConvertValue(*value, environment.state(), conversionCheckers); |
90 } | 90 } |
91 | 91 |
| 92 void CSSInterpolationType::apply( |
| 93 const InterpolableValue& interpolableValue, |
| 94 const NonInterpolableValue* nonInterpolableValue, |
| 95 InterpolationEnvironment& environment) const { |
| 96 // TODO(alancutter): Add support for applying registered custom property |
| 97 // values. |
| 98 return applyStandardPropertyValue(interpolableValue, nonInterpolableValue, |
| 99 environment.state()); |
| 100 } |
| 101 |
92 } // namespace blink | 102 } // namespace blink |
OLD | NEW |