Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: Source/core/animation/ActiveAnimations.cpp

Issue 73643004: Web Animations: Extract an API for servicing animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/inspector/layer-compositing-reasons.html ('k') | Source/core/animation/Animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ActiveAnimations.cpp
diff --git a/Source/core/animation/ActiveAnimations.cpp b/Source/core/animation/ActiveAnimations.cpp
index 40294fb4643e6d09f4a42b849234f90563e11701..037e3df256d1d59999729c1eee2b80096137a766 100644
--- a/Source/core/animation/ActiveAnimations.cpp
+++ b/Source/core/animation/ActiveAnimations.cpp
@@ -46,10 +46,10 @@ bool shouldCompositeForActiveAnimations(const RenderObject& renderer, bool rende
const Element* element = toElement(renderer.node());
if (const ActiveAnimations* activeAnimations = element->activeAnimations()) {
// FIXME: remove compositing mode check once compositing is forced on all platforms
- bool shouldCompositeForActiveAnimation = (activeAnimations->hasActiveAnimations(CSSPropertyOpacity) && renderViewInCompositingMode)
+ if ((renderViewInCompositingMode && activeAnimations->hasActiveAnimations(CSSPropertyOpacity))
|| activeAnimations->hasActiveAnimations(CSSPropertyWebkitTransform)
- || activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter);
- return shouldCompositeForActiveAnimation || activeAnimations->cssAnimations().shouldCompositeForPendingAnimations(renderViewInCompositingMode);
+ || activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter))
+ return true;
}
return false;
« no previous file with comments | « LayoutTests/inspector/layer-compositing-reasons.html ('k') | Source/core/animation/Animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698