Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Unified Diff: Source/core/animation/AnimatableValue.cpp

Issue 204743002: Oilpan: Move AnimatableValue's hierarchy to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/animation/AnimatableValue.h ('k') | Source/core/animation/AnimatableValueTestHelper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimatableValue.cpp
diff --git a/Source/core/animation/AnimatableValue.cpp b/Source/core/animation/AnimatableValue.cpp
index a8b9557f2dc6868209555e7efac2bc85482af7f9..d5d7f846c785ca20fe1c4efb7f5e5ff3c02900c0 100644
--- a/Source/core/animation/AnimatableValue.cpp
+++ b/Source/core/animation/AnimatableValue.cpp
@@ -44,11 +44,16 @@ namespace WebCore {
const AnimatableValue* AnimatableValue::neutralValue()
{
+#if ENABLE_OILPAN
+ DEFINE_STATIC_LOCAL(Persistent<AnimatableNeutral>, neutralSentinelValue, (AnimatableNeutral::create()));
+ return neutralSentinelValue.get();
+#else
DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, (AnimatableNeutral::create()));
return neutralSentinelValue;
+#endif
}
-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);
@@ -61,7 +66,7 @@ PassRefPtr<AnimatableValue> AnimatableValue::interpolate(const AnimatableValue*
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);
@@ -77,7 +82,7 @@ PassRefPtr<AnimatableValue> AnimatableValue::add(const AnimatableValue* left, co
return defaultAddWith(left, right);
}
-PassRefPtr<AnimatableValue> AnimatableValue::addWith(const AnimatableValue* value) const
+PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableValue::addWith(const AnimatableValue* value) const
{
return defaultAddWith(this, value);
}
« no previous file with comments | « Source/core/animation/AnimatableValue.h ('k') | Source/core/animation/AnimatableValueTestHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698