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

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

Issue 222893005: Oilpan: Fix oilpan builds after r170720 (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/AnimatableValueKeyframe.h
diff --git a/Source/core/animation/AnimatableValueKeyframe.h b/Source/core/animation/AnimatableValueKeyframe.h
index 2327ee94562ad05a45deb4d42ff0d546677b1aeb..c32beb1398a85771a2722f5681efc45a93be7d3a 100644
--- a/Source/core/animation/AnimatableValueKeyframe.h
+++ b/Source/core/animation/AnimatableValueKeyframe.h
@@ -12,8 +12,11 @@ namespace WebCore {
class AnimatableValueKeyframe : public Keyframe {
public:
- static PassRefPtr<AnimatableValueKeyframe> create() { return adoptRef(new AnimatableValueKeyframe); }
- void setPropertyValue(CSSPropertyID property, PassRefPtr<AnimatableValue> value)
+ static PassRefPtrWillBeRawPtr<AnimatableValueKeyframe> create()
+ {
+ return adoptRefWillBeNoop(new AnimatableValueKeyframe);
+ }
+ void setPropertyValue(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
{
m_propertyValues.add(property, value);
}
@@ -25,43 +28,46 @@ public:
}
virtual PropertySet properties() const OVERRIDE;
+ virtual void trace(Visitor*) OVERRIDE;
+
class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
public:
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue*, AnimationEffect::CompositeOperation);
AnimatableValue* value() const { return m_value.get(); }
- virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
- virtual PassRefPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
+ virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
+
+ virtual void trace(Visitor*) OVERRIDE;
private:
- PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue>);
+ PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue>);
- virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const OVERRIDE;
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const OVERRIDE;
virtual bool isAnimatableValuePropertySpecificKeyframe() const OVERRIDE { return true; }
- RefPtr<AnimatableValue> m_value;
+ RefPtrWillBeMember<AnimatableValue> m_value;
};
private:
- AnimatableValueKeyframe()
- { }
+ AnimatableValueKeyframe() { }
AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom);
virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const OVERRIDE;
- virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
virtual bool isAnimatableValueKeyframe() const OVERRIDE { return true; }
- typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap;
+ typedef HashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue> > PropertyValueMap;
PropertyValueMap m_propertyValues;
};
typedef AnimatableValueKeyframe::PropertySpecificKeyframe AnimatableValuePropertySpecificKeyframe;
DEFINE_TYPE_CASTS(AnimatableValueKeyframe, Keyframe, value, value->isAnimatableValueKeyframe(), value.isAnimatableValueKeyframe());
-DEFINE_TYPE_CASTS(AnimatableValuePropertySpecificKeyframe, PropertySpecificKeyframe, value, value->isAnimatableValuePropertySpecificKeyframe(), value.isAnimatableValuePropertySpecificKeyframe());
+DEFINE_TYPE_CASTS(AnimatableValuePropertySpecificKeyframe, Keyframe::PropertySpecificKeyframe, value, value->isAnimatableValuePropertySpecificKeyframe(), value.isAnimatableValuePropertySpecificKeyframe());
}
« no previous file with comments | « no previous file | Source/core/animation/AnimatableValueKeyframe.cpp » ('j') | Source/core/animation/KeyframeEffectModel.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698