Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef StringKeyframe_h | 5 #ifndef StringKeyframe_h |
| 6 #define StringKeyframe_h | 6 #define StringKeyframe_h |
| 7 | 7 |
| 8 #include "core/animation/Keyframe.h" | 8 #include "core/animation/Keyframe.h" |
| 9 #include "core/css/StylePropertySet.h" | 9 #include "core/css/StylePropertySet.h" |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 29 virtual PropertySet properties() const OVERRIDE; | 29 virtual PropertySet properties() const OVERRIDE; |
| 30 | 30 |
| 31 virtual void trace(Visitor*) OVERRIDE; | 31 virtual void trace(Visitor*) OVERRIDE; |
| 32 | 32 |
| 33 class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe { | 33 class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe { |
| 34 public: | 34 public: |
| 35 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, CSSValue*, AnimationEffect::CompositeOperation); | 35 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, CSSValue*, AnimationEffect::CompositeOperation); |
| 36 | 36 |
| 37 CSSValue* value() const { return m_value.get(); } | 37 CSSValue* value() const { return m_value.get(); } |
| 38 virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue () const OVERRIDE FINAL { | 38 virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue () const OVERRIDE FINAL { |
| 39 ASSERT(m_animatableValueCache); | |
|
shans
2014/05/26 03:31:01
Why did we remove this assert?
alancutter (OOO until 2018)
2014/05/26 05:22:41
This may return nullptr for transform/opacity now
Eric Willigers
2014/05/26 06:32:47
With deferred style resolving, the keyframe's cach
| |
| 40 return m_animatableValueCache.get(); | 39 return m_animatableValueCache.get(); |
| 41 } | 40 } |
| 42 | 41 |
| 43 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutr alKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINA L; | 42 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutr alKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINA L; |
| 44 virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPro pertyID, WebCore::Keyframe::PropertySpecificKeyframe* end, Element*) const OVERR IDE FINAL; | 43 virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPro pertyID, WebCore::Keyframe::PropertySpecificKeyframe* end, Element*) const OVERR IDE FINAL; |
| 45 | 44 |
| 46 virtual void trace(Visitor*) OVERRIDE; | 45 virtual void trace(Visitor*) OVERRIDE; |
| 47 | 46 |
| 48 private: | 47 private: |
| 49 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, CSSValue*); | 48 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, CSSValue*); |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 71 }; | 70 }; |
| 72 | 71 |
| 73 typedef StringKeyframe::PropertySpecificKeyframe StringPropertySpecificKeyframe; | 72 typedef StringKeyframe::PropertySpecificKeyframe StringPropertySpecificKeyframe; |
| 74 | 73 |
| 75 DEFINE_TYPE_CASTS(StringKeyframe, Keyframe, value, value->isStringKeyframe(), va lue.isStringKeyframe()); | 74 DEFINE_TYPE_CASTS(StringKeyframe, Keyframe, value, value->isStringKeyframe(), va lue.isStringKeyframe()); |
| 76 DEFINE_TYPE_CASTS(StringPropertySpecificKeyframe, Keyframe::PropertySpecificKeyf rame, value, value->isStringPropertySpecificKeyframe(), value.isStringPropertySp ecificKeyframe()); | 75 DEFINE_TYPE_CASTS(StringPropertySpecificKeyframe, Keyframe::PropertySpecificKeyf rame, value, value->isStringPropertySpecificKeyframe(), value.isStringPropertySp ecificKeyframe()); |
| 77 | 76 |
| 78 } | 77 } |
| 79 | 78 |
| 80 #endif | 79 #endif |
| OLD | NEW |