Chromium Code Reviews| Index: Source/core/animation/css/CSSAnimations.cpp |
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp |
| index b6e38541be9178181b1c81aa14f2879ab4c3cd7f..1612fb80c43048c4816bfc8a9dc715a370cda60e 100644 |
| --- a/Source/core/animation/css/CSSAnimations.cpp |
| +++ b/Source/core/animation/css/CSSAnimations.cpp |
| @@ -241,6 +241,20 @@ void CSSAnimations::calculateCompositorAnimationUpdate(CSSAnimationUpdate& updat |
| } |
| } |
| } |
| + |
| + if (oldStyle.effectiveZoom() != style.effectiveZoom()) { |
|
dstockwell
2015/09/17 04:07:13
early out if !oldStyle.isRunningTransformAnimation
alancutter (OOO until 2018)
2015/09/17 04:21:45
Done. Added early out of entire function for when
|
| + for (auto& entry : elementAnimations->animations()) { |
| + Animation& animation = *entry.key; |
| + if (animation.effect() && animation.effect()->isKeyframeEffect()) { |
| + EffectModel* model = toKeyframeEffect(animation.effect())->model(); |
| + if (model && model->isKeyframeEffectModel()) { |
| + KeyframeEffectModelBase* keyframeEffect = toKeyframeEffectModelBase(model); |
| + if (keyframeEffect->affects(PropertyHandle(CSSPropertyTransform)) && keyframeEffect->snapshotAllCompositorKeyframes(element, &style)) |
| + update.updateCompositorKeyframes(&animation); |
| + } |
| + } |
| + } |
| + } |
| } |
| void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate& update, const Element* animatingElement, Element& element, const ComputedStyle& style, ComputedStyle* parentStyle, StyleResolver* resolver) |