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

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

Issue 212213007: Oilpan: Move InterpolableValue'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
Index: Source/core/animation/Interpolation.h
diff --git a/Source/core/animation/Interpolation.h b/Source/core/animation/Interpolation.h
index e565da02192101eeae4bd8b366533dd1b98c70d1..28b03b517a2c47f492c604e67799156eb4b23b71 100644
--- a/Source/core/animation/Interpolation.h
+++ b/Source/core/animation/Interpolation.h
@@ -14,9 +14,10 @@ namespace WebCore {
class StyleResolverState;
-class Interpolation : public RefCountedWillBeGarbageCollectedFinalized<Interpolation> {
+class Interpolation : public RefCountedWillBeGarbageCollected<Interpolation> {
+ DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(Interpolation);
public:
- static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end)
+ static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
{
return adoptRefWillBeNoop(new Interpolation(start, end));
}
@@ -26,19 +27,17 @@ public:
virtual bool isStyleInterpolation() const { return false; }
virtual bool isLegacyStyleInterpolation() const { return false; }
- virtual ~Interpolation() { }
-
- virtual void trace(Visitor*) { }
+ virtual void trace(Visitor*);
protected:
- const OwnPtr<InterpolableValue> m_start;
- const OwnPtr<InterpolableValue> m_end;
+ const OwnPtrWillBeMember<InterpolableValue> m_start;
+ const OwnPtrWillBeMember<InterpolableValue> m_end;
mutable double m_cachedFraction;
mutable int m_cachedIteration;
- mutable OwnPtr<InterpolableValue> m_cachedValue;
+ mutable OwnPtrWillBeMember<InterpolableValue> m_cachedValue;
- Interpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end);
+ Interpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end);
private:
InterpolableValue* getCachedValueForTesting() const { return m_cachedValue.get(); }
@@ -67,7 +66,7 @@ public:
protected:
CSSPropertyID m_id;
- StyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, CSSPropertyID id)
+ StyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id)
: Interpolation(start, end)
, m_id(id)
{
@@ -93,7 +92,7 @@ public:
virtual void trace(Visitor*) OVERRIDE;
private:
- LegacyStyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end, CSSPropertyID id)
+ LegacyStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id)
: StyleInterpolation(start, end, id)
{
}

Powered by Google App Engine
This is Rietveld 408576698