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

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
Index: Source/core/animation/AnimatableValue.cpp
diff --git a/Source/core/animation/AnimatableValue.cpp b/Source/core/animation/AnimatableValue.cpp
index a8b9557f2dc6868209555e7efac2bc85482af7f9..02c8849c5219015c9c04d11aa5ac1e676a36e815 100644
--- a/Source/core/animation/AnimatableValue.cpp
+++ b/Source/core/animation/AnimatableValue.cpp
@@ -44,11 +44,15 @@ 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 n
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);
@@ -61,7 +65,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 +81,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);
}

Powered by Google App Engine
This is Rietveld 408576698