Chromium Code Reviews Chromium Code Reviews
Issue 1120003002:
[Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 class Element; | 46 class Element; |
| 47 class ExceptionState; | 47 class ExceptionState; |
| 48 class PropertyHandle; | 48 class PropertyHandle; |
| 49 class SampledEffect; | 49 class SampledEffect; |
| 50 | 50 |
| 51 class CORE_EXPORT KeyframeEffect final : public AnimationEffect { | 51 class CORE_EXPORT KeyframeEffect final : public AnimationEffect { |
| 52 DEFINE_WRAPPERTYPEINFO(); | 52 DEFINE_WRAPPERTYPEINFO(); |
| 53 public: | 53 public: |
| 54 enum Priority { DefaultPriority, TransitionPriority }; | 54 enum Priority { DefaultPriority, TransitionPriority }; |
| 55 | 55 |
| 56 static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, PassRefPtrWil lBeRawPtr<EffectModel>, const Timing&, Priority = DefaultPriority, PassOwnPtrWil lBeRawPtr<EventDelegate> = nullptr); | 56 static KeyframeEffect* create(Element*, EffectModel*, const Timing&, Priorit y = DefaultPriority, EventDelegate* = nullptr); |
| 57 // Web Animations API Bindings constructors. | 57 // Web Animations API Bindings constructors. |
| 58 static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector< Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&); | 58 static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDi ctionaryVector, double duration, ExceptionState&); |
| 59 static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector< Dictionary>& keyframeDictionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&); | 59 static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDi ctionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&); |
| 60 static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector< Dictionary>& keyframeDictionaryVector, ExceptionState&); | 60 static KeyframeEffect* create(Element*, const Vector<Dictionary>& keyframeDi ctionaryVector, ExceptionState&); |
| 61 | 61 |
| 62 virtual ~KeyframeEffect(); | 62 virtual ~KeyframeEffect(); |
| 63 | 63 |
| 64 virtual bool isAnimation() const override { return true; } | 64 virtual bool isAnimation() const override { return true; } |
| 65 | 65 |
| 66 bool affects(PropertyHandle) const; | 66 bool affects(PropertyHandle) const; |
| 67 const EffectModel* model() const { return m_model.get(); } | 67 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.
| |
| 68 EffectModel* model() { return m_model.get(); } | 68 EffectModel* model() { return m_model.get(); } |
| 69 void setModel(PassRefPtrWillBeRawPtr<EffectModel> model) { m_model = model; } | 69 void setModel(EffectModel* model) { m_model = model; } |
| 70 Priority priority() const { return m_priority; } | 70 Priority priority() const { return m_priority; } |
| 71 Element* target() const { return m_target; } | 71 Element* target() const { return m_target; } |
| 72 | 72 |
| 73 #if !ENABLE(OILPAN) | 73 #if !ENABLE(OILPAN) |
| 74 void notifyElementDestroyed(); | 74 void notifyElementDestroyed(); |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 bool isCandidateForAnimationOnCompositor(double animationPlaybackRate) const ; | 77 bool isCandidateForAnimationOnCompositor(double animationPlaybackRate) const ; |
| 78 // Must only be called once. | 78 // Must only be called once. |
| 79 bool maybeStartAnimationOnCompositor(int group, double startTime, double tim eOffset, double animationPlaybackRate); | 79 bool maybeStartAnimationOnCompositor(int group, double startTime, double tim eOffset, double animationPlaybackRate); |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 96 protected: | 96 protected: |
| 97 void applyEffects(); | 97 void applyEffects(); |
| 98 void clearEffects(); | 98 void clearEffects(); |
| 99 virtual void updateChildrenAndEffects() const override; | 99 virtual void updateChildrenAndEffects() const override; |
| 100 virtual void attach(Animation*) override; | 100 virtual void attach(Animation*) override; |
| 101 virtual void detach() override; | 101 virtual void detach() override; |
| 102 virtual void specifiedTimingChanged() override; | 102 virtual void specifiedTimingChanged() override; |
| 103 virtual double calculateTimeToEffectChange(bool forwards, double inheritedTi me, double timeToNextIteration) const override; | 103 virtual double calculateTimeToEffectChange(bool forwards, double inheritedTi me, double timeToNextIteration) const override; |
| 104 | 104 |
| 105 private: | 105 private: |
| 106 KeyframeEffect(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority, PassOwnPtrWillBeRawPtr<EventDelegate>); | 106 KeyframeEffect(Element*, EffectModel*, const Timing&, Priority, EventDelegat e*); |
| 107 | 107 |
| 108 RawPtrWillBeMember<Element> m_target; | 108 RawPtrWillBeMember<Element> m_target; |
| 109 RefPtrWillBeMember<EffectModel> m_model; | 109 Member<EffectModel> m_model; |
| 110 RawPtrWillBeMember<SampledEffect> m_sampledEffect; | 110 Member<SampledEffect> m_sampledEffect; |
| 111 | 111 |
| 112 Priority m_priority; | 112 Priority m_priority; |
| 113 | 113 |
| 114 Vector<int> m_compositorAnimationIds; | 114 Vector<int> m_compositorAnimationIds; |
| 115 | 115 |
| 116 friend class AnimationAnimationV8Test; | 116 friend class AnimationAnimationV8Test; |
| 117 }; | 117 }; |
| 118 | 118 |
| 119 DEFINE_TYPE_CASTS(KeyframeEffect, AnimationEffect, animationNode, animationNode- >isAnimation(), animationNode.isAnimation()); | 119 DEFINE_TYPE_CASTS(KeyframeEffect, AnimationEffect, animationNode, animationNode- >isAnimation(), animationNode.isAnimation()); |
| 120 | 120 |
| 121 } // namespace blink | 121 } // namespace blink |
| 122 | 122 |
| 123 #endif // KeyframeEffect_h | 123 #endif // KeyframeEffect_h |
| OLD | NEW |
