| Index: third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.h b/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| index 0c70ea86c3767079061e75b481cbad1891658908..a5a389b422ae7d578d633f6e857b28a88c613bad 100644
|
| --- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| @@ -63,12 +63,20 @@ class CSSAnimations final {
|
| static const StylePropertyShorthand& propertiesForTransitionAll();
|
| static bool isAnimationAffectingProperty(CSSPropertyID);
|
| static bool isAffectedByKeyframesFromScope(const Element&, const TreeScope&);
|
| - static void calculateUpdate(const Element* animatingElement,
|
| - Element&,
|
| - const ComputedStyle&,
|
| - ComputedStyle* parentStyle,
|
| - CSSAnimationUpdate&,
|
| - StyleResolver*);
|
| + static bool isAnimatingCustomProperties(const ElementAnimations*);
|
| + static bool isCustomPropertyHandle(const PropertyHandle&);
|
| + static void calculateAnimationUpdate(CSSAnimationUpdate&,
|
| + const Element* animatingElement,
|
| + Element&,
|
| + const ComputedStyle&,
|
| + ComputedStyle* parentStyle,
|
| + StyleResolver*);
|
| + static void calculateCompositorAndTransitionUpdate(
|
| + const Element* animatingElement,
|
| + Element&,
|
| + const ComputedStyle&,
|
| + ComputedStyle* parentStyle,
|
| + CSSAnimationUpdate&);
|
| static void snapshotCompositorKeyframes(Element&,
|
| CSSAnimationUpdate&,
|
| const ComputedStyle&,
|
| @@ -148,12 +156,6 @@ class CSSAnimations final {
|
| Element&,
|
| const ComputedStyle&,
|
| const ComputedStyle* parentStyle);
|
| - static void calculateAnimationUpdate(CSSAnimationUpdate&,
|
| - const Element* animatingElement,
|
| - Element&,
|
| - const ComputedStyle&,
|
| - ComputedStyle* parentStyle,
|
| - StyleResolver*);
|
| static void calculateTransitionUpdate(CSSAnimationUpdate&,
|
| const Element* animatingElement,
|
| const ComputedStyle&);
|
|
|