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

Unified Diff: Source/core/animation/Keyframe.h

Issue 1276183004: Oilpan: Unship oilpan from temporary animation objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/Keyframe.h
diff --git a/Source/core/animation/Keyframe.h b/Source/core/animation/Keyframe.h
index 527fb9a204ae1344b99b03aef190b4922a5f283f..f21f20a90f0bad5ef1752929c45677f131f33823 100644
--- a/Source/core/animation/Keyframe.h
+++ b/Source/core/animation/Keyframe.h
@@ -20,8 +20,8 @@ class Element;
class ComputedStyle;
// FIXME: Make Keyframe immutable
-class CORE_EXPORT Keyframe : public RefCountedWillBeGarbageCollectedFinalized<Keyframe> {
- WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(Keyframe);
+class CORE_EXPORT Keyframe : public RefCounted<Keyframe> {
+ WTF_MAKE_FAST_ALLOCATED(Keyframe);
WTF_MAKE_NONCOPYABLE(Keyframe);
public:
virtual ~Keyframe() { }
@@ -35,17 +35,17 @@ public:
void setEasing(PassRefPtr<TimingFunction> easing) { m_easing = easing; }
TimingFunction& easing() const { return *m_easing; }
- static bool compareOffsets(const RefPtrWillBeMember<Keyframe>& a, const RefPtrWillBeMember<Keyframe>& b)
+ static bool compareOffsets(const RefPtr<Keyframe>& a, const RefPtr<Keyframe>& b)
{
return a->offset() < b->offset();
}
virtual PropertyHandleSet properties() const = 0;
- virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const = 0;
- PassRefPtrWillBeRawPtr<Keyframe> cloneWithOffset(double offset) const
+ virtual PassRefPtr<Keyframe> clone() const = 0;
+ PassRefPtr<Keyframe> cloneWithOffset(double offset) const
{
- RefPtrWillBeRawPtr<Keyframe> theClone = clone();
+ RefPtr<Keyframe> theClone = clone();
theClone->setOffset(offset);
return theClone.release();
}
@@ -53,10 +53,8 @@ public:
virtual bool isAnimatableValueKeyframe() const { return false; }
virtual bool isStringKeyframe() const { return false; }
- DEFINE_INLINE_VIRTUAL_TRACE() { }
-
- class PropertySpecificKeyframe : public NoBaseWillBeGarbageCollectedFinalized<PropertySpecificKeyframe> {
- WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PropertySpecificKeyframe);
+ class PropertySpecificKeyframe {
+ WTF_MAKE_FAST_ALLOCATED(PropertySpecificKeyframe);
WTF_MAKE_NONCOPYABLE(PropertySpecificKeyframe);
public:
virtual ~PropertySpecificKeyframe() { }
@@ -65,20 +63,18 @@ public:
EffectModel::CompositeOperation composite() const { return m_composite; }
double underlyingFraction() const { return m_composite == EffectModel::CompositeReplace ? 0 : 1; }
virtual bool isNeutral() const { ASSERT_NOT_REACHED(); return false; }
- virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
+ virtual PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
// FIXME: Remove this once CompositorAnimations no longer depends on AnimatableValues
virtual void populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle) const { }
- virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const = 0;
+ virtual const PassRefPtr<AnimatableValue> getAnimatableValue() const = 0;
virtual bool isAnimatableValuePropertySpecificKeyframe() const { return false; }
virtual bool isCSSPropertySpecificKeyframe() const { return false; }
virtual bool isSVGPropertySpecificKeyframe() const { return false; }
- virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
- virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
-
- DEFINE_INLINE_VIRTUAL_TRACE() { }
+ virtual PassOwnPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
+ virtual PassRefPtr<Interpolation> maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
protected:
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, EffectModel::CompositeOperation);
@@ -88,7 +84,7 @@ public:
EffectModel::CompositeOperation m_composite;
};
- virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const = 0;
+ virtual PassOwnPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const = 0;
protected:
Keyframe()

Powered by Google App Engine
This is Rietveld 408576698