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

Side by Side Diff: Source/core/animation/animatable/AnimatableValueKeyframe.h

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No, really. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 AnimatableValueKeyframe_h 5 #ifndef AnimatableValueKeyframe_h
6 #define AnimatableValueKeyframe_h 6 #define AnimatableValueKeyframe_h
7 7
8 #include "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "core/animation/Keyframe.h" 9 #include "core/animation/Keyframe.h"
10 #include "core/animation/animatable/AnimatableValue.h" 10 #include "core/animation/animatable/AnimatableValue.h"
(...skipping 15 matching lines...) Expand all
26 { 26 {
27 ASSERT(m_propertyValues.contains(property)); 27 ASSERT(m_propertyValues.contains(property));
28 return m_propertyValues.get(property); 28 return m_propertyValues.get(property);
29 } 29 }
30 virtual PropertyHandleSet properties() const override; 30 virtual PropertyHandleSet properties() const override;
31 31
32 DECLARE_VIRTUAL_TRACE(); 32 DECLARE_VIRTUAL_TRACE();
33 33
34 class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe { 34 class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
35 public: 35 public:
36 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, const AnimatableValue*, AnimationEffect::CompositeOperation); 36 PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easin g, const AnimatableValue*, EffectModel::CompositeOperation);
37 37
38 AnimatableValue* value() const { return m_value.get(); } 38 AnimatableValue* value() const { return m_value.get(); }
39 virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue () const override final { return m_value; } 39 virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue () const override final { return m_value; }
40 40
41 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutr alKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override fina l; 41 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutr alKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override fina l;
42 virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(P ropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const Computed Style*) const override final; 42 virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(P ropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const Computed Style*) const override final;
43 43
44 DECLARE_VIRTUAL_TRACE(); 44 DECLARE_VIRTUAL_TRACE();
45 45
46 private: 46 private:
(...skipping 20 matching lines...) Expand all
67 }; 67 };
68 68
69 using AnimatableValuePropertySpecificKeyframe = AnimatableValueKeyframe::Propert ySpecificKeyframe; 69 using AnimatableValuePropertySpecificKeyframe = AnimatableValueKeyframe::Propert ySpecificKeyframe;
70 70
71 DEFINE_TYPE_CASTS(AnimatableValueKeyframe, Keyframe, value, value->isAnimatableV alueKeyframe(), value.isAnimatableValueKeyframe()); 71 DEFINE_TYPE_CASTS(AnimatableValueKeyframe, Keyframe, value, value->isAnimatableV alueKeyframe(), value.isAnimatableValueKeyframe());
72 DEFINE_TYPE_CASTS(AnimatableValuePropertySpecificKeyframe, Keyframe::PropertySpe cificKeyframe, value, value->isAnimatableValuePropertySpecificKeyframe(), value. isAnimatableValuePropertySpecificKeyframe()); 72 DEFINE_TYPE_CASTS(AnimatableValuePropertySpecificKeyframe, Keyframe::PropertySpe cificKeyframe, value, value->isAnimatableValuePropertySpecificKeyframe(), value. isAnimatableValuePropertySpecificKeyframe());
73 73
74 } 74 }
75 75
76 #endif 76 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/TimingInputTest.cpp ('k') | Source/core/animation/animatable/AnimatableValueKeyframe.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698