Changeset 283340 in webkit

Timestamp:

Sep 30, 2021, 2:20:32 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Move canCompositeClipPath to RenderLayer
​https://bugs.webkit.org/show_bug.cgi?id=231014

Patch by Rob Buis <​rbuis@igalia.com> on 2021-09-30
Reviewed by Simon Fraser.

Move canCompositeClipPath to RenderLayer since the
code almost exclusively deals with layers. Also
remove unneeded ASSERTs.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::adjustStyleDifference const):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::willCompositeClipPath const):

• rendering/RenderLayer.h:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::canCompositeClipPath): Deleted.

• rendering/RenderLayerCompositor.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Rob Buis  <rbuis@igalia.com>
+
+        Move canCompositeClipPath to RenderLayer
+        https://bugs.webkit.org/show_bug.cgi?id=231014
+
+        Reviewed by Simon Fraser.
+
+        Move canCompositeClipPath to RenderLayer since the
+        code almost exclusively deals with layers. Also
+        remove unneeded ASSERTs.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::adjustStyleDifference const):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::willCompositeClipPath const):
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::canCompositeClipPath): Deleted.
+        * rendering/RenderLayerCompositor.h:
+
 2021-09-30  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -307 +307 @@
 
     if (contextSensitiveProperties & StyleDifferenceContextSensitiveProperty::ClipPath) {
-        if (hasLayer()
-            && downcast<RenderLayerModelObject>(*this).layer()->isComposited()
-            && hasClipPath()
-            && RenderLayerCompositor::canCompositeClipPath(*downcast<RenderLayerModelObject>(*this).layer()))
+        if (hasLayer() && downcast<RenderLayerModelObject>(*this).layer()->willCompositeClipPath())
             diff = std::max(diff, StyleDifference::RecompositeLayer);
         else

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -683 +683 @@
 }
 
+bool RenderLayer::willCompositeClipPath() const
+{
+    if (!isComposited())
+        return false;
+
+    auto* clipPath = renderer().style().clipPath();
+    if (!clipPath)
+        return false;
+
+    if (renderer().hasMask())
+        return false;
+
+    return (clipPath->type() != ClipPathOperation::Shape || clipPath->type() == ClipPathOperation::Shape) && GraphicsLayer::supportsLayerType(GraphicsLayer::Type::Shape);
+}
+
 void RenderLayer::dirtyNormalFlowList()
 {

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -239 +239 @@
 #endif
 
+    bool willCompositeClipPath() const;
+
 protected:
     void destroy();

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1761 +1761 @@
 }
 
-bool RenderLayerCompositor::canCompositeClipPath(const RenderLayer& layer)
-{
-    ASSERT(layer.isComposited());
-    ASSERT(layer.renderer().style().clipPath());
-
-    if (layer.renderer().hasMask())
-        return false;
-
-    auto& clipPath = *layer.renderer().style().clipPath();
-    return (clipPath.type() != ClipPathOperation::Shape || clipPath.type() == ClipPathOperation::Shape) && GraphicsLayer::supportsLayerType(GraphicsLayer::Type::Shape);
-}
-
 // FIXME: remove and never ask questions about reflection layers.
 static RenderLayerModelObject& rendererForCompositingTests(const RenderLayer& layer)

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -246 +246 @@
     void layerStyleChanged(StyleDifference, RenderLayer&, const RenderStyle* oldStyle);
 
-    static bool canCompositeClipPath(const RenderLayer&);
-
     // Get the nearest ancestor layer that has overflow or clip, but is not a stacking context
     RenderLayer* enclosingNonStackingClippingLayer(const RenderLayer&) const;