| Index: Source/core/animation/InterpolationEffect.cpp
|
| diff --git a/Source/core/animation/InterpolationEffect.cpp b/Source/core/animation/InterpolationEffect.cpp
|
| index 7003e7322b444c46cb3fbc34ad7f78facfc262f5..9e85045520fc85bac09ea6eb76d2327a4ae02ea4 100644
|
| --- a/Source/core/animation/InterpolationEffect.cpp
|
| +++ b/Source/core/animation/InterpolationEffect.cpp
|
| @@ -32,15 +32,15 @@ void InterpolationEffect::getActiveInterpolations(double fraction, double iterat
|
| result->shrink(resultIndex);
|
| }
|
|
|
| -void InterpolationEffect::addInterpolationsFromKeyframes(CSSPropertyID property, Element* element, Keyframe::PropertySpecificKeyframe& keyframeA, Keyframe::PropertySpecificKeyframe& keyframeB, double applyFrom, double applyTo)
|
| +void InterpolationEffect::addInterpolationsFromKeyframes(CSSPropertyID property, Element* element, const LayoutStyle* baseStyle, Keyframe::PropertySpecificKeyframe& keyframeA, Keyframe::PropertySpecificKeyframe& keyframeB, double applyFrom, double applyTo)
|
| {
|
| - RefPtrWillBeRawPtr<Interpolation> interpolation = keyframeA.maybeCreateInterpolation(property, keyframeB, element);
|
| + RefPtrWillBeRawPtr<Interpolation> interpolation = keyframeA.maybeCreateInterpolation(property, keyframeB, element, baseStyle);
|
|
|
| if (interpolation) {
|
| addInterpolation(interpolation, &keyframeA.easing(), keyframeA.offset(), keyframeB.offset(), applyFrom, applyTo);
|
| } else {
|
| - RefPtrWillBeRawPtr<Interpolation> interpolationA = keyframeA.maybeCreateInterpolation(property, keyframeA, element);
|
| - RefPtrWillBeRawPtr<Interpolation> interpolationB = keyframeB.maybeCreateInterpolation(property, keyframeB, element);
|
| + RefPtrWillBeRawPtr<Interpolation> interpolationA = keyframeA.maybeCreateInterpolation(property, keyframeA, element, baseStyle);
|
| + RefPtrWillBeRawPtr<Interpolation> interpolationB = keyframeB.maybeCreateInterpolation(property, keyframeB, element, baseStyle);
|
|
|
| ASSERT(interpolationA);
|
| ASSERT(interpolationB);
|
|
|