Changeset 287845 in webkit

Timestamp:

Jan 10, 2022 10:50:39 AM (6 months ago)

Author:

ntim@apple.com

Message:

REGRESSION(r287683): <dialog> elements inside clipped/overflowed elements are no longer shown
​https://bugs.webkit.org/show_bug.cgi?id=234984

Reviewed by Simon Fraser.

Source/WebCore:

Paint at the right place by fixing isContainerForPositioned, also fix clip rects.

• rendering/RenderLayer.cpp:

(WebCore::isContainerForPositioned):
(WebCore::RenderLayer::enclosingAncestorForPosition const):
(WebCore::accumulateOffsetTowardsAncestor):
(WebCore::RenderLayer::calculateClipRects const):

LayoutTests:

Enable relevant tests. Set the asserting test as Crash instead of Skipping.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-10  Tim Nguyen  <ntim@apple.com>
+
+        REGRESSION(r287683): <dialog> elements inside clipped/overflowed elements are no longer shown
+        https://bugs.webkit.org/show_bug.cgi?id=234984
+
+        Reviewed by Simon Fraser.
+
+        Enable relevant tests. Set the asserting test as Crash instead of Skipping.
+
+        * TestExpectations:
+
 2022-01-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -2359 +2359 @@
 webkit.org/b/229315 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer.html [ ImageOnlyFailure ]
 webkit.org/b/229315 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column.html [ ImageOnlyFailure ]
-webkit.org/b/231292 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block.html [ ImageOnlyFailure ]
-webkit.org/b/231292 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking.html [ ImageOnlyFailure ]
-webkit.org/b/231292 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-clip.html [ ImageOnlyFailure ]
-webkit.org/b/231292 imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-scroll.html [ ImageOnlyFailure ]
 # Needs layer re-parenting
-webkit.org/b/231292 [ Debug ] imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-transform.html [ Skip ]
+webkit.org/b/234980 [ Debug ] imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-transform.html [ Crash ]
 
 # Assertion failure in MessagePort::contextDestroyed, usually attributed to later tests

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-10  Tim Nguyen  <ntim@apple.com>
+
+        REGRESSION(r287683): <dialog> elements inside clipped/overflowed elements are no longer shown
+        https://bugs.webkit.org/show_bug.cgi?id=234984
+
+        Reviewed by Simon Fraser.
+
+        Paint at the right place by fixing isContainerForPositioned, also fix clip rects.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::isContainerForPositioned):
+        (WebCore::RenderLayer::enclosingAncestorForPosition const):
+        (WebCore::accumulateOffsetTowardsAncestor):
+        (WebCore::RenderLayer::calculateClipRects const):
+
 2022-01-10  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1778 +1778 @@
 }
 
-static inline bool isContainerForPositioned(RenderLayer& layer, PositionType position)
-{
+static inline bool isContainerForPositioned(RenderLayer& layer, PositionType position, bool establishesTopLayer)
+{
+    if (establishesTopLayer)
+        return layer.isRenderViewLayer();
+
     switch (position) {
     case PositionType::Fixed:
@@ -1816 +1819 @@
 
     RenderLayer* curr = parent();
-    while (curr && !isContainerForPositioned(*curr, position))
+    while (curr && !isContainerForPositioned(*curr, position, establishesTopLayer()))
         curr = curr->parent();
 
@@ -2293 +2296 @@
                 foundAncestor = true;
 
-            if (isContainerForPositioned(*currLayer, PositionType::Fixed)) {
+            if (isContainerForPositioned(*currLayer, PositionType::Fixed, layer->establishesTopLayer())) {
                 fixedPositionContainerLayer = currLayer;
                 ASSERT_UNUSED(foundAncestor, foundAncestor);
@@ -2332 +2335 @@
             // This implies that, for out-of-flow positioned elements inside a RenderFragmentedFlow,
             // we are bailing out before reaching root layer.
-            if (isContainerForPositioned(*parentLayer, position))
+            if (isContainerForPositioned(*parentLayer, position, layer->establishesTopLayer()))
                 break;
 
@@ -4542 +4545 @@
 Ref<ClipRects> RenderLayer::parentClipRects(const ClipRectsContext& clipRectsContext) const
 {
-    ASSERT(parent());
-
+    ASSERT(parent() || establishesTopLayer());
+
+    auto containerLayer = establishesTopLayer() ? renderer().view().layer() : parent();
     auto temporaryParentClipRects = [&](const ClipRectsContext& clipContext) {
         auto parentClipRects = ClipRects::create();
-        parent()->calculateClipRects(clipContext, parentClipRects);
+        containerLayer->calculateClipRects(clipContext, parentClipRects);
         return parentClipRects;
     };
@@ -4559 +4563 @@
     }
 
-    return parent()->updateClipRects(clipRectsContext);
+    return containerLayer->updateClipRects(clipRectsContext);
 }