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

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

Issue 547493002: Don't squash layers that have filters. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed tests. Created 6 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:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/compositing/CompositingLayerAssigner.cpp
diff --git a/Source/core/rendering/compositing/CompositingLayerAssigner.cpp b/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
index 9b2ae14a2c1add140a8b91e99e0e7f5e331cf10f..f835c9a7e2d28857ee6f3fbd3c56e5c29499c47e 100644
--- a/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
+++ b/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
@@ -165,8 +165,8 @@ CompositingReasons CompositingLayerAssigner::getReasonsPreventingSquashing(const
if (compositingInputs.transformAncestor != squashingLayerCompositingInputs.transformAncestor)
return CompositingReasonSquashingTransformAncestorMismatch;
- if (compositingInputs.filterAncestor != squashingLayerCompositingInputs.filterAncestor)
- return CompositingReasonSquashingFilterAncestorMismatch;
+ if (layer->hasFilter() || compositingInputs.filterAncestor != squashingLayerCompositingInputs.filterAncestor)
+ return CompositingReasonSquashingFilterMismatch;
return CompositingReasonNone;
}

Powered by Google App Engine
This is Rietveld 408576698