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

Side by Side Diff: Source/core/animation/TimedItem.cpp

Issue 23039013: Web Animations: Fix elpasedTime in animation events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed elapsedTime for negative delay and added a test Created 7 years, 3 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
« no previous file with comments | « Source/core/animation/TimedItem.h ('k') | Source/core/animation/TimedItemTest.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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 const Phase previousPhase = m_calculated.phase; 96 const Phase previousPhase = m_calculated.phase;
97 const bool wasInEffect = m_calculated.isInEffect; 97 const bool wasInEffect = m_calculated.isInEffect;
98 m_calculated.phase = currentPhase; 98 m_calculated.phase = currentPhase;
99 m_calculated.isInEffect = !isNull(activeTime); 99 m_calculated.isInEffect = !isNull(activeTime);
100 m_calculated.isInPlay = phase() == PhaseActive && (!m_parent || m_parent->is InPlay()); 100 m_calculated.isInPlay = phase() == PhaseActive && (!m_parent || m_parent->is InPlay());
101 m_calculated.isCurrent = phase() == PhaseBefore || isInPlay() || (m_parent & & m_parent->isCurrent()); 101 m_calculated.isCurrent = phase() == PhaseBefore || isInPlay() || (m_parent & & m_parent->isCurrent());
102 102
103 // This logic is specific to CSS animation events and assumes that all 103 // This logic is specific to CSS animation events and assumes that all
104 // animations start after the DocumentTimeline has started. 104 // animations start after the DocumentTimeline has started.
105 if (m_eventDelegate && (m_isFirstSample || previousPhase != phase() || (phas e() == PhaseActive && previousIteration != currentIteration))) 105 if (m_eventDelegate && (m_isFirstSample || previousPhase != phase() || (phas e() == PhaseActive && previousIteration != currentIteration)))
106 m_eventDelegate->onEventCondition(m_isFirstSample, previousPhase, phase( ), previousIteration, currentIteration); 106 m_eventDelegate->onEventCondition(this, m_isFirstSample, previousPhase, previousIteration);
107 m_isFirstSample = false; 107 m_isFirstSample = false;
108 108
109 // FIXME: This probably shouldn't be recursive. 109 // FIXME: This probably shouldn't be recursive.
110 updateChildrenAndEffects(wasInEffect); 110 updateChildrenAndEffects(wasInEffect);
111 } 111 }
112 112
113 } // namespace WebCore 113 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/TimedItem.h ('k') | Source/core/animation/TimedItemTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698