Source/core/animation/css/CSSAnimations.h - Issue 566803002: Web Animations: Fix pseudo element keyframe style resolution crash

Unified Diff: Source/core/animation/css/CSSAnimations.h

Issue 566803002: Web Animations: Fix pseudo element keyframe style resolution crash (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/animations/pseudo-element-animation-with-marker-crash-expected.txt ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/css/CSSAnimations.h

diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h

index 57be20ae367bb596ae71221f0219d10b8df32b0d..58bbf1165f5d5d73362ffa08e0b74cda697c48eb 100644

--- a/Source/core/animation/css/CSSAnimations.h

+++ b/Source/core/animation/css/CSSAnimations.h

@@ -175,7 +175,7 @@ public:

static const StylePropertyShorthand& animatableProperties();

static bool isAllowedAnimation(CSSPropertyID);

// FIXME: We should change the Element* to a const Element*

- static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(Element*, const Element& parentElement, const RenderStyle&, RenderStyle* parentStyle, StyleResolver*);

+ static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Element* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, StyleResolver*);

void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m_pendingUpdate = update; }

void maybeApplyPendingUpdate(Element*);

@@ -210,12 +210,12 @@ private:

WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_previousActiveInterpolationsForAnimations;

- static void calculateAnimationUpdate(CSSAnimationUpdate*, Element*, const Element& parentElement, const RenderStyle&, RenderStyle* parentStyle, StyleResolver*);

- static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element*, const RenderStyle&);

+ static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, StyleResolver*);

+ static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element* animatingElement, const RenderStyle&);

static void calculateTransitionUpdateForProperty(CSSPropertyID, CSSPropertyID eventId, const CSSTransitionData&, size_t transitionIndex, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate*, const Element*);

- static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, const Element*, double timelineCurrentTime);

- static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, const Element*, double timelineCurrentTime);

+ static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);

+ static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);

class AnimationEventDelegate FINAL : public AnimationNode::EventDelegate {

public: