Oilpan: Completely move core/animations/ to oilpan's heap

Source/core/animation/AnimationStack.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 namespace {
 
 void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<WebCore::Interpolation> >& source, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<WebCore::Interpolation> >& target)
 {
     for (size_t i = 0; i < source.size(); ++i) {
         Interpolation* interpolation = source[i].get();
         target.set(toStyleInterpolation(interpolation)->id(), interpolation);
     }
 }
 
-bool compareEffects(const OwnPtr<SampledEffect>& effect1, const OwnPtr<SampledEffect>& effect2)
+bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnPtrWillBeMember<SampledEffect>& effect2)
 {
     ASSERT(effect1 && effect2);
     return effect1->sortInfo() < effect2->sortInfo();
 }
 
-void copyNewAnimationsToActiveInterpolationMap(const Vector<InertAnimation*>& newAnimations, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& result)
+void copyNewAnimationsToActiveInterpolationMap(const WillBeHeapVector<RawPtrWillBeMember<InertAnimation> >& newAnimations, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& result)
 {
     for (size_t i = 0; i < newAnimations.size(); ++i) {
         OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > sample = newAnimations[i]->sample(0);
         if (sample) {
             copyToActiveInterpolationMap(*sample, result);
         }
     }
 }
 
 } // namespace
@@ skipping 13 matching lines @@
 
 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
 {
     for (size_t i = 0; i < m_effects.size(); ++i) {
         if (m_effects[i]->animation() && m_effects[i]->animation()->hasActiveAnimationsOnCompositor(property))
             return true;
     }
     return false;
 }
 
-WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > AnimationStack::activeInterpolations(AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const AnimationPlayer*>* cancelledAnimationPlayers, Animation::Priority priority, double timelineCurrentTime)
+WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > AnimationStack::activeInterpolations(AnimationStack* animationStack, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation> >* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer> >* cancelledAnimationPlayers, Animation::Priority priority, double timelineCurrentTime)
 {
     // We don't exactly know when new animations will start, but timelineCurrentTime is a good estimate.
 
     WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result;
 
     if (animationStack) {
-        Vector<OwnPtr<SampledEffect> >& effects = animationStack->m_effects;
+        WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> >& effects = animationStack->m_effects;
         // std::sort doesn't work with OwnPtrs
         nonCopyingSort(effects.begin(), effects.end(), compareEffects);
         animationStack->simplifyEffects();
         for (size_t i = 0; i < effects.size(); ++i) {
             const SampledEffect& effect = *effects[i];
             if (effect.priority() != priority || (cancelledAnimationPlayers && effect.animation() && cancelledAnimationPlayers->contains(effect.animation()->player())))
                 continue;
             if (newAnimations && effect.sortInfo().startTime() > timelineCurrentTime) {
                 copyNewAnimationsToActiveInterpolationMap(*newAnimations, result);
                 newAnimations = 0;
@@ skipping 18 matching lines @@
         effect.removeReplacedInterpolationsIfNeeded(replacedProperties);
         if (!effect.canChange()) {
             for (size_t i = 0; i < effect.interpolations().size(); ++i)
                 replacedProperties.set(toStyleInterpolation(effect.interpolations()[i].get())->id());
         }
     }
 
     size_t dest = 0;
     for (size_t i = 0; i < m_effects.size(); ++i) {
         if (!m_effects[i]->interpolations().isEmpty()) {
-            swap(m_effects[dest++], m_effects[i]);
+            m_effects[dest++].swap(m_effects[i]);
             continue;
         }
         if (m_effects[i]->animation())
             m_effects[i]->animation()->notifySampledEffectRemovedFromAnimationStack();

[dstockwell, 2014/05/01 14:06:54]

This should probably not be necessary. This cleans up Animation's reference
(m_sampledEffect) to m_effects[i]. Instead m_sampledEffect should be a weak
member.

[Timothy Loh, 2014/05/02 05:46:00]

We still need this call, since otherwise if you update an animation with a new
effect after this (and before a gc) we wouldn't attach the effect to the stack.

     }
     m_effects.shrink(dest);
 }
 
+void AnimationStack::trace(Visitor* visitor)
+{
+    visitor->trace(m_effects);
+}
+
 } // namespace WebCore