[Oilpan] Migrate most classes under core/animations to Oilpan heap.

Source/core/animation/Animation.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 @@
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/PropertyHandle.h"
 #include "core/dom/Element.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/UseCounter.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "core/svg/SVGElement.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<Animation> Animation::create(Element* target, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtrWillBeRawPtr<EventDelegate> eventDelegate)
+Animation* Animation::create(Element* target, AnimationEffect* effect, const Timing& timing, Priority priority, EventDelegate* eventDelegate)
 {
-    return adoptRefWillBeNoop(new Animation(target, effect, timing, priority, eventDelegate));
+    return new Animation(target, effect, timing, priority, eventDelegate);
 }
 
-PassRefPtrWillBeRawPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)
+Animation* Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)
 {
     ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
     if (element)
         UseCounter::count(element->document(), UseCounter::AnimationConstructorKeyframeListEffectObjectTiming);
     return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(duration));
 }
-PassRefPtrWillBeRawPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, const AnimationTimingProperties& timingInput, ExceptionState& exceptionState)
+Animation* Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, const AnimationTimingProperties& timingInput, ExceptionState& exceptionState)
 {
     ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
     if (element)
         UseCounter::count(element->document(), UseCounter::AnimationConstructorKeyframeListEffectObjectTiming);
     return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(timingInput));
 }
-PassRefPtrWillBeRawPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
+Animation* Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
 {
     ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
     if (element)
         UseCounter::count(element->document(), UseCounter::AnimationConstructorKeyframeListEffectNoTiming);
     return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), Timing());
 }
 
-Animation::Animation(Element* target, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtrWillBeRawPtr<EventDelegate> eventDelegate)
+Animation::Animation(Element* target, AnimationEffect* effect, const Timing& timing, Priority priority, EventDelegate* eventDelegate)
     : AnimationNode(timing, eventDelegate)
     , m_target(target)
     , m_effect(effect)
     , m_sampledEffect(nullptr)
     , m_priority(priority)
 {
-#if !ENABLE(OILPAN)
-    if (m_target)
-        m_target->ensureElementAnimations().addAnimation(this);

[haraken, 2015/05/08 00:13:06]

You cannot remove this.

[peria, 2015/05/08 02:21:20]

Acknowledged.

-#endif
 }
 
 Animation::~Animation()
 {
-#if !ENABLE(OILPAN)
-    if (m_target)
-        m_target->elementAnimations()->notifyAnimationDestroyed(this);

[haraken, 2015/05/08 00:13:06]

Ditto.

[peria, 2015/05/08 02:21:20]

Acknowledged.

-#endif
 }
 
 void Animation::attach(AnimationPlayer* player)
 {
     if (m_target) {
         m_target->ensureElementAnimations().players().add(player);
         m_target->setNeedsAnimationStyleRecalc();
     }
     AnimationNode::attach(player);
 }
@@ skipping 31 matching lines @@
     // Cancel composited animation of transform if a motion path has been introduced on the element.
     if (m_target->computedStyle()
         && m_target->computedStyle()->hasMotionPath()
         && player()->hasActiveAnimationsOnCompositor()
         && player()->affects(*m_target, CSSPropertyTransform)) {
         player()->cancelAnimationOnCompositor();
     }
 
     double iteration = currentIteration();
     ASSERT(iteration >= 0);
-    OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations = m_sampledEffect ? m_sampledEffect->mutableInterpolations() : nullptr;
+    HeapVector<Member<Interpolation>>* interpolations = m_sampledEffect ? m_sampledEffect->mutableInterpolations() : nullptr;
     // FIXME: Handle iteration values which overflow int.
     m_effect->sample(static_cast<int>(iteration), timeFraction(), iterationDuration(), interpolations);
     if (m_sampledEffect) {
-        m_sampledEffect->setInterpolations(interpolations.release());
+        m_sampledEffect->setInterpolations(interpolations);
     } else if (interpolations && !interpolations->isEmpty()) {
-        OwnPtrWillBeRawPtr<SampledEffect> sampledEffect = SampledEffect::create(this, interpolations.release());
-        m_sampledEffect = sampledEffect.get();
-        ensureAnimationStack(m_target).add(sampledEffect.release());
+        SampledEffect* sampledEffect = SampledEffect::create(this, interpolations);
+        m_sampledEffect = sampledEffect;
+        ensureAnimationStack(m_target).add(sampledEffect);
     } else {
         return;
     }
 
     m_target->setNeedsAnimationStyleRecalc();
     if (m_target->isSVGElement())
         m_sampledEffect->applySVGUpdate(toSVGElement(*m_target));
 }
 
 void Animation::clearEffects()
@@ skipping 48 matching lines @@
         // that will be, however, so the parent will need to supply it.
         return forwards
             ? std::numeric_limits<double>::infinity()
             : localTime - end;
     default:
         ASSERT_NOT_REACHED();
         return std::numeric_limits<double>::infinity();
     }
 }
 
-#if !ENABLE(OILPAN)
-void Animation::notifyElementDestroyed()

[haraken, 2015/05/08 00:13:06]

Ditto.

[peria, 2015/05/08 02:21:20]

Acknowledged.

-{
-    // If our player is kept alive just by the sampledEffect, we might get our
-    // destructor called when we call SampledEffect::clear(), so we need to
-    // clear m_sampledEffect first.
-    m_target = nullptr;
-    clearEventDelegate();
-    SampledEffect* sampledEffect = m_sampledEffect;
-    m_sampledEffect = nullptr;
-    if (sampledEffect)
-        sampledEffect->clear();
-}
-#endif
-
 bool Animation::isCandidateForAnimationOnCompositor(double playerPlaybackRate) const
 {
     if (!effect()
         || !m_target
         || (m_target->computedStyle() && m_target->computedStyle()->hasMotionPath()))
         return false;
 
     return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *m_target, player(), *effect(), playerPlaybackRate);
 }
 
@@ skipping 81 matching lines @@
 
 DEFINE_TRACE(Animation)
 {
     visitor->trace(m_target);
     visitor->trace(m_effect);
     visitor->trace(m_sampledEffect);
     AnimationNode::trace(visitor);
 }
 
 } // namespace blink