third_party/WebKit/Source/core/animation/AnimationEffect.cpp - Issue 2030843002: Web Animations: Account for end delay in after phase active time

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/animation/AnimationEffect.cpp

Issue 2030843002: Web Animations: Account for end delay in after phase active time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Unit test Created 4 years, 5 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

« third_party/WebKit/LayoutTests/web-animations-api/fill-forward-negative-end-delay.html ('K') | « third_party/WebKit/LayoutTests/web-animations-api/fill-forward-negative-end-delay.html ('k') | third_party/WebKit/Source/core/animation/TimingCalculations.h » ('j') | third_party/WebKit/Source/core/animation/TimingCalculations.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/AnimationEffect.cpp

diff --git a/third_party/WebKit/Source/core/animation/AnimationEffect.cpp b/third_party/WebKit/Source/core/animation/AnimationEffect.cpp

index 1d6e86a17593d885ab8143dba5453a75f233884b..a59ed5544104468d01230192841afe4b28c068c9 100644

--- a/third_party/WebKit/Source/core/animation/AnimationEffect.cpp

+++ b/third_party/WebKit/Source/core/animation/AnimationEffect.cpp

@@ -156,7 +156,7 @@ void AnimationEffect::updateInheritedTime(double inheritedTime, TimingUpdateReas

const double startOffset = multiplyZeroAlwaysGivesZero(m_timing.iterationStart, iterationDuration);

ASSERT(startOffset >= 0);

const double scaledActiveTime = calculateScaledActiveTime(activeDuration, activeTime, startOffset, m_timing);

- const double iterationTime = calculateIterationTime(iterationDuration, repeatedDuration(), scaledActiveTime, startOffset, m_timing);

+ const double iterationTime = calculateIterationTime(iterationDuration, repeatedDuration(), scaledActiveTime, startOffset, currentPhase, m_timing);

currentIteration = calculateCurrentIteration(iterationDuration, iterationTime, scaledActiveTime, m_timing);

const double transformedTime = calculateTransformedTime(currentIteration, iterationDuration, iterationTime, m_timing);

@@ -187,7 +187,7 @@ void AnimationEffect::updateInheritedTime(double inheritedTime, TimingUpdateReas

const double startOffset = m_timing.iterationStart * localIterationDuration;

ASSERT(startOffset >= 0);

const double scaledActiveTime = calculateScaledActiveTime(localActiveDuration, localActiveTime, startOffset, m_timing);

- const double iterationTime = calculateIterationTime(localIterationDuration, localRepeatedDuration, scaledActiveTime, startOffset, m_timing);

+ const double iterationTime = calculateIterationTime(localIterationDuration, localRepeatedDuration, scaledActiveTime, startOffset, currentPhase, m_timing);

currentIteration = calculateCurrentIteration(localIterationDuration, iterationTime, scaledActiveTime, m_timing);

progress = calculateTransformedTime(currentIteration, localIterationDuration, iterationTime, m_timing);