| Index: third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| index a2f87a5320bbf8cc82fa191852034cc3fbd8b6e0..44b7fd2bd4044a7625a4e81e7d1fedc12d905e30 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| +++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| @@ -22,17 +22,6 @@ public:
|
| void composite(UnderlyingValueOwner&, double underlyingFraction, const InterpolationValue&, double interpolationFraction) const final;
|
| void apply(const InterpolableValue&, const NonInterpolableValue*, InterpolationEnvironment&) const final;
|
|
|
| - static Length createLength(const InterpolableValue&, const NonInterpolableValue*, const CSSToLengthConversionData&, ValueRange = ValueRangeAll);
|
| - static std::unique_ptr<InterpolableValue> createInterpolablePixels(double pixels);
|
| - static InterpolationValue createInterpolablePercent(double percent);
|
| - static InterpolationValue maybeConvertCSSValue(const CSSValue&);
|
| - static InterpolationValue maybeConvertLength(const Length&, float zoom);
|
| - static std::unique_ptr<InterpolableList> createNeutralInterpolableValue();
|
| - static PairwiseInterpolationValue staticMergeSingleConversions(InterpolationValue&& start, InterpolationValue&& end);
|
| - static bool nonInterpolableValuesAreCompatible(const NonInterpolableValue*, const NonInterpolableValue*);
|
| - static void composite(std::unique_ptr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);
|
| - static void subtractFromOneHundredPercent(InterpolationValue& result);
|
| -
|
| private:
|
| float effectiveZoom(const ComputedStyle&) const;
|
|
|
| @@ -41,10 +30,7 @@ private:
|
| InterpolationValue maybeConvertInherit(const StyleResolverState&, ConversionCheckers&) const final;
|
| InterpolationValue maybeConvertValue(const CSSValue&, const StyleResolverState&, ConversionCheckers&) const final;
|
|
|
| - PairwiseInterpolationValue maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end) const final
|
| - {
|
| - return staticMergeSingleConversions(std::move(start), std::move(end));
|
| - }
|
| + PairwiseInterpolationValue maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end) const final;
|
|
|
| const ValueRange m_valueRange;
|
| };
|
|
|