Oilpan: Unship CSSValues and AnimatableValues

Source/core/animation/css/CSSAnimationUpdate.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CSSAnimationUpdate_h
 #define CSSAnimationUpdate_h
 
 #include "core/animation/AnimationStack.h"
 #include "core/animation/InertEffect.h"
 #include "core/animation/Interpolation.h"
@@ skipping 77 matching lines @@
         RefPtrWillBeMember<InertEffect> effect;
         Timing specifiedTiming;
         RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
         unsigned styleRuleVersion;
     };
 
     class UpdatedAnimationStyle {
         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()
         {
         }
 
         UpdatedAnimationStyle(Animation* animation, KeyframeEffectModelBase* model, const UpdatedAnimationStyle::CompositableStyleSnapshot& snapshot)
             : animation(animation)
             , model(model)
             , snapshot(snapshot)
         {
         }
 
         DEFINE_INLINE_TRACE()
         {
             visitor->trace(animation);
             visitor->trace(model);
-            visitor->trace(snapshot);
         }
 
         RawPtrWillBeMember<Animation> animation;
         RawPtrWillBeMember<KeyframeEffectModelBase> model;
         CompositableStyleSnapshot snapshot;
     };
 
     CSSAnimationUpdate()
     {
     }
@@ skipping 93 matching lines @@
     const WillBeHeapHashSet<RawPtrWillBeMember<const Animation>>& suppressedAnimations() const { return m_suppressedAnimations; }
     const Vector<AtomicString>& animationsWithPauseToggled() const { return m_animationsWithPauseToggled; }
     const WillBeHeapVector<UpdatedAnimation>& animationsWithUpdates() const { return m_animationsWithUpdates; }
     const WillBeHeapVector<UpdatedAnimationStyle>& animationsWithStyleUpdates() const { return m_animationsWithStyleUpdates; }
 
     struct NewTransition {
         ALLOW_ONLY_INLINE_ALLOCATION();
     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>;
     const NewTransitionMap& newTransitions() const { return m_newTransitions; }
     const HashSet<CSSPropertyID>& cancelledTransitions() const { return m_cancelledTransitions; }
     const HashSet<CSSPropertyID>& finishedTransitions() const { return m_finishedTransitions; }
 
     void adoptActiveInterpolationsForAnimations(ActiveInterpolationMap& newMap) { newMap.swap(m_activeInterpolationsForAnimations); }
     void adoptActiveInterpolationsForTransitions(ActiveInterpolationMap& newMap) { newMap.swap(m_activeInterpolationsForTransitions); }
     const ActiveInterpolationMap& activeInterpolationsForAnimations() const { return m_activeInterpolationsForAnimations; }
@@ skipping 39 matching lines @@
     Vector<AtomicString> m_animationsWithPauseToggled;
     WillBeHeapVector<UpdatedAnimation> m_animationsWithUpdates;
     WillBeHeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
 
     NewTransitionMap m_newTransitions;
     HashSet<CSSPropertyID> m_cancelledTransitions;
     HashSet<CSSPropertyID> m_finishedTransitions;
 
     ActiveInterpolationMap m_activeInterpolationsForAnimations;
     ActiveInterpolationMap m_activeInterpolationsForTransitions;
+
+    friend class PendingAnimationUpdate;
 };
 
 } // namespace blink
 
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation);
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimation);
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimationStyle);
 
 #endif