| Index: Source/core/animation/KeyframeEffectModel.cpp
 | 
| diff --git a/Source/core/animation/KeyframeEffectModel.cpp b/Source/core/animation/KeyframeEffectModel.cpp
 | 
| index 91e8b47c655acc0ddf27db0cddda0d3831307462..afd190ca6d67b52b08fa2f5adbba52339e522c06 100644
 | 
| --- a/Source/core/animation/KeyframeEffectModel.cpp
 | 
| +++ b/Source/core/animation/KeyframeEffectModel.cpp
 | 
| @@ -63,7 +63,7 @@ void KeyframeEffectModelBase::setFrames(KeyframeVector& keyframes)
 | 
|      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, HeapVector<Member<Interpolation>>*& result) const
 | 
|  {
 | 
|      ASSERT(iteration >= 0);
 | 
|      ASSERT(!isNull(fraction));
 | 
| @@ -92,7 +92,7 @@ void KeyframeEffectModelBase::snapshotCompositableProperties(Element& element, c
 | 
|      }
 | 
|  }
 | 
|  
 | 
| -bool KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
 | 
| +bool KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, AnimatableValue* value)
 | 
|  {
 | 
|      ASSERT(CompositorAnimations::isCompositableProperty(property));
 | 
|  
 | 
| @@ -167,7 +167,7 @@ void KeyframeEffectModelBase::ensureKeyframeGroups() const
 | 
|      if (m_keyframeGroups)
 | 
|          return;
 | 
|  
 | 
| -    m_keyframeGroups = adoptPtrWillBeNoop(new KeyframeGroupMap);
 | 
| +    m_keyframeGroups = new KeyframeGroupMap;
 | 
|      for (const auto& keyframe : normalizedKeyframes(getFrames())) {
 | 
|          for (const PropertyHandle& property : keyframe->properties()) {
 | 
|              if (property.isCSSProperty())
 | 
| @@ -175,7 +175,7 @@ void KeyframeEffectModelBase::ensureKeyframeGroups() const
 | 
|              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, new PropertySpecificKeyframeGroup).storedValue->value.get();
 | 
|              else
 | 
|                  group = groupIter->value.get();
 | 
|  
 | 
| @@ -227,9 +227,7 @@ bool KeyframeEffectModelBase::isReplaceOnly()
 | 
|  DEFINE_TRACE(KeyframeEffectModelBase)
 | 
|  {
 | 
|      visitor->trace(m_keyframes);
 | 
| -#if ENABLE(OILPAN)
 | 
|      visitor->trace(m_keyframeGroups);
 | 
| -#endif
 | 
|      visitor->trace(m_interpolationEffect);
 | 
|      EffectModel::trace(visitor);
 | 
|  }
 | 
| @@ -241,7 +239,7 @@ Keyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, Pass
 | 
|  {
 | 
|  }
 | 
|  
 | 
| -void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::appendKeyframe(PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> keyframe)
 | 
| +void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::appendKeyframe(Keyframe::PropertySpecificKeyframe* keyframe)
 | 
|  {
 | 
|      ASSERT(m_keyframes.isEmpty() || m_keyframes.last()->offset() <= keyframe->offset());
 | 
|      m_keyframes.append(keyframe);
 | 
| @@ -286,9 +284,7 @@ bool KeyframeEffectModelBase::PropertySpecificKeyframeGroup::addSyntheticKeyfram
 | 
|  
 | 
|  DEFINE_TRACE(KeyframeEffectModelBase::PropertySpecificKeyframeGroup)
 | 
|  {
 | 
| -#if ENABLE(OILPAN)
 | 
|      visitor->trace(m_keyframes);
 | 
| -#endif
 | 
|  }
 | 
|  
 | 
|  } // namespace
 | 
| 
 |