| Index: third_party/WebKit/Source/core/animation/InterpolationType.h
|
| diff --git a/third_party/WebKit/Source/core/animation/InterpolationType.h b/third_party/WebKit/Source/core/animation/InterpolationType.h
|
| index 7a9304ec5610581da672650cada0e2bbfc17ce47..cf49d194117991bbb4d65f59e257b534601beab0 100644
|
| --- a/third_party/WebKit/Source/core/animation/InterpolationType.h
|
| +++ b/third_party/WebKit/Source/core/animation/InterpolationType.h
|
| @@ -43,7 +43,7 @@ public:
|
| };
|
| using ConversionCheckers = Vector<OwnPtr<ConversionChecker>>;
|
|
|
| - virtual PassOwnPtr<PairwisePrimitiveInterpolation> maybeConvertPairwise(const PropertySpecificKeyframe& startKeyframe, const PropertySpecificKeyframe& endKeyframe, const InterpolationEnvironment* environment, const UnderlyingValue& underlyingValue, ConversionCheckers& conversionCheckers) const
|
| + virtual PassOwnPtr<PairwisePrimitiveInterpolation> maybeConvertPairwise(const PropertySpecificKeyframe& startKeyframe, const PropertySpecificKeyframe& endKeyframe, const InterpolationEnvironment& environment, const UnderlyingValue& underlyingValue, ConversionCheckers& conversionCheckers) const
|
| {
|
| OwnPtr<InterpolationValue> startValue = maybeConvertSingle(startKeyframe, environment, underlyingValue, conversionCheckers);
|
| if (!startValue)
|
| @@ -54,7 +54,7 @@ public:
|
| return mergeSingleConversions(*startValue, *endValue);
|
| }
|
|
|
| - virtual PassOwnPtr<InterpolationValue> maybeConvertSingle(const PropertySpecificKeyframe&, const InterpolationEnvironment*, const UnderlyingValue&, ConversionCheckers&) const = 0;
|
| + virtual PassOwnPtr<InterpolationValue> maybeConvertSingle(const PropertySpecificKeyframe&, const InterpolationEnvironment&, const UnderlyingValue&, ConversionCheckers&) const = 0;
|
|
|
| virtual PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const = 0;
|
|
|
|
|