Skip to content

Commit

Permalink
REVERT(268166@main): Implement the 'backdrop root' concept for backdr…
Browse files Browse the repository at this point in the history
…op-filter.

rdar://115803479
https://bugs.webkit.org/show_bug.cgi?id=261840

Reviewed by Jonathan Bedard.

4 API tests having constant issues (2 failures, 2 timeouts), and 43 layout tests consistently crashing. Reverting 268166@main.

* LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-absolute-expected.txt:
* LayoutTests/css3/filters/backdrop/backdrop-filter-does-not-size-properly-border-and-padding-expected.txt:
* LayoutTests/css3/filters/backdrop/backdrop-filter-with-cliprect-expected.txt:
* LayoutTests/css3/filters/backdrop/backdrop-filter-with-mask-expected.txt:
* LayoutTests/css3/filters/backdrop/backdrop-with-visibility-hidden-changing-expected.txt:
* LayoutTests/css3/filters/backdrop/backdrop-with-visibility-hidden-expected.txt:
* LayoutTests/css3/filters/backdrop/resource-use-add-more-layers-expected.txt:
* LayoutTests/css3/filters/backdrop/resource-use-excessive-expected.txt:
* LayoutTests/css3/filters/backdrop/resource-use-ok-expected.txt:
* LayoutTests/css3/filters/backdrop/resource-use-remove-some-layers-expected.txt:
* Source/JavaScriptCore/inspector/protocol/LayerTree.json:
* Source/WebCore/inspector/agents/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
* Source/WebCore/platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::GraphicsLayer):
* Source/WebCore/platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setIsBackdropRoot): Deleted.
(WebCore::GraphicsLayer::isBackdropRoot const): Deleted.
* Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::ensureStructuralLayer):
(WebCore::GraphicsLayerCA::layerChangeAsString):
(WebCore::GraphicsLayerCA::changeLayerTypeTo):
(WebCore::GraphicsLayerCA::setIsBackdropRoot): Deleted.
(WebCore::GraphicsLayerCA::updateBackdropRoot): Deleted.
* Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h:
* Source/WebCore/platform/graphics/ca/PlatformCALayer.h:
* Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
* Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(WebCore::PlatformCALayerCocoa::setIsBackdropRoot): Deleted.
* Source/WebCore/rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::calculateClipRects const):
(WebCore::RenderLayer::computeCanBeBackdropRoot const): Deleted.
(WebCore::RenderLayer::setCanBeBackdropRoot): Deleted.
* Source/WebCore/rendering/RenderLayer.h:
(WebCore::RenderLayer::hasBackdropFilterDescendantsWithoutRoot const): Deleted.
(WebCore::RenderLayer::setHasBackdropFilterDescendantsWithoutRoot): Deleted.
(WebCore::RenderLayer::canBeBackdropRoot const): Deleted.
(WebCore::RenderLayer::isBackdropRoot const): Deleted.
* Source/WebCore/rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateConfigurationAfterStyleChange):
(WebCore::RenderLayerBacking::updateConfiguration):
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::updateBackdropRoot): Deleted.
* Source/WebCore/rendering/RenderLayerBacking.h:
* Source/WebCore/rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::CompositingState::stateForPaintOrderChildren const):
(WebCore::RenderLayerCompositor::CompositingState::updateWithDescendantStateAndLayer):
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
(WebCore::RenderLayerCompositor::reasonsForCompositing const):
(WebCore::compositingReasonToString):
(WebCore::RenderLayerCompositor::computeIndirectCompositingReason const):
* Source/WebCore/rendering/RenderLayerCompositor.h:
* Source/WebCore/rendering/style/WillChangeData.cpp:
(WebCore::WillChangeData::canBeBackdropRoot const): Deleted.
* Source/WebCore/rendering/style/WillChangeData.h:
(WebCore::WillChangeData::canCreateStackingContext const):
* Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:
* Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
(WI.LayerTreeDetailsSidebarPanel.prototype._populateListOfCompositingReasons):
(WI.LayerTreeDetailsSidebarPanel):
* Source/WebKit/Shared/RemoteLayerTree/LayerProperties.h:
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTree.serialization.in:
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
(WebKit::RemoteLayerTreePropertyApplier::applyPropertiesToLayer):
* Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.h:
* Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.mm:
(WebKit::PlatformCALayerRemote::setIsBackdropRoot): Deleted.

Canonical link: https://commits.webkit.org/268221@main
  • Loading branch information
bls1999 committed Sep 20, 2023
1 parent fd3a4d2 commit 1a47526
Show file tree
Hide file tree
Showing 34 changed files with 453 additions and 659 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,16 @@ foo foobar
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(position 8.00 8.00)
(bounds 342.00 318.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 8.00 8.00)
(bounds 342.00 318.00)
(drawsContent 1)
(structural layer
(position 179.00 167.00)
(bounds 342.00 318.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 100.00 200.00)
)
)
(structural layer
(position 179.00 167.00)
(bounds 342.00 318.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 100.00 200.00)
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,16 @@ foo
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(position 8.00 8.00)
(bounds 180.00 280.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 8.00 8.00)
(bounds 180.00 280.00)
(drawsContent 1)
(structural layer
(position 98.00 148.00)
(bounds 180.00 280.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 180.00 280.00)
)
)
(structural layer
(position 98.00 148.00)
(bounds 180.00 280.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 180.00 280.00)
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,16 @@ bar
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(position 8.00 26.00)
(bounds 120.00 120.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 8.00 26.00)
(bounds 120.00 120.00)
(drawsContent 1)
(structural layer
(position 68.00 86.00)
(bounds 120.00 120.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 120.00 120.00)
)
)
(structural layer
(position 68.00 86.00)
(bounds 120.00 120.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 120.00 120.00)
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,21 @@ bar
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(position 8.00 26.00)
(bounds 120.00 120.00)
(drawsContent 1)
(children 1
(mask layer)
(GraphicsLayer
(position 8.00 26.00)
(bounds 120.00 120.00)
(drawsContent 1)
(mask layer)
(GraphicsLayer
(bounds 120.00 120.00)
(drawsContent 1)
)
(structural layer
(position 68.00 86.00)
(bounds 120.00 120.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 120.00 120.00)
)
)
(structural layer
(position 68.00 86.00)
(bounds 120.00 120.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 120.00 120.00)
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,16 @@ Dump when filter is visible:
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(position 0.00 150.00)
(bounds 402.00 52.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 0.00 150.00)
(bounds 402.00 52.00)
(drawsContent 1)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
)
)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
)
)
)
Expand All @@ -40,23 +34,17 @@ Dump when filter is hidden:
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 0.00 150.00)
(bounds 402.00 52.00)
(contentsVisible 0)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
(hidden)
)
)
(position 0.00 150.00)
(bounds 402.00 52.00)
(contentsVisible 0)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
(hidden)
)
)
)
Expand All @@ -73,22 +61,16 @@ Dump when filter is visible again:
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(position 0.00 150.00)
(bounds 402.00 52.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 0.00 150.00)
(bounds 402.00 52.00)
(drawsContent 1)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
)
)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,17 @@
(contentsOpaque 1)
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 0.00 150.00)
(bounds 402.00 52.00)
(contentsVisible 0)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
(hidden)
)
)
(position 0.00 150.00)
(bounds 402.00 52.00)
(contentsVisible 0)
(structural layer
(position 201.00 176.00)
(bounds 402.00 52.00)
)
(backdrop layer
(position 0.00 0.00)
(bounds 402.00 52.00)
(hidden)
)
)
)
Expand Down
Loading

0 comments on commit 1a47526

Please sign in to comment.