| 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 a5a389b422ae7d578d633f6e857b28a88c613bad..0c70ea86c3767079061e75b481cbad1891658908 100644
|
| --- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| @@ -63,20 +63,12 @@
|
| static const StylePropertyShorthand& propertiesForTransitionAll();
|
| static bool isAnimationAffectingProperty(CSSPropertyID);
|
| static bool isAffectedByKeyframesFromScope(const Element&, const TreeScope&);
|
| - 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 calculateUpdate(const Element* animatingElement,
|
| + Element&,
|
| + const ComputedStyle&,
|
| + ComputedStyle* parentStyle,
|
| + CSSAnimationUpdate&,
|
| + StyleResolver*);
|
| static void snapshotCompositorKeyframes(Element&,
|
| CSSAnimationUpdate&,
|
| const ComputedStyle&,
|
| @@ -156,6 +148,12 @@
|
| 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&);
|
|
|