Source/core/animation/KeyframeEffectModel.cpp - Issue 863863004: Implemented additive animations for length

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: Source/core/animation/KeyframeEffectModel.cpp

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed AnimationStackTest Created 5 years, 10 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:

Index: Source/core/animation/KeyframeEffectModel.cpp

diff --git a/Source/core/animation/KeyframeEffectModel.cpp b/Source/core/animation/KeyframeEffectModel.cpp

index fc1f34f527f23625c0e39c8a4883b41ff85e1b13..d36d8791aed902917abcf02e4a7ebad48be71184 100644

--- a/Source/core/animation/KeyframeEffectModel.cpp

+++ b/Source/core/animation/KeyframeEffectModel.cpp

@@ -140,9 +140,7 @@ void KeyframeEffectModelBase::ensureInterpolationEffect(Element* element) const

for (const auto& entry : *m_keyframeGroups) {

const PropertySpecificKeyframeVector& keyframes = entry.value->keyframes();

- ASSERT(keyframes[0]->composite() == AnimationEffect::CompositeReplace);

for (size_t i = 0; i < keyframes.size() - 1; i++) {

- ASSERT(keyframes[i + 1]->composite() == AnimationEffect::CompositeReplace);

double applyFrom = i ? keyframes[i]->offset() : (-std::numeric_limits<double>::infinity());

double applyTo = i == keyframes.size() - 2 ? std::numeric_limits<double>::infinity() : keyframes[i + 1]->offset();

if (applyTo == 1)