Unreviewed, reverting 265587@main.

https://bugs.webkit.org/show_bug.cgi?id=258858 Broke PDF display in Mail (<rdar://111711710>) Reverted changeset: "Avoid evaluating layer backing store contents twice per update" https://bugs.webkit.org/show_bug.cgi?id=258579 https://commits.webkit.org/265587@main Canonical link: https://commits.webkit.org/265757@main
WebKit · Jul 4, 2023 · 0033183 · 0033183
1 parent ee9d5f0
commit 0033183
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 31 deletions.
diff --git a/Source/WebCore/rendering/RenderHTMLCanvas.cpp b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -99,9 +99,10 @@ void RenderHTMLCanvas::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& pa
 
     canvasElement().setIsSnapshotting(paintInfo.paintBehavior.contains(PaintBehavior::Snapshotting));
     CompositeOperator op = CompositeOperator::SourceOver;
+#if ENABLE(CSS_COMPOSITING)
     if (paintInfo.enclosingSelfPaintingLayer() && paintInfo.enclosingSelfPaintingLayer()->shouldPaintUsingCompositeCopy())
         op = CompositeOperator::Copy;
-
+#endif
     canvasElement().paint(context, replacedContentRect, op);
     canvasElement().setIsSnapshotting(false);
 }

diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -1116,9 +1116,34 @@ bool RenderLayerBacking::updateConfiguration(const RenderLayer* compositingAnces
     } else
         m_graphicsLayer->setReplicatedByLayer(nullptr);
 
-    if (m_owningLayer.isRenderViewLayer())
+    PaintedContentsInfo contentsInfo(*this);
+
+    // Requires layout.
+    if (!m_owningLayer.isRenderViewLayer()) {
+        bool didUpdateContentsRect = false;
+        updateDirectlyCompositedBoxDecorations(contentsInfo, didUpdateContentsRect);
+    } else
         updateRootLayerConfiguration();
 
+    // Requires layout.
+    if (contentsInfo.isDirectlyCompositedImage())
+        updateImageContents(contentsInfo);
+
+    bool unscaledBitmap = contentsInfo.isUnscaledBitmapOnly();
+    if (unscaledBitmap == m_graphicsLayer->appliesDeviceScale()) {
+        m_graphicsLayer->setAppliesDeviceScale(!unscaledBitmap);
+        layerConfigChanged = true;
+    }
+
+#if ENABLE(CSS_COMPOSITING)
+    bool shouldPaintUsingCompositeCopy = unscaledBitmap && is<RenderHTMLCanvas>(renderer());
+    if (shouldPaintUsingCompositeCopy != m_owningLayer.shouldPaintUsingCompositeCopy()) {
+        m_owningLayer.setShouldPaintUsingCompositeCopy(shouldPaintUsingCompositeCopy);
+        m_graphicsLayer->setShouldPaintUsingCompositeCopy(shouldPaintUsingCompositeCopy);
+        layerConfigChanged = true;
+    }
+#endif
+
     if (is<RenderEmbeddedObject>(renderer()) && downcast<RenderEmbeddedObject>(renderer()).allowsAcceleratedCompositing()) {
         auto* pluginViewBase = downcast<PluginViewBase>(downcast<RenderWidget>(renderer()).widget());
 #if PLATFORM(IOS_FAMILY)
@@ -1625,34 +1650,20 @@ void RenderLayerBacking::updateScrollOffset(ScrollOffset scrollOffset)
     ASSERT(m_scrolledContentsLayer->position().isZero());
 }
 
