Source/core/animation/ActiveAnimations.cpp - Issue 101623002: Drop "only composite opacity animations when already in compositing mode".

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

Issue 101623002: Drop "only composite opacity animations when already in compositing mode". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Use internals.forceCompositingUpdate instead of setTimeout Created 7 years 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

« LayoutTests/transitions/resources/opacity-transform-transitions-inside-iframe-inner.html ('K') | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/frame/animation/AnimationController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/ActiveAnimations.cpp

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

index 037e3df256d1d59999729c1eee2b80096137a766..ad0803b9caf5bcf63b91caf522f5a73a33edf947 100644

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

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

@@ -36,7 +36,7 @@

namespace WebCore {

-bool shouldCompositeForActiveAnimations(const RenderObject& renderer, bool renderViewInCompositingMode)

+bool shouldCompositeForActiveAnimations(const RenderObject& renderer)

{

ASSERT(RuntimeEnabledFeatures::webAnimationsCSSEnabled());

@@ -46,7 +46,7 @@ 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

- if ((renderViewInCompositingMode && activeAnimations->hasActiveAnimations(CSSPropertyOpacity))

+ if (activeAnimations->hasActiveAnimations(CSSPropertyOpacity)

|| activeAnimations->hasActiveAnimations(CSSPropertyWebkitTransform)

|| activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter))

return true;