Oilpan: Unship oilpan from temporary animation objects

Source/core/animation/KeyframeEffectModel.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 45 matching lines @@
 }
 
 void KeyframeEffectModelBase::setFrames(KeyframeVector& keyframes)
 {
     // TODO(samli): Should also notify/invalidate the animation
     m_keyframes = keyframes;
     m_keyframeGroups = nullptr;
     m_interpolationEffect = nullptr;
 }
 
-void KeyframeEffectModelBase::sample(int iteration, double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& result) const
+void KeyframeEffectModelBase::sample(int iteration, double fraction, double iterationDuration, OwnPtr<Vector<RefPtr<Interpolation>>>& result) const
 {
     ASSERT(iteration >= 0);
     ASSERT(!isNull(fraction));
     ensureKeyframeGroups();
     ensureInterpolationEffect();
 
     return m_interpolationEffect->getActiveInterpolations(fraction, iterationDuration, result);
 }
 
 void KeyframeEffectModelBase::forceConversionsToAnimatableValues(Element& element, const ComputedStyle* baseStyle)
 {
     ensureKeyframeGroups();
     snapshotCompositableProperties(element, baseStyle);
     ensureInterpolationEffect(&element, baseStyle);
 }
 
 void KeyframeEffectModelBase::snapshotCompositableProperties(Element& element, const ComputedStyle* baseStyle)
 {
     ensureKeyframeGroups();
     for (CSSPropertyID id : CompositorAnimations::compositableProperties) {
         PropertyHandle property = PropertyHandle(id);
         if (!affects(property))
             continue;
         for (auto& keyframe : m_keyframeGroups->get(property)->m_keyframes)
             keyframe->populateAnimatableValue(id, element, baseStyle);
     }
 }
 
-bool KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
+bool KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, PassRefPtr<AnimatableValue> value)
 {
     ASSERT(CompositorAnimations::isCompositableProperty(property));
 
     if (!value)
         return false;
 
     ensureKeyframeGroups();
     auto& keyframes = m_keyframeGroups->get(PropertyHandle(property))->m_keyframes;
     ASSERT(keyframes.size() >= 2);
 
@@ skipping 54 matching lines @@
         || affects(PropertyHandle(CSSPropertyRotate))
         || affects(PropertyHandle(CSSPropertyScale))
         || affects(PropertyHandle(CSSPropertyTranslate));
 }
 
 void KeyframeEffectModelBase::ensureKeyframeGroups() const
 {
     if (m_keyframeGroups)
         return;
 
-    m_keyframeGroups = adoptPtrWillBeNoop(new KeyframeGroupMap);
+    m_keyframeGroups = adoptPtr(new KeyframeGroupMap);
     for (const auto& keyframe : normalizedKeyframes(getFrames())) {
         for (const PropertyHandle& property : keyframe->properties()) {
             if (property.isCSSProperty())
                 ASSERT_WITH_MESSAGE(!isShorthandProperty(property.cssProperty()), "Web Animations: Encountered shorthand CSS property (%d) in normalized keyframes.", property.cssProperty());
             KeyframeGroupMap::iterator groupIter = m_keyframeGroups->find(property);
             PropertySpecificKeyframeGroup* group;
             if (groupIter == m_keyframeGroups->end())
-                group = m_keyframeGroups->add(property, adoptPtrWillBeNoop(new PropertySpecificKeyframeGroup)).storedValue->value.get();
+                group = m_keyframeGroups->add(property, adoptPtr(new PropertySpecificKeyframeGroup)).storedValue->value.get();
             else
                 group = groupIter->value.get();
 
             group->appendKeyframe(keyframe->createPropertySpecificKeyframe(property));
         }
     }
 
     // Add synthetic keyframes.
     m_hasSyntheticKeyframes = false;
     for (const auto& entry : *m_keyframeGroups) {
@@ skipping 28 matching lines @@
     ensureKeyframeGroups();
     for (const auto& entry : *m_keyframeGroups) {
         for (const auto& keyframe : entry.value->keyframes()) {
             if (keyframe->composite() != EffectModel::CompositeReplace)
                 return false;
         }
     }
     return true;
 }
 
-DEFINE_TRACE(KeyframeEffectModelBase)
-{
-    visitor->trace(m_keyframes);
-#if ENABLE(OILPAN)
-    visitor->trace(m_keyframeGroups);
-#endif
-    visitor->trace(m_interpolationEffect);
-    EffectModel::trace(visitor);
-}
-
 Keyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, EffectModel::CompositeOperation composite)
     : m_offset(offset)
     , m_easing(easing)
     , m_composite(composite)
 {
 }
 
-void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::appendKeyframe(PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> keyframe)
+void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::appendKeyframe(PassOwnPtr<Keyframe::PropertySpecificKeyframe> keyframe)
 {
     ASSERT(m_keyframes.isEmpty() || m_keyframes.last()->offset() <= keyframe->offset());
     m_keyframes.append(keyframe);
 }
 
 void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::removeRedundantKeyframes()
 {
     // As an optimization, removes keyframes in the following categories, as
     // they will never be used by sample().
     // - End keyframes with the same offset as their neighbor
@@ skipping 22 matching lines @@
         addedSyntheticKeyframe = true;
     }
     if (m_keyframes.last()->offset() != 1.0) {
         appendKeyframe(m_keyframes.last()->neutralKeyframe(1, easing));
         addedSyntheticKeyframe = true;
     }
 
     return addedSyntheticKeyframe;
 }
 
-DEFINE_TRACE(KeyframeEffectModelBase::PropertySpecificKeyframeGroup)
-{
-#if ENABLE(OILPAN)
-    visitor->trace(m_keyframes);
-#endif
-}
-
 } // namespace