Oilpan: Unship CSSValues and AnimatableValues

Source/core/animation/animatable/AnimatableStrokeDasharrayList.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 34 matching lines @@
 PassRefPtr<SVGDashArray> AnimatableStrokeDasharrayList::toSVGDashArray(float zoom) const
 {
     RefPtr<SVGDashArray> lengths = SVGDashArray::create();
     for (const auto& dashLength : m_values)
         lengths->append(toAnimatableLength(dashLength.get())->length(zoom, ValueRangeNonNegative));
     return lengths.release();
 }
 
 bool AnimatableStrokeDasharrayList::usesDefaultInterpolationWith(const AnimatableValue* value) const
 {
-    WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> from = m_values;
-    WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> to = toAnimatableStrokeDasharrayList(value)->m_values;
+    Vector<RefPtr<AnimatableValue>> from = m_values;
+    Vector<RefPtr<AnimatableValue>> to = toAnimatableStrokeDasharrayList(value)->m_values;
     return !from.isEmpty() && !to.isEmpty() && AnimatableRepeatable::usesDefaultInterpolationWith(value);
 }
 
-PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableStrokeDasharrayList::interpolateTo(const AnimatableValue* value, double fraction) const
+PassRefPtr<AnimatableValue> AnimatableStrokeDasharrayList::interpolateTo(const AnimatableValue* value, double fraction) const
 {
     if (usesDefaultInterpolationWith(value))
         return defaultInterpolateTo(this, value, fraction);
 
-    WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> from = m_values;
-    WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> to = toAnimatableStrokeDasharrayList(value)->m_values;
+    Vector<RefPtr<AnimatableValue>> from = m_values;
+    Vector<RefPtr<AnimatableValue>> to = toAnimatableStrokeDasharrayList(value)->m_values;
 
     // The spec states that if the sum of all values is zero, this should be
     // treated like a value of 'none', which means that a solid line is drawn.
     // Since we animate to and from values of zero, treat a value of 'none' the
     // same. If both the two and from values are 'none', we return 'none'
     // rather than '0 0'.
     if (from.isEmpty() && to.isEmpty())
         return takeConstRef(this);
     if (from.isEmpty() || to.isEmpty()) {
-        DEFINE_STATIC_REF_WILL_BE_PERSISTENT(AnimatableLength, zeroPixels, (AnimatableLength::create(Length(Fixed), 1)));
+        DEFINE_STATIC_REF(AnimatableLength, zeroPixels, (AnimatableLength::create(Length(Fixed), 1)));
         if (from.isEmpty()) {
             from.append(zeroPixels);
             from.append(zeroPixels);
         }
         if (to.isEmpty()) {
             to.append(zeroPixels);
             to.append(zeroPixels);
         }
     }
 
-    WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> interpolatedValues;
+    Vector<RefPtr<AnimatableValue>> interpolatedValues;
     bool success = interpolateLists(from, to, fraction, interpolatedValues);
     ASSERT_UNUSED(success, success);
-    return adoptRefWillBeNoop(new AnimatableStrokeDasharrayList(interpolatedValues));
-}
-
-DEFINE_TRACE(AnimatableStrokeDasharrayList)
-{
-    AnimatableRepeatable::trace(visitor);
+    return adoptRef(new AnimatableStrokeDasharrayList(interpolatedValues));
 }
 
 } // namespace blink