| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index 9ede9a247de18a236eabb737c36c4a0041142d4d..1cdd69f01dfef20353375dc4e64ba6650930c860 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -85,7 +85,7 @@ CSSPropertyID propertyForAnimation(CSSPropertyID property)
|
| return property;
|
| }
|
|
|
| -static void resolveKeyframes(StyleResolver* resolver, const Element* animatingElement, Element& element, const RenderStyle& style, RenderStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction,
|
| +static void resolveKeyframes(StyleResolver* resolver, const Element* animatingElement, Element& element, const RenderStyle& style, const RenderStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction,
|
| AnimatableValueKeyframeVector& keyframes)
|
| {
|
| // When the animating element is null, use its parent for scoping purposes.
|
| @@ -225,7 +225,7 @@ bool CSSAnimations::isTransitionAnimationForInspector(const AnimationPlayer& pla
|
| return false;
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(const Element* animatingElement, Element& element, const RenderStyle& style, RenderStyle* parentStyle, StyleResolver* resolver)
|
| +PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(const Element* animatingElement, Element& element, const RenderStyle& style, const RenderStyle* parentStyle, StyleResolver* resolver)
|
| {
|
| OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = adoptPtrWillBeNoop(new CSSAnimationUpdate());
|
| calculateAnimationUpdate(update.get(), animatingElement, element, style, parentStyle, resolver);
|
| @@ -235,7 +235,7 @@ PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(const
|
| return update->isEmpty() ? nullptr : update.release();
|
| }
|
|
|
| -void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate* update, const Element* animatingElement, Element& element, const RenderStyle& style, RenderStyle* parentStyle, StyleResolver* resolver)
|
| +void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate* update, const Element* animatingElement, Element& element, const RenderStyle& style, const RenderStyle* parentStyle, StyleResolver* resolver)
|
| {
|
| const ActiveAnimations* activeAnimations = animatingElement ? animatingElement->activeAnimations() : nullptr;
|
|
|
|
|