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

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

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: Resize expect size of Persistent Created 5 years, 7 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/KeyframeEffect.h
diff --git a/Source/core/animation/KeyframeEffect.h b/Source/core/animation/KeyframeEffect.h
index 8cb329962e6f640b08aa947bdfbdab1a137f1001..b92e441caa2537d6f3285cd47f2524a3bc94e30c 100644
--- a/Source/core/animation/KeyframeEffect.h
+++ b/Source/core/animation/KeyframeEffect.h
@@ -53,11 +53,11 @@ class CORE_EXPORT KeyframeEffect final : public AnimationEffect {
public:
enum Priority { DefaultPriority, TransitionPriority };
- static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority = DefaultPriority, PassOwnPtrWillBeRawPtr<EventDelegate> = nullptr);
+ static KeyframeEffect* create(Element*, EffectModel*, const Timing&, Priority = DefaultPriority, EventDelegate* = nullptr);
// Web Animations API Bindings constructors.
- static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
- static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&);
- static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
+ static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
+ static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&);
+ static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
virtual ~KeyframeEffect();
@@ -66,7 +66,7 @@ public:
bool affects(PropertyHandle) const;
const EffectModel* model() const { return m_model.get(); }
sof 2015/05/30 11:34:04 nit: redundant get()
peria 2015/06/01 04:43:02 Done.
EffectModel* model() { return m_model.get(); }
- void setModel(PassRefPtrWillBeRawPtr<EffectModel> model) { m_model = model; }
+ void setModel(EffectModel* model) { m_model = model; }
Priority priority() const { return m_priority; }
Element* target() const { return m_target; }
@@ -103,11 +103,11 @@ protected:
virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const override;
private:
- KeyframeEffect(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority, PassOwnPtrWillBeRawPtr<EventDelegate>);
+ KeyframeEffect(Element*, EffectModel*, const Timing&, Priority, EventDelegate*);
RawPtrWillBeMember<Element> m_target;
- RefPtrWillBeMember<EffectModel> m_model;
- RawPtrWillBeMember<SampledEffect> m_sampledEffect;
+ Member<EffectModel> m_model;
+ Member<SampledEffect> m_sampledEffect;
Priority m_priority;

Powered by Google App Engine
This is Rietveld 408576698