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

Side by Side Diff: third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp

Issue 2384263003: Reflow comments in core/animation and subdirs (Closed)
Patch Set: Created 4 years, 2 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
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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 m_calculated.currentIteration = currentIteration; 226 m_calculated.currentIteration = currentIteration;
227 m_calculated.progress = progress; 227 m_calculated.progress = progress;
228 228
229 m_calculated.phase = currentPhase; 229 m_calculated.phase = currentPhase;
230 m_calculated.isInEffect = !isNull(activeTime); 230 m_calculated.isInEffect = !isNull(activeTime);
231 m_calculated.isInPlay = getPhase() == PhaseActive; 231 m_calculated.isInPlay = getPhase() == PhaseActive;
232 m_calculated.isCurrent = getPhase() == PhaseBefore || isInPlay(); 232 m_calculated.isCurrent = getPhase() == PhaseBefore || isInPlay();
233 m_calculated.localTime = m_lastUpdateTime; 233 m_calculated.localTime = m_lastUpdateTime;
234 } 234 }
235 235
236 // Test for events even if timing didn't need an update as the animation may h ave gained a start time. 236 // Test for events even if timing didn't need an update as the animation may
237 // FIXME: Refactor so that we can DCHECK(m_animation) here, this is currently required to be nullable for testing. 237 // have gained a start time.
238 // FIXME: Refactor so that we can DCHECK(m_animation) here, this is currently
239 // required to be nullable for testing.
238 if (reason == TimingUpdateForAnimationFrame && 240 if (reason == TimingUpdateForAnimationFrame &&
239 (!m_animation || m_animation->hasStartTime() || m_animation->paused())) { 241 (!m_animation || m_animation->hasStartTime() || m_animation->paused())) {
240 if (m_eventDelegate) 242 if (m_eventDelegate)
241 m_eventDelegate->onEventCondition(*this); 243 m_eventDelegate->onEventCondition(*this);
242 } 244 }
243 245
244 if (needsUpdate) { 246 if (needsUpdate) {
245 // FIXME: This probably shouldn't be recursive. 247 // FIXME: This probably shouldn't be recursive.
246 updateChildrenAndEffects(); 248 updateChildrenAndEffects();
247 m_calculated.timeToForwardsEffectChange = 249 m_calculated.timeToForwardsEffectChange =
(...skipping 16 matching lines...) Expand all
264 AnimationEffectTiming* AnimationEffectReadOnly::timing() { 266 AnimationEffectTiming* AnimationEffectReadOnly::timing() {
265 return AnimationEffectTiming::create(this); 267 return AnimationEffectTiming::create(this);
266 } 268 }
267 269
268 DEFINE_TRACE(AnimationEffectReadOnly) { 270 DEFINE_TRACE(AnimationEffectReadOnly) {
269 visitor->trace(m_animation); 271 visitor->trace(m_animation);
270 visitor->trace(m_eventDelegate); 272 visitor->trace(m_eventDelegate);
271 } 273 }
272 274
273 } // namespace blink 275 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698