| Index: third_party/WebKit/Source/core/animation/CSSFontWeightInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSFontWeightInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFontWeightInterpolationType.cpp
|
| index b1db3b961c80c4506fb765c6c84c104c26f52e1b..7f9f61b6462d961b12624263a8c20140f652f89a 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSFontWeightInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSFontWeightInterpolationType.cpp
|
| @@ -48,15 +48,16 @@ static FontWeight doubleToFontWeight(double value) {
|
| return fontWeights[clampedIndex];
|
| }
|
|
|
| -class ParentFontWeightChecker : public InterpolationType::ConversionChecker {
|
| +class InheritedFontWeightChecker : public InterpolationType::ConversionChecker {
|
| public:
|
| - static std::unique_ptr<ParentFontWeightChecker> create(
|
| + static std::unique_ptr<InheritedFontWeightChecker> create(
|
| FontWeight fontWeight) {
|
| - return wrapUnique(new ParentFontWeightChecker(fontWeight));
|
| + return wrapUnique(new InheritedFontWeightChecker(fontWeight));
|
| }
|
|
|
| private:
|
| - ParentFontWeightChecker(FontWeight fontWeight) : m_fontWeight(fontWeight) {}
|
| + InheritedFontWeightChecker(FontWeight fontWeight)
|
| + : m_fontWeight(fontWeight) {}
|
|
|
| bool isValid(const InterpolationEnvironment& environment,
|
| const InterpolationValue&) const final {
|
| @@ -91,7 +92,7 @@ InterpolationValue CSSFontWeightInterpolationType::maybeConvertInherit(
|
| return nullptr;
|
| FontWeight inheritedFontWeight = state.parentStyle()->fontWeight();
|
| conversionCheckers.append(
|
| - ParentFontWeightChecker::create(inheritedFontWeight));
|
| + InheritedFontWeightChecker::create(inheritedFontWeight));
|
| return createFontWeightValue(inheritedFontWeight);
|
| }
|
|
|
| @@ -113,7 +114,7 @@ InterpolationValue CSSFontWeightInterpolationType::maybeConvertValue(
|
| case CSSValueLighter: {
|
| FontWeight inheritedFontWeight = state.parentStyle()->fontWeight();
|
| conversionCheckers.append(
|
| - ParentFontWeightChecker::create(inheritedFontWeight));
|
| + InheritedFontWeightChecker::create(inheritedFontWeight));
|
| if (keyword == CSSValueBolder)
|
| return createFontWeightValue(
|
| FontDescription::bolderWeight(inheritedFontWeight));
|
|
|