Chromium Code Reviews| Index: Source/core/animation/CompositorAnimations.h |
| diff --git a/Source/core/animation/CompositorAnimations.h b/Source/core/animation/CompositorAnimations.h |
| index 0ba57ee8d040940cc8c7ac2eafc213710658645a..319f7dcd968a31bfbb2592bf3cac10d24ec0168f 100644 |
| --- a/Source/core/animation/CompositorAnimations.h |
| +++ b/Source/core/animation/CompositorAnimations.h |
| @@ -47,8 +47,8 @@ class CORE_EXPORT CompositorAnimations { |
| public: |
| static CompositorAnimations* instance() { return instance(0); } |
| static void setInstanceForTesting(CompositorAnimations* newInstance) { instance(newInstance); } |
| - static bool isCompositableProperty(CSSPropertyID property) { return property == CSSPropertyOpacity || property == CSSPropertyTransform || property == CSSPropertyWebkitFilter; } |
| - static CSSPropertyID CompositableProperties[3]; |
| + static bool isCompositableProperty(CSSPropertyID property) { return property == CSSPropertyRotate || property == CSSPropertyOpacity || property == CSSPropertyScale || property == CSSPropertyTransform || property == CSSPropertyTranslate || property == CSSPropertyWebkitFilter; } |
|
alancutter (OOO until 2018)
2015/07/01 03:35:47
We should just loop over CompositableProperties at
soonm
2015/07/01 07:18:50
Done - Loopity loop
|
| + static CSSPropertyID CompositableProperties[6]; |
|
alancutter (OOO until 2018)
2015/07/01 03:35:47
Clean up nit, I think this should be named composi
soonm
2015/07/01 07:18:50
Changed at a call site at KeyframeEffectModel as w
|
| virtual bool isCandidateForAnimationOnCompositor(const Timing&, const Element&, const Animation*, const EffectModel&, double animationPlaybackRate); |
| virtual void cancelIncompatibleAnimationsOnCompositor(const Element&, const Animation&, const EffectModel&); |