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

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

Issue 260113004: Don't squash layers that have a clip or overflow clip. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Adjusted test expectations. Created 6 years, 8 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/virtual/softwarecompositing/layer-creation/overflow-scroll-overlap-expected.txt ('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/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index 1e92f38a35e21e1bef1057fc4fecf2b903285822..092d4a0507bd678609a786fae9dee418ad9ccb27 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -710,6 +710,11 @@ bool RenderLayerCompositor::canSquashIntoCurrentSquashingOwner(const RenderLayer
if (layer->renderer()->clippingContainer() != squashingLayer.renderer()->clippingContainer())
return false;
+ // FIXME: this seems to be overly aggressive. clipsCompositingDescendants() should suffice. However, it does not fix all testcases,
+ // in particular crbug.com/366101.
+ if (layer->renderer()->hasClipOrOverflowClip())
+ return false;
+
if (layer->scrollsWithRespectTo(&squashingLayer))
return false;
« no previous file with comments | « LayoutTests/virtual/softwarecompositing/layer-creation/overflow-scroll-overlap-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698