| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index 64d235d1a53ea09de9950ece0ae83d7a08ab7671..08911040b66d6c296ec5cfadd7d7a0a6b897e5f5 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -81,7 +81,7 @@ CSSPropertyID propertyForAnimation(CSSPropertyID property)
|
| return property;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffect(StyleResolver* resolver, const Element* animatingElement, Element& element, const LayoutStyle* style, const LayoutStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction)
|
| +static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffect(StyleResolver* resolver, const Element* animatingElement, Element& element, const ComputedStyle* style, const ComputedStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction)
|
| {
|
| // When the animating element is null, use its parent for scoping purposes.
|
| const Element* elementForScoping = animatingElement ? animatingElement : &element;
|
| @@ -216,7 +216,7 @@ bool CSSAnimations::isTransitionAnimationForInspector(const AnimationPlayer& pla
|
| return false;
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(const Element* animatingElement, Element& element, const LayoutStyle& style, LayoutStyle* parentStyle, StyleResolver* resolver)
|
| +PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(const Element* animatingElement, Element& element, const ComputedStyle& style, ComputedStyle* parentStyle, StyleResolver* resolver)
|
| {
|
| OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = adoptPtrWillBeNoop(new CSSAnimationUpdate());
|
| calculateAnimationUpdate(update.get(), animatingElement, element, style, parentStyle, resolver);
|
| @@ -226,7 +226,7 @@ PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(const
|
| return update->isEmpty() ? nullptr : update.release();
|
| }
|
|
|
| -void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate* update, const Element* animatingElement, Element& element, const LayoutStyle& style, LayoutStyle* parentStyle, StyleResolver* resolver)
|
| +void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate* update, const Element* animatingElement, Element& element, const ComputedStyle& style, ComputedStyle* parentStyle, StyleResolver* resolver)
|
| {
|
| const ElementAnimations* elementAnimations = animatingElement ? animatingElement->elementAnimations() : nullptr;
|
|
|
| @@ -466,7 +466,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element)
|
| }
|
| }
|
|
|
| -void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, CSSPropertyID eventId, const CSSTransitionData& transitionData, size_t transitionIndex, const LayoutStyle& oldStyle, const LayoutStyle& style, const TransitionMap* activeTransitions, CSSAnimationUpdate* update, const Element* element)
|
| +void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, CSSPropertyID eventId, const CSSTransitionData& transitionData, size_t transitionIndex, const ComputedStyle& oldStyle, const ComputedStyle& style, const TransitionMap* activeTransitions, CSSAnimationUpdate* update, const Element* element)
|
| {
|
| RefPtrWillBeRawPtr<AnimatableValue> to = nullptr;
|
| if (activeTransitions) {
|
| @@ -527,7 +527,7 @@ void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, CSSPr
|
| ASSERT(!element->elementAnimations() || !element->elementAnimations()->isAnimationStyleChange());
|
| }
|
|
|
| -void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const Element* animatingElement, const LayoutStyle& style)
|
| +void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const Element* animatingElement, const ComputedStyle& style)
|
| {
|
| if (!animatingElement)
|
| return;
|
| @@ -548,7 +548,7 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const
|
| bool anyTransitionHadTransitionAll = false;
|
| const LayoutObject* renderer = animatingElement->layoutObject();
|
| if (!animationStyleRecalc && style.display() != NONE && renderer && renderer->style() && transitionData) {
|
| - const LayoutStyle& oldStyle = *renderer->style();
|
| + const ComputedStyle& oldStyle = *renderer->style();
|
|
|
| for (size_t i = 0; i < transitionData->propertyList().size(); ++i) {
|
| const CSSTransitionData::TransitionProperty& transitionProperty = transitionData->propertyList()[i];
|
|
|