Source/core/animation/KeyframeEffect.cpp - Issue 1196913005: Implement animations for Independent CSS Transform Properties

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

Issue 1196913005: Implement animations for Independent CSS Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove Compositor Animations and add tests for inherit and initial Created 5 years, 6 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

« Source/core/animation/DoubleStyleInterpolation.cpp ('K') | « Source/core/animation/DoubleStyleInterpolation.cpp ('k') | Source/core/animation/StringKeyframe.cpp » ('j') | Source/core/animation/StringKeyframe.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/KeyframeEffect.cpp

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

index fcf364a1ed5817ef5777f49f5131967e6a63eb0a..6644e6d4a36f98b21d33852bfb6492b9d882a8da 100644

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

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

@@ -138,7 +138,10 @@ void KeyframeEffect::applyEffects()

// Cancel composited animation of transform if a motion path has been introduced on the element.

alancutter (OOO until 2018) 2015/06/24 01:17:09 Update comment.

soonm 2015/06/24 02:53:19 Done

if (m_target->computedStyle()

- && m_target->computedStyle()->hasMotionPath()

+ && (m_target->computedStyle()->hasMotionPath()

+ || m_target->computedStyle()->translate()

+ || m_target->computedStyle()->rotate()

+ || m_target->computedStyle()->scale())

&& animation()->hasActiveAnimationsOnCompositor()

&& animation()->affects(*m_target, CSSPropertyTransform)) {

animation()->cancelAnimationOnCompositor();

@@ -242,7 +245,7 @@ bool KeyframeEffect::isCandidateForAnimationOnCompositor(double animationPlaybac

{

if (!model()

|| !m_target

- || (m_target->computedStyle() && m_target->computedStyle()->hasMotionPath()))

+ || (m_target->computedStyle() && (m_target->computedStyle()->hasMotionPath() || m_target->computedStyle()->translate() || m_target->computedStyle()->rotate() || m_target->computedStyle()->scale())))

return false;

return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *m_target, animation(), *model(), animationPlaybackRate);