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

Unified Diff: Source/core/rendering/compositing/CompositingReasonFinder.cpp

Issue 298723011: Make 'will-change: contents' suppress compositing in subtree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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
Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index 1137e0552d5c544956268ee86e7f0709b2ac64a4..6b5b23c90b8fc622cd12ddaabdb17f27c9ec549e 100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -141,6 +141,9 @@ bool CompositingReasonFinder::requiresCompositingForFilters(RenderObject* render
bool CompositingReasonFinder::requiresCompositingForWillChangeCompositingHint(const RenderObject* renderer) const
{
+ if (renderer->style()->subtreeWillChangeContents())
+ return false;
+
return renderer->style()->hasWillChangeCompositingHint();
}
@@ -174,6 +177,9 @@ CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(cons
bool CompositingReasonFinder::requiresCompositingForAnimation(RenderObject* renderer) const
{
+ if (renderer->style()->subtreeWillChangeContents())
+ return renderer->style()->isRunningAnimationOnCompositor();
+
return renderer->style()->shouldCompositeForCurrentAnimations();
}

Powered by Google App Engine
This is Rietveld 408576698