| 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 cc3f51ff1aca29b3e346e51bc77e677c5bc77812..41b533f73806cde1967de1c23bca8500160bc4ff 100644
|
| --- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.h
|
| @@ -62,6 +62,7 @@ public:
|
| static const StylePropertyShorthand& propertiesForTransitionAll();
|
| static bool isAnimatableProperty(CSSPropertyID);
|
| static void calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, CSSAnimationUpdate&, StyleResolver*);
|
| + static void snapshotCompositorKeyframes(Element&, CSSAnimationUpdate&, const ComputedStyle&, const ComputedStyle* parentStyle);
|
|
|
| void setPendingUpdate(const CSSAnimationUpdate& update)
|
| {
|
| @@ -137,7 +138,7 @@ private:
|
|
|
| ActiveInterpolationsMap m_previousActiveInterpolationsForAnimations;
|
|
|
| - static void calculateCompositorAnimationUpdate(CSSAnimationUpdate&, const Element* animatingElement, Element&, const ComputedStyle&);
|
| + static void calculateCompositorAnimationUpdate(CSSAnimationUpdate&, const Element* animatingElement, 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&);
|
| static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSTransitionData&, size_t transitionIndex, const ComputedStyle& oldStyle, const ComputedStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate&, const Element*);
|
|
|