Oilpan: Unship oilpan from temporary animation objects

Source/core/animation/animatable/AnimatableFilterOperations.cpp

Index: Source/core/animation/animatable/AnimatableFilterOperations.cpp
diff --git a/Source/core/animation/animatable/AnimatableFilterOperations.cpp b/Source/core/animation/animatable/AnimatableFilterOperations.cpp
index 8c70abde346a8c274f0d8191f973a947cbec758a..692d8df0c891e24b6b3217f45d0ea7c13aac40b4 100644
--- a/Source/core/animation/animatable/AnimatableFilterOperations.cpp
+++ b/Source/core/animation/animatable/AnimatableFilterOperations.cpp
@@ -41,7 +41,7 @@ bool AnimatableFilterOperations::usesDefaultInterpolationWith(const AnimatableVa
     return !operations().canInterpolateWith(target->operations());
 }
 
-PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableFilterOperations::interpolateTo(const AnimatableValue* value, double fraction) const
+PassRefPtr<AnimatableValue> AnimatableFilterOperations::interpolateTo(const AnimatableValue* value, double fraction) const
 {
     if (usesDefaultInterpolationWith(value))
         return defaultInterpolateTo(this, value, fraction);
@@ -52,8 +52,13 @@ PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableFilterOperations::interpolateT
     size_t toSize = target->operations().size();
     size_t size = std::max(fromSize, toSize);
     for (size_t i = 0; i < size; i++) {
+#if ENABLE(OILPAN)
+        FilterOperation* from = (i < fromSize) ? m_operationWrapper->operations().operations()[i].get() : 0;
+        FilterOperation* to = (i < toSize) ? target->m_operationWrapper->operations().operations()[i].get() : 0;
+#else
         FilterOperation* from = (i < fromSize) ? m_operations.operations()[i].get() : 0;
         FilterOperation* to = (i < toSize) ? target->m_operations.operations()[i].get() : 0;
+#endif
         RefPtrWillBeRawPtr<FilterOperation> blendedOp = FilterOperation::blend(from, to, fraction);
         if (blendedOp)
             result.operations().append(blendedOp);
@@ -68,10 +73,4 @@ bool AnimatableFilterOperations::equalTo(const AnimatableValue* value) const
     return operations() == toAnimatableFilterOperations(value)->operations();
 }
 
-DEFINE_TRACE(AnimatableFilterOperations)
-{
-    visitor->trace(m_operations);
-    AnimatableValue::trace(visitor);
-}
-
 } // namespace blink