| Index: third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| index 3c6f82bb4180e5121b48506ca40b1c246e8d844e..72522469ed8a4adbd521c29adde30d9b677f4be0 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| @@ -131,18 +131,17 @@ InterpolationValue CSSFontSizeInterpolationType::maybeConvertUnderlyingValue(
|
| return convertFontSize(environment.state().style()->specifiedFontSize());
|
| }
|
|
|
| -void CSSFontSizeInterpolationType::apply(
|
| +void CSSFontSizeInterpolationType::applyStandardPropertyValue(
|
| const InterpolableValue& interpolableValue,
|
| const NonInterpolableValue*,
|
| - InterpolationEnvironment& environment) const {
|
| - const FontDescription& parentFont =
|
| - environment.state().parentFontDescription();
|
| + StyleResolverState& state) const {
|
| + const FontDescription& parentFont = state.parentFontDescription();
|
| Length fontSizeLength = LengthInterpolationFunctions::createLength(
|
| - interpolableValue, nullptr, environment.state().fontSizeConversionData(),
|
| + interpolableValue, nullptr, state.fontSizeConversionData(),
|
| ValueRangeNonNegative);
|
| float fontSize =
|
| floatValueForLength(fontSizeLength, parentFont.getSize().value);
|
| - environment.state().fontBuilder().setSize(FontDescription::Size(
|
| + state.fontBuilder().setSize(FontDescription::Size(
|
| 0, fontSize,
|
| !fontSizeLength.isPercentOrCalc() || parentFont.isAbsoluteSize()));
|
| }
|
|
|