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

Unified Diff: Source/core/animation/CompositorAnimations.cpp

Issue 653833002: Animation: Composite animations with any start delay specified (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/animation/CompositorAnimationsImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/CompositorAnimations.cpp
diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp
index 406d1fd3046e916f490bdb30f8b5cf9cab0ca76e..63454255a73e26368289fb50318aac99ee25c10f 100644
--- a/Source/core/animation/CompositorAnimations.cpp
+++ b/Source/core/animation/CompositorAnimations.cpp
@@ -261,39 +261,23 @@ bool CompositorAnimationsImpl::convertTimingForCompositor(const Timing& timing,
{
timing.assertValid();
- // All fill modes are supported (the calling code handles them).
-
- if (timing.iterationCount <= 0)
- return false;
-
- if (std::isnan(timing.iterationDuration) || !timing.iterationDuration)
+ if (!timing.iterationCount || !timing.iterationDuration)
return false;
- // All directions are supported.
-
- // Now attempt an actual conversion
- out.scaledDuration = timing.iterationDuration;
- ASSERT(out.scaledDuration > 0);
-
- double scaledStartDelay = timing.startDelay;
- if (scaledStartDelay > 0 && scaledStartDelay > out.scaledDuration * timing.iterationCount)
- return false;
-
- out.direction = timing.direction;
-
if (!std::isfinite(timing.iterationCount)) {
out.adjustedIterationCount = -1;
} else {
out.adjustedIterationCount = timing.iterationCount;
- ASSERT(out.adjustedIterationCount > 0);
}
+ out.scaledDuration = timing.iterationDuration;
+ out.direction = timing.direction;
// Compositor's time offset is positive for seeking into the animation.
- out.scaledTimeOffset = -scaledStartDelay + timeOffset;
+ out.scaledTimeOffset = -timing.startDelay + timeOffset;
out.playbackRate = timing.playbackRate * playerPlaybackRate;
out.fillMode = timing.fillMode == Timing::FillModeAuto ? Timing::FillModeNone : timing.fillMode;
out.iterationStart = timing.iterationStart;
-
+ out.assertValid();
return true;
}
« no previous file with comments | « no previous file | Source/core/animation/CompositorAnimationsImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698