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

Source/core/animation/AnimatableValue.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 26 matching lines @@
 namespace {
 
 const double defaultDistance = 1;
 
 } // namespace
 
 namespace WebCore {
 
 const AnimatableValue* AnimatableValue::neutralValue()
 {
+#if ENABLE_OILPAN
+    DEFINE_STATIC_LOCAL(Persistent<AnimatableNeutral>, neutralSentinelValue, (AnimatableNeutral::create()));
+#else
     DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, (AnimatableNeutral::create()));
-    return neutralSentinelValue;
+#endif
+    return neutralSentinelValue.get();

[Mads Ager (chromium), 2014/03/20 14:51:55]

Does this compile in the non oilpan build? Isn't neutralSentinelValue just a
pointer with no get method?

[haraken, 2014/03/21 13:45:04]

Done.

 }
 
-PassRefPtr<AnimatableValue> AnimatableValue::interpolate(const AnimatableValue* left, const AnimatableValue* right, double fraction)
+PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableValue::interpolate(const AnimatableValue* left, const AnimatableValue* right, double fraction)
 {
     ASSERT(left);
     ASSERT(right);
     ASSERT(!left->isNeutral());
     ASSERT(!right->isNeutral());
 
     if (fraction && fraction != 1 && left->isSameType(right))
         return left->interpolateTo(right, fraction);
 
     return defaultInterpolateTo(left, right, fraction);
 }
 
-PassRefPtr<AnimatableValue> AnimatableValue::add(const AnimatableValue* left, const AnimatableValue* right)
+PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableValue::add(const AnimatableValue* left, const AnimatableValue* right)
 {
     ASSERT(left);
     ASSERT(right);
 
     if (left->isNeutral())
         return takeConstRef(right);
     if (right->isNeutral())
         return takeConstRef(left);
 
     if (left->isSameType(right))
         return left->addWith(right);
 
     return defaultAddWith(left, right);
 }
 
-PassRefPtr<AnimatableValue> AnimatableValue::addWith(const AnimatableValue* value) const
+PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableValue::addWith(const AnimatableValue* value) const
 {
     return defaultAddWith(this, value);
 }
 
 double AnimatableValue::distance(const AnimatableValue* left, const AnimatableValue* right)
 {
     ASSERT(left);
     ASSERT(right);
 
     if (left->isSameType(right))
         return left->distanceTo(right);
 
     return defaultDistance;
 }
 
 double AnimatableValue::distanceTo(const AnimatableValue*) const
 {
     return defaultDistance;
 }
 
 } // namespace WebCore