Chromium Code Reviews| Index: Source/core/animation/CompositorAnimations.cpp |
| diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp |
| index 16aa2904cb069e1fd2b64a5d80eea28198202ed2..664f3525fb67ef627748ebacb57c2e607a320d03 100644 |
| --- a/Source/core/animation/CompositorAnimations.cpp |
| +++ b/Source/core/animation/CompositorAnimations.cpp |
| @@ -147,7 +147,8 @@ bool CompositorAnimations::isCandidateForAnimationOnCompositor(const Timing& tim |
| ASSERT(keyframes.size() >= 2); |
| for (const auto& keyframe : keyframes) { |
| // FIXME: Determine candidacy based on the CSSValue instead of a snapshot AnimatableValue. |
| - if (keyframe->composite() != AnimationEffect::CompositeReplace || !keyframe->getAnimatableValue()) |
| + bool isNeutralKeyframe = keyframe->isStringPropertySpecificKeyframe() && !toStringPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite() == AnimationEffect::CompositeAdd; |
| + if ((keyframe->composite() != AnimationEffect::CompositeReplace && !isNeutralKeyframe) || !keyframe->getAnimatableValue() || !isCompositableProperty(property)) |
|
dstockwell
2015/01/27 02:22:58
I don't understand the isCompositableProperty test
shend
2015/01/28 02:44:50
Done.
|
| return false; |
| switch (property) { |