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

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

Issue 277763002: Prevent squashing into your own compositing container (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix whitespace nit 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
« no previous file with comments | « LayoutTests/compositing/squashing/attempting-to-squash-into-compositing-container-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/compositing/CompositingLayerAssigner.cpp
diff --git a/Source/core/rendering/compositing/CompositingLayerAssigner.cpp b/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
index fc17fafbc047c84ccab494b3e7429e7c64d12646..1c70e6ea95409d916b111284d05e313baa8fbf33 100644
--- a/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
+++ b/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
@@ -133,6 +133,9 @@ bool CompositingLayerAssigner::canSquashIntoCurrentSquashingOwner(const RenderLa
if (layer->renderer()->clippingContainer() != squashingLayer.renderer()->clippingContainer())
return false;
+ if (layer->compositingContainer() == &squashingLayer)
+ return false;
+
// Composited descendants need to be clipped by a child contianment graphics layer, which would not be available if the layer is
if (m_compositor->clipsCompositingDescendants(layer))
return false;
« no previous file with comments | « LayoutTests/compositing/squashing/attempting-to-squash-into-compositing-container-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698