summaryrefslogtreecommitdiffstats
path: root/dom/animation/Animation.cpp
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-14 09:18:49 +0100
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-14 09:18:49 +0100
commitdcc00ffadf64270b0ae82431f5b71c527590e91b (patch)
treefc446e07283ce3a086f4f83a2fa9e559ab544d5a /dom/animation/Animation.cpp
parent34ef9d4683b3e81b8df1be1a9c38eae331e8c398 (diff)
downloadUXP-dcc00ffadf64270b0ae82431f5b71c527590e91b.tar
UXP-dcc00ffadf64270b0ae82431f5b71c527590e91b.tar.gz
UXP-dcc00ffadf64270b0ae82431f5b71c527590e91b.tar.lz
UXP-dcc00ffadf64270b0ae82431f5b71c527590e91b.tar.xz
UXP-dcc00ffadf64270b0ae82431f5b71c527590e91b.zip
Bug 1264125: Queue CSS related event when setting null target effect
Issue #55
Diffstat (limited to 'dom/animation/Animation.cpp')
-rw-r--r--dom/animation/Animation.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index cefdbb76d..242a0c6d6 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -729,8 +729,10 @@ TimeStamp
Animation::ElapsedTimeToTimeStamp(
const StickyTimeDuration& aElapsedTime) const
{
- return AnimationTimeToTimeStamp(aElapsedTime +
- mEffect->SpecifiedTiming().mDelay);
+ TimeDuration delay = mEffect
+ ? mEffect->SpecifiedTiming().mDelay
+ : TimeDuration();
+ return AnimationTimeToTimeStamp(aElapsedTime + delay);
}