| Index: Source/core/animation/AnimationNodeTest.cpp
|
| diff --git a/Source/core/animation/AnimationNodeTest.cpp b/Source/core/animation/AnimationNodeTest.cpp
|
| index ab626d9d7cef9f82c4b7fc33882b7180608d1321..527fce4454e34051810432c2bc0d62ed74b92de5 100644
|
| --- a/Source/core/animation/AnimationNodeTest.cpp
|
| +++ b/Source/core/animation/AnimationNodeTest.cpp
|
| @@ -74,7 +74,7 @@ public:
|
|
|
| virtual void updateChildrenAndEffects() const OVERRIDE { }
|
| void willDetach() { }
|
| - TestAnimationNodeEventDelegate* eventDelegate() { return m_eventDelegate; }
|
| + TestAnimationNodeEventDelegate* eventDelegate() { return m_eventDelegate.get(); }
|
| virtual double calculateTimeToEffectChange(bool forwards, double localTime, double timeToNextIteration) const OVERRIDE
|
| {
|
| m_localTime = localTime;
|
| @@ -95,14 +95,20 @@ public:
|
| return result;
|
| }
|
|
|
| + virtual void trace(Visitor* visitor) OVERRIDE
|
| + {
|
| + visitor->trace(m_eventDelegate);
|
| + AnimationNode::trace(visitor);
|
| + }
|
| +
|
| private:
|
| TestAnimationNode(const Timing& specified, TestAnimationNodeEventDelegate* eventDelegate)
|
| - : AnimationNode(specified, adoptPtr(eventDelegate))
|
| + : AnimationNode(specified, adoptPtrWillBeNoop(eventDelegate))
|
| , m_eventDelegate(eventDelegate)
|
| {
|
| }
|
|
|
| - TestAnimationNodeEventDelegate* m_eventDelegate;
|
| + RawPtrWillBeMember<TestAnimationNodeEventDelegate> m_eventDelegate;
|
| mutable double m_localTime;
|
| mutable double m_timeToNextIteration;
|
| };
|
|
|