Attachment #433107 for bug #227738

View Details Raw Unified Return to Bug 227738

| Differences between



2021-07-07  Cameron McCormack  <heycam@apple.com>

        Stop GraphicsLayerCA::recursiveCommitChanges recursion once cMaxLayerTreeDepth is reached
        https://bugs.webkit.org/show_bug.cgi?id=227738
        <rdar://42584284>

        Reviewed by NOBODY (OOPS!).

        To avoid stack overflow in some configurations, stop
        recursiveCommitChange recursion when we reach the same level that we
        stop hooking up PlatformCALayers. This will leave GraphicsLayerCAs in
        the tree with m_uncommittedChanges, but if we ever do another call to
        recursiveCommitChange where the GraphicsLayerCA is now at an
        appropriate depth (because some ancestors lost their structural
        layers, for example), then we'll process the uncommitted changes at
        that point.

        Pull up the increment of commitState.treeDepth from
        commitLayerChangesBeforeSublayers to recursiveCommitChanges so that
        the commitLayerChangesBeforeSublayers call for a mask layer doesn't
        contribute to the depth count.

        Use structuralLayerPurpose() rather than null-checking
        m_structuralLayer to determine whether we count an additional depth
        level, since m_structuralLayer reflects whether we already have a
        structural layer (which may or may not go away), and
        structuralLayerPurpose() can tell us whether we will have a structural
        layer.

        Test: fast/layers/deep-layer-update.html

        * platform/graphics/ca/GraphicsLayerCA.cpp:
        (WebCore::GraphicsLayerCA::recursiveCommitChanges):
        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):

2021-07-07  Cameron McCormack  <heycam@apple.com>

        Add logging for GraphicsLayerCA::m_uncommittedChanges



    return false;
}

// rootRelativeTransformForScaling is a transform from the root, but for layers with transform animations, it cherry-picked the state of the
// animation that contributes maximally to the scale (on every layer with animations down the hierarchy).
void GraphicsLayerCA::recursiveCommitChanges(CommitState& commitState, const TransformState& state, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale)
{
    if (!needsCommit(commitState))

    TransformState localState = state;
    CommitState childCommitState = commitState;

    ++childCommitState.treeDepth;
    if (structuralLayerPurpose() != NoStructuralLayer)
        ++childCommitState.treeDepth;

    bool affectedByTransformAnimation = commitState.ancestorHasTransformAnimation;

    bool accumulateTransform = accumulatesTransform(*this);

    }

    bool hasDescendantsWithRunningTransformAnimations = false;
    
    for (auto& layer : children()) {
        auto& currentChild = downcast<GraphicsLayerCA>(layer.get());
        currentChild.recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);

    if (childCommitState.treeDepth <= cMaxLayerTreeDepth) {
        for (auto& layer : children()) {
            auto& currentChild = downcast<GraphicsLayerCA>(layer.get());
            currentChild.recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);

            if (currentChild.isRunningTransformAnimation() || currentChild.hasDescendantsWithRunningTransformAnimations())
                hasDescendantsWithRunningTransformAnimations = true;
        }
    }

    commitState.totalBackdropFilterArea = childCommitState.totalBackdropFilterArea;

