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

Unified Diff: Source/core/animation/animatable/AnimatableValue.h

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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/animatable/AnimatableValue.h
diff --git a/Source/core/animation/animatable/AnimatableValue.h b/Source/core/animation/animatable/AnimatableValue.h
index 71fa6944c14c882da74042800d0f3c19374800db..563a543582f9a194e0f739c2146adbd46ec020c9 100644
--- a/Source/core/animation/animatable/AnimatableValue.h
+++ b/Source/core/animation/animatable/AnimatableValue.h
@@ -38,13 +38,13 @@
namespace blink {
-class CORE_EXPORT AnimatableValue : public RefCountedWillBeGarbageCollectedFinalized<AnimatableValue> {
+class CORE_EXPORT AnimatableValue : public GarbageCollectedFinalized<AnimatableValue> {
public:
virtual ~AnimatableValue() { }
static const AnimatableValue* neutralValue();
- static PassRefPtrWillBeRawPtr<AnimatableValue> interpolate(const AnimatableValue*, const AnimatableValue*, double fraction);
+ static AnimatableValue* interpolate(const AnimatableValue*, const AnimatableValue*, double fraction);
static bool usesDefaultInterpolation(const AnimatableValue* from, const AnimatableValue* to)
{
return !from->isSameType(to) || from->usesDefaultInterpolationWith(to);
@@ -117,11 +117,11 @@ protected:
};
virtual bool usesDefaultInterpolationWith(const AnimatableValue* value) const { return false; }
- virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const = 0;
- static PassRefPtrWillBeRawPtr<AnimatableValue> defaultInterpolateTo(const AnimatableValue* left, const AnimatableValue* right, double fraction) { return takeConstRef((fraction < 0.5) ? left : right); }
+ virtual AnimatableValue* interpolateTo(const AnimatableValue*, double fraction) const = 0;
+ static AnimatableValue* defaultInterpolateTo(const AnimatableValue* left, const AnimatableValue* right, double fraction) { return takeConstRef((fraction < 0.5) ? left : right); }
template <class T>
- static PassRefPtrWillBeRawPtr<T> takeConstRef(const T* value) { return PassRefPtrWillBeRawPtr<T>(const_cast<T*>(value)); }
+ static T* takeConstRef(const T* value) { return const_cast<T*>(value); }
private:
virtual AnimatableType type() const = 0;
« no previous file with comments | « Source/core/animation/animatable/AnimatableUnknownTest.cpp ('k') | Source/core/animation/animatable/AnimatableValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698