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

Unified Diff: Source/core/animation/Keyframe.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: Resize expect size of Persistent Created 5 years, 7 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 346a10d9971f9f434845aa22640fd9301c732da2..1f5f8c8990797c072a9815d8cb2bb98e7a2ea728 100644
--- a/Source/core/animation/Keyframe.h
+++ b/Source/core/animation/Keyframe.h
@@ -19,7 +19,7 @@ class Element;
class ComputedStyle;
// FIXME: Make Keyframe immutable
-class CORE_EXPORT Keyframe : public RefCountedWillBeGarbageCollectedFinalized<Keyframe> {
+class CORE_EXPORT Keyframe : public GarbageCollectedFinalized<Keyframe> {
public:
virtual ~Keyframe() { }
@@ -32,19 +32,19 @@ 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 Member<Keyframe>& a, const Member<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 Keyframe* clone() const = 0;
+ Keyframe* cloneWithOffset(double offset) const
{
- RefPtrWillBeRawPtr<Keyframe> theClone = clone();
+ Keyframe* theClone = clone();
theClone->setOffset(offset);
- return theClone.release();
+ return theClone;
}
virtual bool isAnimatableValueKeyframe() const { return false; }
@@ -52,24 +52,24 @@ public:
DEFINE_INLINE_VIRTUAL_TRACE() { }
- class PropertySpecificKeyframe : public NoBaseWillBeGarbageCollectedFinalized<PropertySpecificKeyframe> {
+ class PropertySpecificKeyframe : public GarbageCollectedFinalized<PropertySpecificKeyframe> {
public:
virtual ~PropertySpecificKeyframe() { }
double offset() const { return m_offset; }
TimingFunction& easing() const { return *m_easing; }
EffectModel::CompositeOperation composite() const { return m_composite; }
- virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
+ virtual 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 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;
+ virtual PropertySpecificKeyframe* neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
+ virtual Interpolation* maybeCreateInterpolation(PropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
DEFINE_INLINE_VIRTUAL_TRACE() { }
@@ -81,7 +81,7 @@ public:
EffectModel::CompositeOperation m_composite;
};
- virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> createPropertySpecificKeyframe(PropertyHandle) const = 0;
+ virtual PropertySpecificKeyframe* createPropertySpecificKeyframe(PropertyHandle) const = 0;
protected:
Keyframe()

Powered by Google App Engine
This is Rietveld 408576698