third_party/WebKit/Source/core/animation/KeyframeEffect.cpp - Issue 1944603003: Make AnimationEffectReadOnly.getComputedTiming() consistent with Web Animations spec

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/KeyframeEffect.cpp

Issue 1944603003: Make AnimationEffectReadOnly.getComputedTiming() consistent with Web Animations spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 8 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 | « third_party/WebKit/Source/core/animation/InertEffect.cpp ('k') | third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 73e5e3868c379627062195772c6960adf7096722..4f001bcf8c8b18f03b48da622c917912d0ac9116 100644

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

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

@@ -183,10 +183,10 @@ void KeyframeEffect::applyEffects()

ASSERT(iteration >= 0);

bool changed = false;

if (m_sampledEffect) {

- changed = m_model->sample(clampTo<int>(iteration, 0), timeFraction(), iterationDuration(), m_sampledEffect->mutableInterpolations());

+ changed = m_model->sample(clampTo<int>(iteration, 0), progress(), iterationDuration(), m_sampledEffect->mutableInterpolations());

} else {

Vector<RefPtr<Interpolation>> interpolations;

- m_model->sample(clampTo<int>(iteration, 0), timeFraction(), iterationDuration(), interpolations);

+ m_model->sample(clampTo<int>(iteration, 0), progress(), iterationDuration(), interpolations);

if (!interpolations.isEmpty()) {

SampledEffect* sampledEffect = SampledEffect::create(this);

sampledEffect->mutableInterpolations().swap(interpolations);