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

Side by Side Diff: sky/engine/core/animation/KeyframeEffectModel.h

Issue 723253004: Remove tons of OILPAN. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/animation/Keyframe.h ('k') | sky/engine/core/animation/KeyframeEffectModel.cpp » ('j') | 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 class KeyframeEffectModelBase : public AnimationEffect { 53 class KeyframeEffectModelBase : public AnimationEffect {
54 public: 54 public:
55 // FIXME: Implement accumulation. 55 // FIXME: Implement accumulation.
56 56
57 typedef Vector<OwnPtr<Keyframe::PropertySpecificKeyframe> > PropertySpecific KeyframeVector; 57 typedef Vector<OwnPtr<Keyframe::PropertySpecificKeyframe> > PropertySpecific KeyframeVector;
58 class PropertySpecificKeyframeGroup { 58 class PropertySpecificKeyframeGroup {
59 public: 59 public:
60 void appendKeyframe(PassOwnPtr<Keyframe::PropertySpecificKeyframe>); 60 void appendKeyframe(PassOwnPtr<Keyframe::PropertySpecificKeyframe>);
61 const PropertySpecificKeyframeVector& keyframes() const { return m_keyfr ames; } 61 const PropertySpecificKeyframeVector& keyframes() const { return m_keyfr ames; }
62 62
63 void trace(Visitor*);
64
65 private: 63 private:
66 void removeRedundantKeyframes(); 64 void removeRedundantKeyframes();
67 void addSyntheticKeyframeIfRequired(const KeyframeEffectModelBase* conte xt); 65 void addSyntheticKeyframeIfRequired(const KeyframeEffectModelBase* conte xt);
68 66
69 PropertySpecificKeyframeVector m_keyframes; 67 PropertySpecificKeyframeVector m_keyframes;
70 68
71 friend class KeyframeEffectModelBase; 69 friend class KeyframeEffectModelBase;
72 }; 70 };
73 71
74 bool isReplaceOnly(); 72 bool isReplaceOnly();
(...skipping 11 matching lines...) Expand all
86 } 84 }
87 85
88 // AnimationEffect implementation. 86 // AnimationEffect implementation.
89 virtual PassOwnPtr<Vector<RefPtr<Interpolation> > > sample(int iteration, do uble fraction, double iterationDuration) const override; 87 virtual PassOwnPtr<Vector<RefPtr<Interpolation> > > sample(int iteration, do uble fraction, double iterationDuration) const override;
90 88
91 virtual bool isKeyframeEffectModel() const override { return true; } 89 virtual bool isKeyframeEffectModel() const override { return true; }
92 90
93 virtual bool isAnimatableValueKeyframeEffectModel() const { return false; } 91 virtual bool isAnimatableValueKeyframeEffectModel() const { return false; }
94 virtual bool isStringKeyframeEffectModel() const { return false; } 92 virtual bool isStringKeyframeEffectModel() const { return false; }
95 93
96 virtual void trace(Visitor*) override;
97
98 // FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element. 94 // FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element.
99 // This should be removed once StringKeyframes no longer uses InterpolableAn imatableValues. 95 // This should be removed once StringKeyframes no longer uses InterpolableAn imatableValues.
100 void forceConversionsToAnimatableValues(Element* element) 96 void forceConversionsToAnimatableValues(Element* element)
101 { 97 {
102 ensureKeyframeGroups(); 98 ensureKeyframeGroups();
103 ensureInterpolationEffect(element); 99 ensureInterpolationEffect(element);
104 } 100 }
105 101
106 protected: 102 protected:
107 static KeyframeVector normalizedKeyframes(const KeyframeVector& keyframes); 103 static KeyframeVector normalizedKeyframes(const KeyframeVector& keyframes);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 166
171 template <> 167 template <>
172 inline bool KeyframeEffectModel<AnimatableValueKeyframe>::isAnimatableValueKeyfr ameEffectModel() const { return true; } 168 inline bool KeyframeEffectModel<AnimatableValueKeyframe>::isAnimatableValueKeyfr ameEffectModel() const { return true; }
173 169
174 template <> 170 template <>
175 inline bool KeyframeEffectModel<StringKeyframe>::isStringKeyframeEffectModel() c onst { return true; } 171 inline bool KeyframeEffectModel<StringKeyframe>::isStringKeyframeEffectModel() c onst { return true; }
176 172
177 } // namespace blink 173 } // namespace blink
178 174
179 #endif // KeyframeEffectModel_h 175 #endif // KeyframeEffectModel_h
OLDNEW
« no previous file with comments | « sky/engine/core/animation/Keyframe.h ('k') | sky/engine/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698