Source/core/rendering/compositing/CompositedLayerMapping.h - Issue 218313002: Revert of Put the squashing layer underneath the ancestor clipping layer if present.

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/rendering/compositing/CompositedLayerMapping.h

Issue 218313002: Revert of Put the squashing layer underneath the ancestor clipping layer if present. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 9 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/overflow-scroll-grandchildren-expected.html ('k') | Source/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/compositing/CompositedLayerMapping.h

diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.h b/Source/core/rendering/compositing/CompositedLayerMapping.h

index a89fc5f9824783a8ad5e35a1e15e85d2f848d06f..fdce3987d384ad40e35e48c3c5042607fc248f7c 100644

--- a/Source/core/rendering/compositing/CompositedLayerMapping.h

+++ b/Source/core/rendering/compositing/CompositedLayerMapping.h

@@ -349,20 +349,7 @@

OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar;

OwnPtr<GraphicsLayer> m_layerForScrollCorner;

- // A squashing CLM has two possible squashing-related structures.

- //

- // If m_clippingAncestorLayer is present:

- //

- // m_clippingAncestorLayer

- // + m_graphicsLayer

- // + m_squashingLayer

- //

- // If not:

- //

- // m_squashingContainmentLayer

- // + m_graphicsLayer

- // + m_squashingLayer

- OwnPtr<GraphicsLayer> m_squashingContainmentLayer; // Only used if any squashed layers exist and m_squashingContainmentLayer is not present, to contain the squashed layers as siblings to the rest of the GraphicsLayer tree chunk.

+ OwnPtr<GraphicsLayer> m_squashingContainmentLayer; // Only used if any squashed layers exist, to contain the squashed layers as siblings to the rest of the GraphicsLayer tree chunk.

OwnPtr<GraphicsLayer> m_squashingLayer; // Only used if any squashed layers exist, this is the backing that squashed layers paint into.

Vector<GraphicsLayerPaintInfo> m_squashedLayers;