-void RenderLayerBacking::updateAfterDescendants(bool reevaluateConfiguration)
+void RenderLayerBacking::updateAfterDescendants()
 {
-    if (reevaluateConfiguration || m_owningLayer.needsCompositingConfigurationUpdate()) {
-        PaintedContentsInfo contentsInfo(*this);
-
-        if (contentsInfo.isDirectlyCompositedImage())
-            updateImageContents(contentsInfo);
-
-        bool unscaledBitmap = contentsInfo.isUnscaledBitmapOnly();
-        if (unscaledBitmap == m_graphicsLayer->appliesDeviceScale())
-            m_graphicsLayer->setAppliesDeviceScale(!unscaledBitmap);
-
-        bool shouldPaintUsingCompositeCopy = unscaledBitmap && is<RenderHTMLCanvas>(renderer());
-        if (shouldPaintUsingCompositeCopy != m_owningLayer.shouldPaintUsingCompositeCopy()) {
-            m_owningLayer.setShouldPaintUsingCompositeCopy(shouldPaintUsingCompositeCopy);
-            m_graphicsLayer->setShouldPaintUsingCompositeCopy(shouldPaintUsingCompositeCopy);
-        }
-
-        if (!m_owningLayer.isRenderViewLayer()) {
-            bool didUpdateContentsRect = false;
-            updateDirectlyCompositedBoxDecorations(contentsInfo, didUpdateContentsRect);
-            if (!didUpdateContentsRect && m_graphicsLayer->usesContentsLayer())
-                resetContentsRect();
-        }
+    // FIXME: this potentially duplicates work we did in updateConfiguration().
+    PaintedContentsInfo contentsInfo(*this);
 
-        updateDrawsContent(contentsInfo);
+    if (!m_owningLayer.isRenderViewLayer()) {
+        bool didUpdateContentsRect = false;
+        updateDirectlyCompositedBoxDecorations(contentsInfo, didUpdateContentsRect);
+        if (!didUpdateContentsRect && m_graphicsLayer->usesContentsLayer())
+            resetContentsRect();
     }
 
+    updateDrawsContent(contentsInfo);
+
     if (!m_isMainFrameRenderViewLayer && !m_isFrameLayerWithTiledBacking && !m_requiresBackgroundLayer) {
         // For non-root layers, background is always painted by the primary graphics layer.
         ASSERT(!m_backgroundLayer);
@@ -1661,7 +1672,6 @@ void RenderLayerBacking::updateAfterDescendants(bool reevaluateConfiguration)
 
     bool isSkippedContent = renderer().isSkippedContent();
     m_graphicsLayer->setContentsVisible(!isSkippedContent && (m_owningLayer.hasVisibleContent() || hasVisibleNonCompositedDescendants()));
-
     if (m_scrollContainerLayer) {
         m_scrollContainerLayer->setContentsVisible(renderer().style().visibility() == Visibility::Visible);
 

diff --git a/Source/WebCore/rendering/RenderLayerBacking.h b/Source/WebCore/rendering/RenderLayerBacking.h
@@ -88,7 +88,7 @@ class RenderLayerBacking final : public GraphicsLayerClient {
     void updateGeometry(const RenderLayer* compositingAncestor);
 
     // Update state the requires that descendant layers have been updated.
-    void updateAfterDescendants(bool reevaluateConfiguration);
+    void updateAfterDescendants();
 
     // Update contents and clipping structure.
     void updateDrawsContent();

diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1444,7 +1444,7 @@ void RenderLayerCompositor::updateBackingAndHierarchy(RenderLayer& layer, Vector
             if (auto* reflectionBacking = reflection->backing()) {
                 reflectionBacking->updateCompositedBounds();
                 reflectionBacking->updateGeometry(&layer);
-                reflectionBacking->updateAfterDescendants(layerNeedsUpdate);
+                reflectionBacking->updateAfterDescendants();
             }
         }
 
@@ -1537,7 +1537,7 @@ void RenderLayerCompositor::updateBackingAndHierarchy(RenderLayer& layer, Vector
         if (layer.hasCompositedScrollableOverflow())
             traversalState.overflowScrollLayers->append(&layer);
 
-        layerBacking->updateAfterDescendants(layerNeedsUpdate);
+        layerBacking->updateAfterDescendants();
     }
 
     layer.clearUpdateBackingOrHierarchyTraversalState();
@@ -2014,7 +2014,6 @@ bool RenderLayerCompositor::updateBacking(RenderLayer& layer, RequiresCompositin
     return layerChanged;
 }
 
-// Only used for reflection layers.
 bool RenderLayerCompositor::updateLayerCompositingState(RenderLayer& layer, const RenderLayer* compositingAncestor, RequiresCompositingData& queryData, BackingSharingState& backingSharingState)
 {
     bool layerChanged = updateBacking(layer, queryData, &backingSharingState);