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

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

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/Interpolation.h ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.h
diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
index e22831ec109b5b5e11e37b63d43eb17536f4420e..f41e23f606d8bb565b5dc91535d457b21e440e5f 100644
--- a/Source/core/animation/KeyframeEffectModel.h
+++ b/Source/core/animation/KeyframeEffectModel.h
@@ -73,14 +73,15 @@ public:
PassRefPtrWillBeRawPtr<Keyframe> clone() const { return adoptRefWillBeNoop(new Keyframe(*this)); }
PassRefPtrWillBeRawPtr<Keyframe> cloneWithOffset(double offset) const;
- void trace(Visitor*) { }
+ void trace(Visitor*);
+
private:
Keyframe();
Keyframe(const Keyframe&);
double m_offset;
AnimationEffect::CompositeOperation m_composite;
RefPtr<TimingFunction> m_easing;
- typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap;
+ typedef WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue> > PropertyValueMap;
PropertyValueMap m_propertyValues;
};
@@ -121,12 +122,18 @@ public:
const AnimatableValue* value() const { return m_value.get(); }
AnimationEffect::CompositeOperation composite() const { return m_composite; }
PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const;
Mads Ager (chromium) 2014/03/21 13:49:30 Where is this PassOwnPtr consumed? Are you tracing
+
+ void trace(Visitor* visitor)
+ {
+ visitor->trace(m_value);
+ }
+
private:
// Used by cloneWithOffset().
- PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue>, CompositeOperation);
+ PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>, CompositeOperation);
double m_offset;
RefPtr<TimingFunction> m_easing;
- RefPtr<AnimatableValue> m_value;
+ RefPtrWillBeMember<AnimatableValue> m_value;
AnimationEffect::CompositeOperation m_composite;
};
« no previous file with comments | « Source/core/animation/Interpolation.h ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698