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

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

Issue 1318543009: Oilpan: Partially ship Oilpan for core/animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/InertEffect.cpp ('k') | Source/core/animation/InterpolationEffectTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/InterpolationEffect.h
diff --git a/Source/core/animation/InterpolationEffect.h b/Source/core/animation/InterpolationEffect.h
index 76fdd3cf8efe025b7f90f955ba6ee03de5ee7839..eac67af6fcebbff164eb9930e925371048209a7e 100644
--- a/Source/core/animation/InterpolationEffect.h
+++ b/Source/core/animation/InterpolationEffect.h
@@ -11,15 +11,14 @@
#include "platform/RuntimeEnabledFeatures.h"
#include "platform/animation/TimingFunction.h"
#include "wtf/PassOwnPtr.h"
-#include "wtf/RefCounted.h"
namespace blink {
-class CORE_EXPORT InterpolationEffect : public RefCountedWillBeGarbageCollected<InterpolationEffect> {
+class CORE_EXPORT InterpolationEffect : public GarbageCollected<InterpolationEffect> {
public:
- static PassRefPtrWillBeRawPtr<InterpolationEffect> create()
+ static InterpolationEffect* create()
{
- return adoptRefWillBeNoop(new InterpolationEffect());
+ return new InterpolationEffect();
}
void getActiveInterpolations(double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>&) const;
@@ -45,7 +44,7 @@ private:
{
}
- class InterpolationRecord : public NoBaseWillBeGarbageCollectedFinalized<InterpolationRecord> {
+ class InterpolationRecord : public GarbageCollectedFinalized<InterpolationRecord> {
public:
RefPtrWillBeMember<Interpolation> m_interpolation;
RefPtr<TimingFunction> m_easing;
@@ -54,9 +53,9 @@ private:
double m_applyFrom;
double m_applyTo;
- static PassOwnPtrWillBeRawPtr<InterpolationRecord> create(PassRefPtrWillBeRawPtr<Interpolation> interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
+ static InterpolationRecord* create(PassRefPtrWillBeRawPtr<Interpolation> interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
{
- return adoptPtrWillBeNoop(new InterpolationRecord(interpolation, easing, start, end, applyFrom, applyTo));
+ return new InterpolationRecord(interpolation, easing, start, end, applyFrom, applyTo);
}
DECLARE_TRACE();
@@ -73,7 +72,7 @@ private:
}
};
- WillBeHeapVector<OwnPtrWillBeMember<InterpolationRecord>> m_interpolations;
+ HeapVector<Member<InterpolationRecord>> m_interpolations;
};
} // namespace blink
« no previous file with comments | « Source/core/animation/InertEffect.cpp ('k') | Source/core/animation/InterpolationEffectTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698