Oilpan: Move AnimatableValue's hierarchy to oilpan's heap

Source/core/animation/AnimatableLength.h

 /*
  * 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 @@
         UnitTypeFontXSize,
         UnitTypeRootFontSize,
         UnitTypeViewportWidth,
         UnitTypeViewportHeight,
         UnitTypeViewportMin,
         UnitTypeViewportMax,
     };
 
     virtual ~AnimatableLength() { }
     static bool canCreateFrom(const CSSValue*);
-    static PassRefPtr<AnimatableLength> create(CSSValue*);
-    static PassRefPtr<AnimatableLength> create(double number, NumberUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue = 0)
+    static PassRefPtrWillBeRawPtr<AnimatableLength> create(CSSValue*);
+    static PassRefPtrWillBeRawPtr<AnimatableLength> create(double number, NumberUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue = 0)
     {
-        return adoptRef(new AnimatableLength(number, unitType, cssPrimitiveValue));
+        return adoptRefWillBeNoop(new AnimatableLength(number, unitType, cssPrimitiveValue));
     }
-    static PassRefPtr<AnimatableLength> create(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> calcExpression, CSSPrimitiveValue* cssPrimitiveValue = 0)
+    static PassRefPtrWillBeRawPtr<AnimatableLength> create(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> calcExpression, CSSPrimitiveValue* cssPrimitiveValue = 0)
     {
-        return adoptRef(new AnimatableLength(calcExpression, cssPrimitiveValue));
+        return adoptRefWillBeNoop(new AnimatableLength(calcExpression, cssPrimitiveValue));
     }
     PassRefPtrWillBeRawPtr<CSSValue> toCSSValue(NumberRange = AllValues) const;
     Length toLength(const CSSToLengthConversionData&, NumberRange = AllValues) const;
 
+    virtual void trace(Visitor*) OVERRIDE;
+
 protected:
-    virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
-    virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
+    virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
+    virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
     virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVERRIDE;
 
 private:
     AnimatableLength(double number, NumberUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue)
         : m_number(number)
         , m_unitType(unitType)
         , m_cachedCSSPrimitiveValue(cssPrimitiveValue)
     {
         ASSERT(m_unitType != UnitTypeCalc);
     }
@@ skipping 10 matching lines @@
     bool isCalc() const
     {
         return m_unitType == UnitTypeCalc;
     }
 
     bool isViewportUnit() const
     {
         return m_unitType == UnitTypeViewportWidth || m_unitType == UnitTypeViewportHeight || m_unitType == UnitTypeViewportMin || m_unitType == UnitTypeViewportMax;
     }
 
-    static PassRefPtr<AnimatableLength> create(const AnimatableLength* leftAddend, const AnimatableLength* rightAddend)
+    static PassRefPtrWillBeRawPtr<AnimatableLength> create(const AnimatableLength* leftAddend, const AnimatableLength* rightAddend)
     {
         ASSERT(leftAddend && rightAddend);
         return create(CSSCalcValue::createExpressionNode(leftAddend->toCSSCalcExpressionNode(), rightAddend->toCSSCalcExpressionNode(), CalcAdd));
     }
 
     PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toCSSPrimitiveValue(NumberRange) const;
     PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> toCSSCalcExpressionNode() const;
 
-    PassRefPtr<AnimatableLength> scale(double) const;
+    PassRefPtrWillBeRawPtr<AnimatableLength> scale(double) const;
     double clampedNumber(NumberRange range) const
     {
         ASSERT(!isCalc());
         return (range == NonNegativeValues && m_number <= 0) ? 0 : m_number;
     }
 
     // Returns true and populates numberType, if primitiveUnit is a primitive length unit. Otherwise, returns false.
     static bool primitiveUnitToNumberType(unsigned short primitiveUnit, NumberUnitType& numberType);
 
     static unsigned short numberTypeToPrimitiveUnit(NumberUnitType numberType);
@@ skipping 15 matching lines @@
             return length->m_unitType;
         if (length->isUnitlessZero())
             return m_unitType;
 
         return UnitTypeCalc;
     }
 
     double m_number;
     const NumberUnitType m_unitType;
 
-    RefPtrWillBePersistent<CSSCalcExpressionNode> m_calcExpression;
+    RefPtrWillBeMember<CSSCalcExpressionNode> m_calcExpression;
 
-    mutable RefPtrWillBePersistent<CSSPrimitiveValue> m_cachedCSSPrimitiveValue;
+    mutable RefPtrWillBeMember<CSSPrimitiveValue> m_cachedCSSPrimitiveValue;
 
     friend class AnimationAnimatableLengthTest;
 };
 
 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLength, isLength());
 
 } // namespace WebCore
 
 #endif // AnimatableLength_h