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

Side by Side Diff: third_party/WebKit/Source/core/animation/AnimationEffect.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 virtual void specifiedTimingChanged() { } 143 virtual void specifiedTimingChanged() { }
144 144
145 // FIXME: m_parent and m_startTime are placeholders, they depend on timing g roups. 145 // FIXME: m_parent and m_startTime are placeholders, they depend on timing g roups.
146 Member<AnimationEffect> m_parent; 146 Member<AnimationEffect> m_parent;
147 const double m_startTime; 147 const double m_startTime;
148 Member<Animation> m_animation; 148 Member<Animation> m_animation;
149 Timing m_timing; 149 Timing m_timing;
150 Member<EventDelegate> m_eventDelegate; 150 Member<EventDelegate> m_eventDelegate;
151 151
152 mutable struct CalculatedTiming { 152 mutable struct CalculatedTiming {
153 DISALLOW_ALLOCATION(); 153 DISALLOW_NEW();
154 Phase phase; 154 Phase phase;
155 double currentIteration; 155 double currentIteration;
156 double timeFraction; 156 double timeFraction;
157 bool isCurrent; 157 bool isCurrent;
158 bool isInEffect; 158 bool isInEffect;
159 bool isInPlay; 159 bool isInPlay;
160 double localTime; 160 double localTime;
161 double timeToForwardsEffectChange; 161 double timeToForwardsEffectChange;
162 double timeToReverseEffectChange; 162 double timeToReverseEffectChange;
163 } m_calculated; 163 } m_calculated;
164 mutable bool m_needsUpdate; 164 mutable bool m_needsUpdate;
165 mutable double m_lastUpdateTime; 165 mutable double m_lastUpdateTime;
166 String m_name; 166 String m_name;
167 167
168 const CalculatedTiming& ensureCalculated() const; 168 const CalculatedTiming& ensureCalculated() const;
169 }; 169 };
170 170
171 } // namespace blink 171 } // namespace blink
172 172
173 #endif // AnimationEffect_h 173 #endif // AnimationEffect_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/AnimationClock.h ('k') | third_party/WebKit/Source/core/animation/AnimationStack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698