Source/core/animation/CompositorAnimations.cpp - Issue 851693007: Prepare for responsive CSS animations.

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

Issue 851693007: Prepare for responsive CSS animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Clean up includes Created 5 years, 11 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 | « Source/core/animation/CompositorAnimations.h ('k') | Source/core/animation/DeferredLegacyStyleInterpolation.h » ('j') | Source/core/animation/DeferredLegacyStyleInterpolation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/CompositorAnimations.cpp

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

index fb26b5784814040ede48647c98335ef5168361ed..d85cdc5cf9873cc42f1d5e86185f4ba71722adb8 100644

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

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

@@ -147,7 +147,8 @@ bool CompositorAnimations::isCandidateForAnimationOnCompositor(const Timing& tim

ASSERT(keyframes.size() >= 2);

for (const auto& keyframe : keyframes) {

// FIXME: Determine candidacy based on the CSSValue instead of a snapshot AnimatableValue.

- if (keyframe->composite() != AnimationEffect::CompositeReplace || !keyframe->getAnimatableValue())

+ bool isNeutralKeyframe = keyframe->isStringPropertySpecificKeyframe() && !toStringPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite() == AnimationEffect::CompositeAdd;

+ if ((keyframe->composite() != AnimationEffect::CompositeReplace && !isNeutralKeyframe) || !keyframe->getAnimatableValue())

return false;

switch (property) {