| Index: Source/core/animation/css/CSSAnimationUpdate.h
|
| diff --git a/Source/core/animation/css/CSSAnimationUpdate.h b/Source/core/animation/css/CSSAnimationUpdate.h
|
| index 1553414beffdbc19fa8d09aeb0fc66f9e2bfa1a9..a63ca4167e8ce1ee1a9deeb5f9e185c415d24f77 100644
|
| --- a/Source/core/animation/css/CSSAnimationUpdate.h
|
| +++ b/Source/core/animation/css/CSSAnimationUpdate.h
|
| @@ -95,19 +95,10 @@ public:
|
| ALLOW_ONLY_INLINE_ALLOCATION();
|
| public:
|
| struct CompositableStyleSnapshot {
|
| - DISALLOW_ALLOCATION();
|
| -
|
| public:
|
| - RefPtrWillBeMember<AnimatableValue> opacity;
|
| - RefPtrWillBeMember<AnimatableValue> transform;
|
| - RefPtrWillBeMember<AnimatableValue> webkitFilter;
|
| -
|
| - DEFINE_INLINE_TRACE()
|
| - {
|
| - visitor->trace(opacity);
|
| - visitor->trace(transform);
|
| - visitor->trace(webkitFilter);
|
| - }
|
| + RefPtr<AnimatableValue> opacity;
|
| + RefPtr<AnimatableValue> transform;
|
| + RefPtr<AnimatableValue> webkitFilter;
|
| };
|
|
|
| UpdatedAnimationStyle()
|
| @@ -125,7 +116,6 @@ public:
|
| {
|
| visitor->trace(animation);
|
| visitor->trace(model);
|
| - visitor->trace(snapshot);
|
| }
|
|
|
| RawPtrWillBeMember<Animation> animation;
|
| @@ -239,14 +229,12 @@ public:
|
| public:
|
| DEFINE_INLINE_TRACE()
|
| {
|
| - visitor->trace(from);
|
| - visitor->trace(to);
|
| visitor->trace(effect);
|
| }
|
|
|
| CSSPropertyID id;
|
| - RawPtrWillBeMember<const AnimatableValue> from;
|
| - RawPtrWillBeMember<const AnimatableValue> to;
|
| + RawPtr<const AnimatableValue> from;
|
| + RawPtr<const AnimatableValue> to;
|
| RefPtrWillBeMember<InertEffect> effect;
|
| };
|
| using NewTransitionMap = WillBeHeapHashMap<CSSPropertyID, NewTransition>;
|
| @@ -306,6 +294,8 @@ private:
|
|
|
| ActiveInterpolationMap m_activeInterpolationsForAnimations;
|
| ActiveInterpolationMap m_activeInterpolationsForTransitions;
|
| +
|
| + friend class PendingAnimationUpdate;
|
| };
|
|
|
| } // namespace blink
|
|
|