Chromium Code Reviews| Index: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp |
| diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp |
| index 61d0947bff02ed7bd3ab73f70681ebc8ed13f1d4..a8a90df81420b48dd7f47c337631e9db615048be 100644 |
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp |
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp |
| @@ -347,10 +347,13 @@ bool CompositorAnimations::canStartAnimationOnCompositor( |
| return false; |
| if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
|
pdr.
2016/12/20 23:34:18
I noticed this can be called during style recalc (
wkorman
2016/12/21 23:12:39
Good point, updated comment and filed http://crbug
|
| - // TODO(wkorman): Consider effect node for opacity. |
| + const ObjectPaintProperties* paintProperties = |
| + element.layoutObject()->paintProperties(); |
| const TransformPaintPropertyNode* transformNode = |
| - element.layoutObject()->paintProperties()->transform(); |
| - return transformNode && transformNode->hasDirectCompositingReasons(); |
| + paintProperties->transform(); |
| + const EffectPaintPropertyNode* effectNode = paintProperties->effect(); |
| + return (transformNode && transformNode->hasDirectCompositingReasons()) || |
| + (effectNode && effectNode->hasDirectCompositingReasons()); |
| } |
| return element.layoutObject() && |