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

Unified Diff: Source/core/animation/animatable/AnimatableValueKeyframe.cpp

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/AnimatableValueKeyframe.cpp
diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
index 87172c3c30d9cc0cca6e3ea03cfe44ade4b85154..df72ac69513b69cc890efc213901845b147317c8 100644
--- a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
+++ b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
@@ -26,21 +26,19 @@ PropertyHandleSet AnimatableValueKeyframe::properties() const
return properties;
}
-PassRefPtrWillBeRawPtr<Keyframe> AnimatableValueKeyframe::clone() const
+Keyframe* AnimatableValueKeyframe::clone() const
{
- return adoptRefWillBeNoop(new AnimatableValueKeyframe(*this));
+ return new AnimatableValueKeyframe(*this);
}
-PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const
+Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const
{
- return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite()));
+ return new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite());
}
DEFINE_TRACE(AnimatableValueKeyframe)
{
-#if ENABLE(OILPAN)
visitor->trace(m_propertyValues);
-#endif
Keyframe::trace(visitor);
}
@@ -49,28 +47,27 @@ AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub
, m_value(const_cast<AnimatableValue*>(value))
{ }
-AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue> value)
+AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, AnimatableValue* value)
: Keyframe::PropertySpecificKeyframe(offset, easing, EffectModel::CompositeReplace)
, m_value(value)
{
ASSERT(!isNull(m_offset));
}
-PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
+Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
{
- Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(offset, m_easing, m_value);
- return adoptPtrWillBeNoop(theClone);
+ return new PropertySpecificKeyframe(offset, m_easing, m_value);
}
-PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const
+Interpolation* AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const
{
AnimatableValuePropertySpecificKeyframe& to = toAnimatableValuePropertySpecificKeyframe(end);
return LegacyStyleInterpolation::create(value(), to.value(), property.cssProperty());
}
-PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
+Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
{
- return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd));
+ return new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd);
}
DEFINE_TRACE(AnimatableValueKeyframe::PropertySpecificKeyframe)

Powered by Google App Engine
This is Rietveld 408576698