Source/core/page/animation/AnimationBase.cpp - Issue 24921002: Make compositingState explicit

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/page/animation/AnimationBase.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Addressed second round of reviewer feedback Created 7 years, 2 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/page/animation/AnimationBase.cpp

diff --git a/Source/core/page/animation/AnimationBase.cpp b/Source/core/page/animation/AnimationBase.cpp

index 40b7483e7a68984ee4f74cbe7466fefbcea145de..03ca1364b98648787f64ab384f02f4954391b915 100644

--- a/Source/core/page/animation/AnimationBase.cpp

+++ b/Source/core/page/animation/AnimationBase.cpp

@@ -555,8 +555,9 @@ void AnimationBase::freezeAtTime(double t)

else

m_pauseTime = m_startTime + t - m_animation->delay();

- // It is possible that m_isAccelerated is true and m_object->isComposited() is false, because of style change.

- if (m_object && m_object->isComposited() && isAccelerated())

+ // It is possible that m_isAccelerated is true and m_object->compositingState() is NotComposited, because of style change.

+ // So, both conditions need to be checked.

+ if (m_object && m_object->compositingState() == PaintsIntoOwnBacking && isAccelerated())

toRenderBoxModelObject(m_object)->suspendAnimations(m_pauseTime);

}