{
    SetForScope<bool> committingChangesChange(m_isCommittingChanges, true);

    ++commitState.treeDepth;
    if (m_structuralLayer)
        ++commitState.treeDepth;

    if (!m_uncommittedChanges) {
        // Ensure that we cap layer depth in commitLayerChangesAfterSublayers().
        if (commitState.treeDepth > cMaxLayerTreeDepth)



2021-07-07  Cameron McCormack  <heycam@apple.com>

        Stop GraphicsLayerCA::recursiveCommitChanges recursion once cMaxLayerTreeDepth is reached
        https://bugs.webkit.org/show_bug.cgi?id=227738
        <rdar://42584284>

        Reviewed by NOBODY (OOPS!).

        Add a test that changes made to GraphicsLayerCAs that are too deep
        in the tree will be committed if they later become not too deep.

        * fast/layers/deep-layer-update-expected.html: Added.
        * fast/layers/deep-layer-update.html: Added.

2021-07-04  Rob Buis  <rbuis@igalia.com>

        Resync web-platform-tests/css/css-sizing/aspect-ratio from upstream

Line 0 a/LayoutTests/fast/layers/deep-layer-update-expected.html_sec1
- a/LayoutTests/fast/layers/deep-layer-update-expected.html +5 lines
	1	<!DOCTYPE html>
	2	<style>
	3	div { will-change: transform; opacity: 0.5; }
	4	</style>
	5	<div>Test passes if this text is shown at 0.5 opacity.</div>



<!DOCTYPE html>
<style>
.induce-structural-layers div { transform: translateZ(0); transform-style: preserve-3d; }
div { will-change: transform; }
</style>
<body class="induce-structural-layers" onload="run()">
<script>
const cMaxLayerTreeDepth = 128; // from GraphicsLayerCA.cpp

function buildDeepLayerTree() {
    let innermostDiv = document.createElement("div");
    innermostDiv.textContent = "Test passes if this text is shown at 0.5 opacity.";

    // Set up a layer tree that, if each div has a structural layer, has a depth
    // that is greater than cMaxLayerTreeDepth, but without any structural layers,
    // will be within the depth limit.
    let e = innermostDiv;
    for (let i = 0; i < cMaxLayerTreeDepth * 0.75; ++i) {
        let f = document.createElement("div");
        f.append(e);
        e = f;
    }
    document.body.append(e);

    return innermostDiv;
}

function removeStructuralLayers() {
    document.body.className = '';
}

function nextAnimationFrame() {
    return new Promise(requestAnimationFrame);
}

async function run() {
    if (window.testRunner)
        testRunner.waitUntilDone();

    let innermostDiv = buildDeepLayerTree();
    await nextAnimationFrame();

    innermostDiv.style.opacity = 0.5; // Change to a layer that is too deep.
    await nextAnimationFrame();

    removeStructuralLayers();
    await nextAnimationFrame();

    document.documentElement.className = '';
    if (window.testRunner)
        testRunner.notifyDone();
}
</script>

Return to Bug 227738

Lines 1648-1655 bool GraphicsLayerCA::needsCommit(const CommitState& commitState) a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec1
- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp -12 / +12 lines
1648	return false;	1648	return false;
1649	}	1649	}
1650		1650
1651	// rootRelativeTransformForScaling is a transform from the root, but for layers with transform animations, it cherry-picked the state of the
1652	// animation that contributes maximally to the scale (on every layer with animations down the hierarchy).
1653	void GraphicsLayerCA::recursiveCommitChanges(CommitState& commitState, const TransformState& state, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale)	1651	void GraphicsLayerCA::recursiveCommitChanges(CommitState& commitState, const TransformState& state, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale)
1654	{	1652	{
1655	if (!needsCommit(commitState))	1653	if (!needsCommit(commitState))
Lines 1658-1663 void GraphicsLayerCA::recursiveCommitChanges(CommitState& commitState, const Tra a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec2
1658	TransformState localState = state;	1656	TransformState localState = state;
1659	CommitState childCommitState = commitState;	1657	CommitState childCommitState = commitState;
1660		1658
		1659	++childCommitState.treeDepth;
		1660	if (structuralLayerPurpose() != NoStructuralLayer)
		1661	++childCommitState.treeDepth;
		1662
1661	bool affectedByTransformAnimation = commitState.ancestorHasTransformAnimation;	1663	bool affectedByTransformAnimation = commitState.ancestorHasTransformAnimation;
1662		1664
1663	bool accumulateTransform = accumulatesTransform(*this);	1665	bool accumulateTransform = accumulatesTransform(*this);
Lines 1734-1746 void GraphicsLayerCA::recursiveCommitChanges(CommitState& commitState, const Tra a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec3
1734	}	1736	}
1735		1737
1736	bool hasDescendantsWithRunningTransformAnimations = false;	1738	bool hasDescendantsWithRunningTransformAnimations = false;
1737
1738	for (auto& layer : children()) {
1739	auto& currentChild = downcast<GraphicsLayerCA>(layer.get());
1740	currentChild.recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
1741		1739
1742	if (currentChild.isRunningTransformAnimation() \|\| currentChild.hasDescendantsWithRunningTransformAnimations())	1740	if (childCommitState.treeDepth <= cMaxLayerTreeDepth) {
1743	hasDescendantsWithRunningTransformAnimations = true;	1741	for (auto& layer : children()) {
		1742	auto& currentChild = downcast<GraphicsLayerCA>(layer.get());
		1743	currentChild.recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
		1744
		1745	if (currentChild.isRunningTransformAnimation() \|\| currentChild.hasDescendantsWithRunningTransformAnimations())
		1746	hasDescendantsWithRunningTransformAnimations = true;
		1747	}
1744	}	1748	}
1745		1749
1746	commitState.totalBackdropFilterArea = childCommitState.totalBackdropFilterArea;	1750	commitState.totalBackdropFilterArea = childCommitState.totalBackdropFilterArea;
Lines 1858-1867 void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec4
1858	{	1862	{
1859	SetForScope<bool> committingChangesChange(m_isCommittingChanges, true);	1863	SetForScope<bool> committingChangesChange(m_isCommittingChanges, true);
1860		1864
1861	++commitState.treeDepth;
1862	if (m_structuralLayer)
1863	++commitState.treeDepth;
1864
1865	if (!m_uncommittedChanges) {	1865	if (!m_uncommittedChanges) {
1866	// Ensure that we cap layer depth in commitLayerChangesAfterSublayers().	1866	// Ensure that we cap layer depth in commitLayerChangesAfterSublayers().
1867	if (commitState.treeDepth > cMaxLayerTreeDepth)	1867	if (commitState.treeDepth > cMaxLayerTreeDepth)

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +35 lines
		1	2021-07-07 Cameron McCormack <heycam@apple.com>
		2
		3	Stop GraphicsLayerCA::recursiveCommitChanges recursion once cMaxLayerTreeDepth is reached
		4	https://bugs.webkit.org/show_bug.cgi?id=227738
		5	<rdar://42584284>
		6
		7	Reviewed by NOBODY (OOPS!).
		8
		9	To avoid stack overflow in some configurations, stop
		10	recursiveCommitChange recursion when we reach the same level that we
		11	stop hooking up PlatformCALayers. This will leave GraphicsLayerCAs in
		12	the tree with m_uncommittedChanges, but if we ever do another call to
		13	recursiveCommitChange where the GraphicsLayerCA is now at an
		14	appropriate depth (because some ancestors lost their structural
		15	layers, for example), then we'll process the uncommitted changes at
		16	that point.
		17
		18	Pull up the increment of commitState.treeDepth from
		19	commitLayerChangesBeforeSublayers to recursiveCommitChanges so that
		20	the commitLayerChangesBeforeSublayers call for a mask layer doesn't
		21	contribute to the depth count.
		22
		23	Use structuralLayerPurpose() rather than null-checking
		24	m_structuralLayer to determine whether we count an additional depth
		25	level, since m_structuralLayer reflects whether we already have a
		26	structural layer (which may or may not go away), and
		27	structuralLayerPurpose() can tell us whether we will have a structural
		28	layer.
		29
		30	Test: fast/layers/deep-layer-update.html
		31
		32	* platform/graphics/ca/GraphicsLayerCA.cpp:
		33	(WebCore::GraphicsLayerCA::recursiveCommitChanges):
		34	(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
		35
1	2021-07-07 Cameron McCormack <heycam@apple.com>	36	2021-07-07 Cameron McCormack <heycam@apple.com>
2		37
3	Add logging for GraphicsLayerCA::m_uncommittedChanges	38	Add logging for GraphicsLayerCA::m_uncommittedChanges

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +14 lines
		1	2021-07-07 Cameron McCormack <heycam@apple.com>
		2
		3	Stop GraphicsLayerCA::recursiveCommitChanges recursion once cMaxLayerTreeDepth is reached
		4	https://bugs.webkit.org/show_bug.cgi?id=227738
		5	<rdar://42584284>
		6
		7	Reviewed by NOBODY (OOPS!).
		8
		9	Add a test that changes made to GraphicsLayerCAs that are too deep
		10	in the tree will be committed if they later become not too deep.
		11
		12	* fast/layers/deep-layer-update-expected.html: Added.
		13	* fast/layers/deep-layer-update.html: Added.
		14
1	2021-07-04 Rob Buis <rbuis@igalia.com>	15	2021-07-04 Rob Buis <rbuis@igalia.com>
2		16
3	Resync web-platform-tests/css/css-sizing/aspect-ratio from upstream	17	Resync web-platform-tests/css/css-sizing/aspect-ratio from upstream