Changeset 286982 in webkit

Timestamp:

Dec 13, 2021, 2:32:42 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r283354.
​https://bugs.webkit.org/show_bug.cgi?id=234273

causes missing content with clip-path

Reverted changeset:

"[Performance] Optimize
RenderLayer::clipCrossesPaintingBoundary"
​https://bugs.webkit.org/show_bug.cgi?id=230885
​https://commits.webkit.org/r283354

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (3 diffs)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r283354.
+        https://bugs.webkit.org/show_bug.cgi?id=234273
+
+        causes missing content with clip-path
+
+        Reverted changeset:
+
+        "[Performance] Optimize
+        RenderLayer::clipCrossesPaintingBoundary"
+        https://bugs.webkit.org/show_bug.cgi?id=230885
+        https://commits.webkit.org/r283354
+
 2021-12-13  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1936 +1936 @@
 }
 
-static RenderLayer* repaintTargetForLayer(const RenderLayer& layer)
-{
-    if (compositedWithOwnBackingStore(layer))
-        return const_cast<RenderLayer*>(&layer);
-
-    if (layer.paintsIntoProvidedBacking())
-        return layer.backingProviderLayer();
-
-    return nullptr;
-}
-
 RenderLayer* RenderLayer::enclosingCompositingLayerForRepaint(IncludeSelfOrNot includeSelf) const
 {
+    auto repaintTargetForLayer = [](const RenderLayer& layer) -> RenderLayer* {
+        if (compositedWithOwnBackingStore(layer))
+            return const_cast<RenderLayer*>(&layer);
+        
+        if (layer.paintsIntoProvidedBacking())
+            return layer.backingProviderLayer();
+        
+        return nullptr;
+    };
+
     RenderLayer* repaintTarget = nullptr;
     if (includeSelf == IncludeSelf && (repaintTarget = repaintTargetForLayer(*this)))
@@ -1959 +1958 @@
          
     return nullptr;
-}
-
-bool RenderLayer::sharesCompositingLayerForRepaint(const RenderLayer& otherLayer) const
-{
-    if (repaintTargetForLayer(*this))
-        return false;
-
-    const RenderLayer* paintParent = paintOrderParent();
-    if (&otherLayer == paintParent)
-        return true;
-    auto* otherPaintParent = otherLayer.paintOrderParent();
-    return paintParent == otherPaintParent || this == otherPaintParent;
 }
 
@@ -4470 +4457 @@
 bool RenderLayer::clipCrossesPaintingBoundary() const
 {
-    auto* parentLayer = parent();
-    if (!sharesCompositingLayerForRepaint(*parentLayer))
-        return true;
-
-    return parentLayer->enclosingPaginationLayer(IncludeCompositedPaginatedLayers) != enclosingPaginationLayer(IncludeCompositedPaginatedLayers);
+    return parent()->enclosingPaginationLayer(IncludeCompositedPaginatedLayers) != enclosingPaginationLayer(IncludeCompositedPaginatedLayers)
+        || parent()->enclosingCompositingLayerForRepaint() != enclosingCompositingLayerForRepaint();
 }
 

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -588 +588 @@
     RenderLayer* enclosingCompositingLayer(IncludeSelfOrNot = IncludeSelf) const;
     RenderLayer* enclosingCompositingLayerForRepaint(IncludeSelfOrNot = IncludeSelf) const;
-    bool sharesCompositingLayerForRepaint(const RenderLayer& otherLayer) const;
     // Ancestor compositing layer, excluding this.
     RenderLayer* ancestorCompositingLayer() const { return enclosingCompositingLayer(ExcludeSelf); }