Source/core/page/animation/KeyframeAnimation.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/KeyframeAnimation.cpp

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

Patch Set: ready for review Created 7 years, 3 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/KeyframeAnimation.cpp

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

index bba986274c01c77b823ff6361424ec35be789555..8351ef4393bd6086ef63fb5a730a953559b663eb 100644

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

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

@@ -239,7 +239,7 @@ bool KeyframeAnimation::hasAnimationForProperty(CSSPropertyID property) const

bool KeyframeAnimation::startAnimation(double timeOffset)

{

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

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

return toRenderBoxModelObject(m_object)->startAnimation(timeOffset, m_animation.get(), m_keyframes);

}

return false;

@@ -250,7 +250,7 @@ void KeyframeAnimation::pauseAnimation(double timeOffset)

if (!m_object)

return;

- if (m_object->isComposited())

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

toRenderBoxModelObject(m_object)->animationPaused(timeOffset, m_keyframes.animationName());

// Restore the original (unanimated) style

@@ -263,7 +263,7 @@ void KeyframeAnimation::endAnimation()

if (!m_object)

return;

- if (m_object->isComposited())

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

toRenderBoxModelObject(m_object)->animationFinished(m_keyframes.animationName());

// Restore the original (unanimated) style