Oilpan: Partially ship Oilpan for core/animations

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 18 matching lines @@
     WTF_MAKE_NONCOPYABLE(CSSAnimationUpdate);
 public:
     class NewAnimation {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
         NewAnimation()
             : styleRuleVersion(0)
         {
         }
 
-        NewAnimation(AtomicString name, PassRefPtrWillBeRawPtr<InertEffect> effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+        NewAnimation(AtomicString name, InertEffect* effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
             : name(name)
             , effect(effect)
             , timing(timing)
             , styleRule(styleRule)
             , styleRuleVersion(this->styleRule->version())
         {
         }
 
         DEFINE_INLINE_TRACE()
         {
             visitor->trace(effect);
             visitor->trace(styleRule);
         }
 
         AtomicString name;
-        RefPtrWillBeMember<InertEffect> effect;
+        Member<InertEffect> effect;
         Timing timing;
         RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
         unsigned styleRuleVersion;
     };
 
     class UpdatedAnimation {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
         UpdatedAnimation()
             : styleRuleVersion(0)
         {
         }
 
-        UpdatedAnimation(AtomicString name, Animation* animation, PassRefPtrWillBeRawPtr<InertEffect> effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+        UpdatedAnimation(AtomicString name, Animation* animation, InertEffect* effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
             : name(name)
             , animation(animation)
             , effect(effect)
             , specifiedTiming(specifiedTiming)
             , styleRule(styleRule)
             , styleRuleVersion(this->styleRule->version())
         {
         }
 
         DEFINE_INLINE_TRACE()
         {
             visitor->trace(animation);
             visitor->trace(effect);
             visitor->trace(styleRule);
         }
 
         AtomicString name;
-        RawPtrWillBeMember<Animation> animation;
-        RefPtrWillBeMember<InertEffect> effect;
+        Member<Animation> animation;
+        Member<InertEffect> effect;
         Timing specifiedTiming;
         RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
         unsigned styleRuleVersion;
     };
 
     class UpdatedAnimationStyle {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
         struct CompositableStyleSnapshot {
             DISALLOW_ALLOCATION();
@@ skipping 22 matching lines @@
         {
         }
 
         DEFINE_INLINE_TRACE()
         {
             visitor->trace(animation);
             visitor->trace(model);
             visitor->trace(snapshot);
         }
 
-        RawPtrWillBeMember<Animation> animation;
-        RawPtrWillBeMember<KeyframeEffectModelBase> model;
+        Member<Animation> animation;
+        Member<KeyframeEffectModelBase> model;
         CompositableStyleSnapshot snapshot;
     };
 
     CSSAnimationUpdate()
     {
     }
 
     ~CSSAnimationUpdate()
     {
-#if ENABLE(OILPAN)
         // For performance reasons, explicitly clear HeapVectors and
         // HeapHashMaps to avoid giving a pressure on Oilpan's GC.
         clear();
-#endif
     }
 
     void copy(const CSSAnimationUpdate& update)
     {
         ASSERT(isEmpty());
         m_newAnimations = update.newAnimations();
         m_animationsWithUpdates = update.animationsWithUpdates();
         m_animationsWithStyleUpdates = update.animationsWithStyleUpdates();
         m_newTransitions = update.newTransitions();
         m_activeInterpolationsForAnimations = update.activeInterpolationsForAnimations();
@@ skipping 11 matching lines @@
         m_animationsWithStyleUpdates.clear();
         m_newTransitions.clear();
         m_activeInterpolationsForAnimations.clear();
         m_activeInterpolationsForTransitions.clear();
         m_cancelledAnimationNames.clear();
         m_animationsWithPauseToggled.clear();
         m_cancelledTransitions.clear();
         m_finishedTransitions.clear();
     }
 
-    void startAnimation(const AtomicString& animationName, PassRefPtrWillBeRawPtr<InertEffect> effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+    void startAnimation(const AtomicString& animationName, InertEffect* effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
     {
         effect->setName(animationName);
         m_newAnimations.append(NewAnimation(animationName, effect, timing, styleRule));
     }
     // Returns whether animation has been suppressed and should be filtered during style application.
     bool isSuppressedAnimation(const Animation* animation) const { return m_suppressedAnimations.contains(animation); }
     void cancelAnimation(const AtomicString& name, Animation& animation)
     {
         m_cancelledAnimationNames.append(name);
         m_suppressedAnimations.add(&animation);
     }
     void toggleAnimationPaused(const AtomicString& name)
     {
         m_animationsWithPauseToggled.append(name);
     }
-    void updateAnimation(const AtomicString& name, Animation* animation, PassRefPtrWillBeRawPtr<InertEffect> effect, const Timing& specifiedTiming,
+    void updateAnimation(const AtomicString& name, Animation* animation, InertEffect* effect, const Timing& specifiedTiming,
         PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
     {
         m_animationsWithUpdates.append(UpdatedAnimation(name, animation, effect, specifiedTiming, styleRule));
         m_suppressedAnimations.add(animation);
     }
     void updateAnimationStyle(Animation* animation, KeyframeEffectModelBase* model, LayoutObject* layoutObject, const ComputedStyle& newStyle)
     {
         UpdatedAnimationStyle::CompositableStyleSnapshot snapshot;
         if (layoutObject) {
             const ComputedStyle& oldStyle = layoutObject->styleRef();
             if (!CSSPropertyEquality::propertiesEqual(CSSPropertyOpacity, oldStyle, newStyle) && model->affects(PropertyHandle(CSSPropertyOpacity)))
                 snapshot.opacity = CSSAnimatableValueFactory::create(CSSPropertyOpacity, newStyle);
             if (!CSSPropertyEquality::propertiesEqual(CSSPropertyTransform, oldStyle, newStyle) && model->affects(PropertyHandle(CSSPropertyTransform)))
                 snapshot.transform = CSSAnimatableValueFactory::create(CSSPropertyTransform, newStyle);
             if (!CSSPropertyEquality::propertiesEqual(CSSPropertyWebkitFilter, oldStyle, newStyle) && model->affects(PropertyHandle(CSSPropertyWebkitFilter)))
                 snapshot.webkitFilter = CSSAnimatableValueFactory::create(CSSPropertyWebkitFilter, newStyle);
         }
 
         m_animationsWithStyleUpdates.append(UpdatedAnimationStyle(animation, model, snapshot));
     }
 
-    void startTransition(CSSPropertyID id, const AnimatableValue* from, const AnimatableValue* to, PassRefPtrWillBeRawPtr<InertEffect> effect)
+    void startTransition(CSSPropertyID id, const AnimatableValue* from, const AnimatableValue* to, InertEffect* effect)
     {
         effect->setName(getPropertyName(id));
         NewTransition newTransition;
         newTransition.id = id;
         newTransition.from = from;
         newTransition.to = to;
         newTransition.effect = effect;
         m_newTransitions.set(id, newTransition);
     }
     bool isCancelledTransition(CSSPropertyID id) const { return m_cancelledTransitions.contains(id); }
     void cancelTransition(CSSPropertyID id) { m_cancelledTransitions.add(id); }
     void finishTransition(CSSPropertyID id) { m_finishedTransitions.add(id); }
 
-    const WillBeHeapVector<NewAnimation>& newAnimations() const { return m_newAnimations; }
+    const HeapVector<NewAnimation>& newAnimations() const { return m_newAnimations; }
     const Vector<AtomicString>& cancelledAnimationNames() const { return m_cancelledAnimationNames; }
-    const WillBeHeapHashSet<RawPtrWillBeMember<const Animation>>& suppressedAnimations() const { return m_suppressedAnimations; }
+    const HeapHashSet<Member<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; }
+    const HeapVector<UpdatedAnimation>& animationsWithUpdates() const { return m_animationsWithUpdates; }
+    const HeapVector<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;
-        RefPtrWillBeMember<InertEffect> effect;
+        Member<InertEffect> effect;
     };
-    using NewTransitionMap = WillBeHeapHashMap<CSSPropertyID, NewTransition>;
+    using NewTransitionMap = HeapHashMap<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; }
     const ActiveInterpolationMap& activeInterpolationsForTransitions() const { return m_activeInterpolationsForTransitions; }
     ActiveInterpolationMap& activeInterpolationsForAnimations() { return m_activeInterpolationsForAnimations; }
 
     bool isEmpty() const
     {
         return m_newAnimations.isEmpty()
             && m_cancelledAnimationNames.isEmpty()
             && m_suppressedAnimations.isEmpty()
             && m_animationsWithPauseToggled.isEmpty()
             && m_animationsWithUpdates.isEmpty()
             && m_animationsWithStyleUpdates.isEmpty()
             && m_newTransitions.isEmpty()
             && m_cancelledTransitions.isEmpty()
             && m_finishedTransitions.isEmpty()
             && m_activeInterpolationsForAnimations.isEmpty()
             && m_activeInterpolationsForTransitions.isEmpty();
     }
 
     DEFINE_INLINE_TRACE()
     {
+        visitor->trace(m_newTransitions);
 #if ENABLE(OILPAN)
-        visitor->trace(m_newTransitions);
         visitor->trace(m_activeInterpolationsForAnimations);
         visitor->trace(m_activeInterpolationsForTransitions);
+#endif
         visitor->trace(m_newAnimations);
         visitor->trace(m_suppressedAnimations);
         visitor->trace(m_animationsWithUpdates);
         visitor->trace(m_animationsWithStyleUpdates);
-#endif
     }
 
 private:
     // Order is significant since it defines the order in which new animations
     // will be started. Note that there may be multiple animations present
     // with the same name, due to the way in which we split up animations with
     // incomplete keyframes.
-    WillBeHeapVector<NewAnimation> m_newAnimations;
+    HeapVector<NewAnimation> m_newAnimations;
     Vector<AtomicString> m_cancelledAnimationNames;
-    WillBeHeapHashSet<RawPtrWillBeMember<const Animation>> m_suppressedAnimations;
+    HeapHashSet<Member<const Animation>> m_suppressedAnimations;
     Vector<AtomicString> m_animationsWithPauseToggled;
-    WillBeHeapVector<UpdatedAnimation> m_animationsWithUpdates;
-    WillBeHeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
+    HeapVector<UpdatedAnimation> m_animationsWithUpdates;
+    HeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
 
     NewTransitionMap m_newTransitions;
     HashSet<CSSPropertyID> m_cancelledTransitions;
     HashSet<CSSPropertyID> m_finishedTransitions;
 
     ActiveInterpolationMap m_activeInterpolationsForAnimations;
     ActiveInterpolationMap m_activeInterpolationsForTransitions;
 };
 
 } // 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