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

Side by Side Diff: Source/core/animation/KeyframeEffectModel.h

Issue 129133002: Update animation classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 PassRefPtr<Keyframe> cloneWithOffset(double offset) const; 67 PassRefPtr<Keyframe> cloneWithOffset(double offset) const;
68 private: 68 private:
69 Keyframe(); 69 Keyframe();
70 Keyframe(const Keyframe&); 70 Keyframe(const Keyframe&);
71 double m_offset; 71 double m_offset;
72 AnimationEffect::CompositeOperation m_composite; 72 AnimationEffect::CompositeOperation m_composite;
73 typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap; 73 typedef HashMap<CSSPropertyID, RefPtr<AnimatableValue> > PropertyValueMap;
74 PropertyValueMap m_propertyValues; 74 PropertyValueMap m_propertyValues;
75 }; 75 };
76 76
77 class KeyframeEffectModel : public AnimationEffect { 77 class KeyframeEffectModel FINAL : public AnimationEffect {
78 public: 78 public:
79 class PropertySpecificKeyframe; 79 class PropertySpecificKeyframe;
80 typedef Vector<RefPtr<Keyframe> > KeyframeVector; 80 typedef Vector<RefPtr<Keyframe> > KeyframeVector;
81 typedef Vector<OwnPtr<PropertySpecificKeyframe> > PropertySpecificKeyframeVe ctor; 81 typedef Vector<OwnPtr<PropertySpecificKeyframe> > PropertySpecificKeyframeVe ctor;
82 // FIXME: Implement accumulation. 82 // FIXME: Implement accumulation.
83 static PassRefPtr<KeyframeEffectModel> create(const KeyframeVector& keyframe s) 83 static PassRefPtr<KeyframeEffectModel> create(const KeyframeVector& keyframe s)
84 { 84 {
85 return adoptRef(new KeyframeEffectModel(keyframes)); 85 return adoptRef(new KeyframeEffectModel(keyframes));
86 } 86 }
87 87
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // property-specific lists. 146 // property-specific lists.
147 typedef HashMap<CSSPropertyID, OwnPtr<PropertySpecificKeyframeGroup> > Keyfr ameGroupMap; 147 typedef HashMap<CSSPropertyID, OwnPtr<PropertySpecificKeyframeGroup> > Keyfr ameGroupMap;
148 mutable OwnPtr<KeyframeGroupMap> m_keyframeGroups; 148 mutable OwnPtr<KeyframeGroupMap> m_keyframeGroups;
149 }; 149 };
150 150
151 DEFINE_TYPE_CASTS(KeyframeEffectModel, AnimationEffect, value, value->isKeyframe EffectModel(), value.isKeyframeEffectModel()); 151 DEFINE_TYPE_CASTS(KeyframeEffectModel, AnimationEffect, value, value->isKeyframe EffectModel(), value.isKeyframeEffectModel());
152 152
153 } // namespace WebCore 153 } // namespace WebCore
154 154
155 #endif // KeyframeEffectModel_h 155 #endif // KeyframeEffectModel_h
OLDNEW
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698