Source/core/css/resolver/StyleResolver.cpp - Issue 23874019: Web Animations CSS: Start running animations on the compositor

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/css/resolver/StyleResolver.cpp

Issue 23874019: Web Animations CSS: Start running animations on the compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Cleanup isRunning* and shouldCompositeForAnimation Created 7 years, 1 month 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/css/resolver/StyleResolver.cpp

diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp

index 6dfb08aa3c2c651ec64586430ac7b64ccfcab7cf..2b4ac4d070fd24da97931373d6be25142c4dab62 100644

--- a/Source/core/css/resolver/StyleResolver.cpp

+++ b/Source/core/css/resolver/StyleResolver.cpp

@@ -1271,7 +1271,7 @@ void StyleResolver::applyMatchedProperties(StyleResolverState& state, const Matc

// Unfortunately the link status is treated like an inherited property. We need to explicitly restore it.

state.style()->setInsideLink(linkStatus);

- if (RuntimeEnabledFeatures::webAnimationsCSSEnabled()

+ if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && animatingElement

&& (animatingElement->hasActiveAnimations()

|| (state.style()->transitions() && !state.style()->transitions()->isEmpty())

|| (state.style()->animations() && !state.style()->animations()->isEmpty())))